Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 3 additions & 21 deletions code/game/machinery/ATMOSPHERICS/components/binary_devices/MSGS.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
machine_flags = WRENCHMOVE | FIXED2WORK
idle_power_usage = 1000 //This thing's serious

verb_rotates = TRUE
alt_click_rotates = TRUE

var/internal_volume = 10000
var/max_pressure = 10000

Expand Down Expand Up @@ -209,27 +212,6 @@
node1 = null
node2 = null

/obj/machinery/atmospherics/binary/msgs/verb/rotate_clockwise()
set category = "Object"
set name = "Rotate MSGS (Clockwise)"
set src in view(1)

if(usr.isUnconscious() || usr.restrained() || anchored)
return

src.dir = turn(src.dir, -90)


/obj/machinery/atmospherics/binary/msgs/verb/rotate_anticlockwise()
set category = "Object"
set name = "Rotate MSGS (Counter-clockwise)"
set src in view(1)

if(usr.isUnconscious() || usr.restrained() || anchored)
return

src.dir = turn(src.dir, 90)

/obj/machinery/atmospherics/binary/msgs/toggle_status(var/mob/user)
return FALSE

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@

use_power = MACHINE_POWER_USE_NONE

verb_rotates = TRUE
alt_click_rotates = TRUE

var/obj/machinery/power/generator/linked_generator

var/kinetic_efficiency = 0.04 //combined kinetic and kinetic-to-electric efficiency
Expand Down Expand Up @@ -147,25 +150,5 @@

linked_generator.reconnect()

/obj/machinery/atmospherics/binary/circulator/verb/rotate_clockwise()
set category = "Object"
set name = "Rotate Circulator (Clockwise)"
set src in view(1)

if(usr.isUnconscious() || usr.restrained() || anchored)
return

src.dir = turn(src.dir, -90)

/obj/machinery/atmospherics/binary/circulator/verb/rotate_anticlockwise()
set category = "Object"
set name = "Rotate Circulator (Counterclockwise)"
set src in view(1)

if(usr.isUnconscious() || usr.restrained() || anchored)
return

src.dir = turn(src.dir, 90)

/obj/machinery/atmospherics/binary/circulator/toggle_status(var/mob/user)
return FALSE
32 changes: 2 additions & 30 deletions code/game/machinery/ATMOSPHERICS/components/unary/tank.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,16 @@
density = 1
anchored = 1
machine_flags = WRENCHMOVE
verb_rotates = TRUE
alt_click_rotates = TRUE

var/init_temp = T20C
var/init_gas
var/list/rotate_verbs = list(
/obj/machinery/atmospherics/unary/tank/verb/rotate,
/obj/machinery/atmospherics/unary/tank/verb/rotate_ccw,
)

/obj/machinery/atmospherics/unary/tank/New()
..()
air_contents.temperature = init_temp
atmos_machines.Remove(src)
if(anchored)
verbs -= rotate_verbs
if(init_gas)
air_contents.adjust_gas(init_gas, (STARTING_PRESSURE)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature))

Expand Down Expand Up @@ -118,42 +114,18 @@
..()
update_icon()

/obj/machinery/atmospherics/unary/tank/verb/rotate()
set name = "Rotate Clockwise"
set category = "Object"
set src in oview(1)

if(src.anchored || usr:stat)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, -90)
return 1

/obj/machinery/atmospherics/unary/tank/verb/rotate_ccw()
set name = "Rotate Counter Clockwise"
set category = "Object"
set src in oview(1)

if(src.anchored || usr:stat)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
return 1

/obj/machinery/atmospherics/unary/tank/wrenchAnchor(var/mob/user, var/obj/item/I)
. = ..()
if(!.)
return
if(anchored)
verbs -= rotate_verbs
initialize_directions = dir
initialize()
build_network()
if (node1)
node1.initialize()
node1.build_network()
else
verbs += rotate_verbs
if(node1)
node1.disconnect(src)
node1 = null
Expand Down
28 changes: 8 additions & 20 deletions code/game/machinery/ATMOSPHERICS/pipe/construction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ var/global/list/heat_pipes = list(PIPE_HE_STRAIGHT, PIPE_HE_BENT, PIPE_JUNCTION,
flags = FPRINT
w_class = W_CLASS_MEDIUM
level = 2
verb_rotates = TRUE
alt_click_rotates = TRUE
var/frequency = 0
var/id_tag = null

Expand Down Expand Up @@ -328,28 +330,14 @@ var/global/list/nlist = list( \
var/list/straight_pipes = list(PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE)
var/list/bent_pipes = list(PIPE_SIMPLE_BENT, PIPE_HE_BENT, PIPE_INSULATED_BENT)
var/list/manifold_pipes = list(PIPE_MANIFOLD4W, PIPE_INSUL_MANIFOLD4W, PIPE_HE_MANIFOLD4W)
/obj/item/pipe/verb/rotate()
set category = "Object"
set name = "Rotate Pipe"
set src in view(1)

if(usr.isUnconscious() || usr.restrained())
return

src.dir = turn(src.dir, -90)

/obj/item/pipe/change_dir(new_dir, changer)
. = ..()
if (pipe_type in straight_pipes)
dir=rotate_pipe_straight(dir)
else if (pipe_type in manifold_pipes)
dir = 2
//src.pipe_dir = get_pipe_dir()
return

/obj/item/pipe/AltClick(var/mob/user)
if(user.incapacitated() || !Adjacent(user))
..()
return
rotate()

/obj/item/pipe/Move(NewLoc, Dir = 0, step_x = 0, step_y = 0, glide_size_override = 0)
..()
Expand Down Expand Up @@ -439,7 +427,7 @@ var/list/manifold_pipes = list(PIPE_MANIFOLD4W, PIPE_INSUL_MANIFOLD4W, PIPE_HE_M
return 0

/obj/item/pipe/attack_self(mob/user as mob)
return rotate()
return rotate_ccw()

/obj/item/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
..()
Expand Down Expand Up @@ -521,7 +509,7 @@ var/list/manifold_pipes = list(PIPE_MANIFOLD4W, PIPE_INSUL_MANIFOLD4W, PIPE_HE_M

if(PIPE_HE_CAP)
P=new /obj/machinery/atmospherics/unary/cap/heat(src.loc)

if(PIPE_BSCAP)
P=new /obj/machinery/atmospherics/unary/cap/bluespace(src.loc)

Expand Down Expand Up @@ -606,7 +594,7 @@ var/list/manifold_pipes = list(PIPE_MANIFOLD4W, PIPE_INSUL_MANIFOLD4W, PIPE_HE_M
var/id_tag = null

var/layer_to_make = PIPING_LAYER_DEFAULT

/obj/item/pipe_meter/New(loc, freq, id)
..()
if(freq)
Expand Down Expand Up @@ -652,7 +640,7 @@ var/list/manifold_pipes = list(PIPE_MANIFOLD4W, PIPE_INSUL_MANIFOLD4W, PIPE_HE_M
w_class = W_CLASS_LARGE
var/frequency = 1439
var/id_tag = null

/obj/item/pipe_gsensor/New(loc, freq, id)
..()
if(freq)
Expand Down
69 changes: 4 additions & 65 deletions code/game/machinery/Freezer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@

machine_flags = SCREWTOGGLE | CROWDESTROY | WRENCHMOVE | FIXED2WORK

var/list/rotate_verbs=list(
/obj/machinery/atmospherics/unary/cold_sink/freezer/verb/rotate,
/obj/machinery/atmospherics/unary/cold_sink/freezer/verb/rotate_ccw,
)
verb_rotates = TRUE
alt_click_rotates = TRUE

/obj/machinery/atmospherics/unary/cold_sink/freezer/New()
. = ..()
Expand All @@ -32,9 +30,6 @@

RefreshParts()

if(anchored)
verbs -= rotate_verbs

/obj/machinery/atmospherics/unary/cold_sink/freezer/RefreshParts()
var/lasercount = 0
for(var/obj/item/weapon/stock_parts/SP in component_parts)
Expand Down Expand Up @@ -74,15 +69,13 @@
if(!.)
return
if(anchored)
verbs -= rotate_verbs
initialize_directions = dir
initialize()
build_network()
if (node1)
node1.initialize()
node1.build_network()
else
verbs += rotate_verbs
if(node1)
node1.disconnect(src)
node1 = null
Expand Down Expand Up @@ -137,29 +130,6 @@
..()
src.updateUsrDialog()


/obj/machinery/atmospherics/unary/cold_sink/freezer/verb/rotate()
set name = "Rotate Clockwise"
set category = "Object"
set src in oview(1)

if (src.anchored || usr:stat)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, -90)
return 1

/obj/machinery/atmospherics/unary/cold_sink/freezer/verb/rotate_ccw()
set name = "Rotate Counter Clockwise"
set category = "Object"
set src in oview(1)

if (src.anchored || usr:stat)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
return 1

/obj/machinery/atmospherics/unary/cold_sink/freezer/exposed()
return TRUE

Expand All @@ -185,11 +155,8 @@
var/temp_offset = 0

machine_flags = SCREWTOGGLE | CROWDESTROY | WRENCHMOVE | FIXED2WORK

var/list/rotate_verbs=list(
/obj/machinery/atmospherics/unary/heat_reservoir/heater/verb/rotate,
/obj/machinery/atmospherics/unary/heat_reservoir/heater/verb/rotate_ccw,
)
verb_rotates = TRUE
alt_click_rotates = TRUE

/obj/machinery/atmospherics/unary/heat_reservoir/heater/New()
. = ..()
Expand All @@ -204,9 +171,6 @@

RefreshParts()

if(anchored)
verbs -= rotate_verbs

/obj/machinery/atmospherics/unary/heat_reservoir/heater/RefreshParts()
var/lasercount = 0
for(var/obj/item/weapon/stock_parts/SP in component_parts)
Expand Down Expand Up @@ -247,15 +211,13 @@
if(!.)
return
if(anchored)
verbs -= rotate_verbs
initialize_directions = dir
initialize()
build_network()
if (node1)
node1.initialize()
node1.build_network()
else
verbs += rotate_verbs
if(node1)
node1.disconnect(src)
node1 = null
Expand Down Expand Up @@ -307,29 +269,6 @@
..()
src.updateUsrDialog()


/obj/machinery/atmospherics/unary/heat_reservoir/heater/verb/rotate()
set name = "Rotate Clockwise"
set category = "Object"
set src in oview(1)

if (src.anchored || usr:stat)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, -90)
return 1

/obj/machinery/atmospherics/unary/heat_reservoir/heater/verb/rotate_ccw()
set name = "Rotate Counter Clockwise"
set category = "Object"
set src in oview(1)

if (src.anchored || usr:stat)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
return 1

/obj/machinery/atmospherics/unary/heat_reservoir/heater/exposed()
return TRUE

Expand Down
13 changes: 2 additions & 11 deletions code/game/machinery/mass_driver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ var/list/mass_drivers = list()
icon_state = "mass_driver_b0"
density = 0
anchored = 0
verb_rotates = TRUE
alt_click_rotates = TRUE
var/datum/construction/reversible/construct

/obj/machinery/mass_driver_frame/New()
Expand All @@ -136,17 +138,6 @@ var/list/mass_drivers = list()
if(!construct || !construct.action(W, user))
..()

/obj/machinery/mass_driver_frame/verb/rotate()
set category = "Object"
set name = "Rotate Frame"
set src in view(1)

if (usr.isUnconscious() || usr.restrained())
return

src.dir = turn(src.dir, -90)
return

/datum/construction/reversible/mass_driver
result = /obj/machinery/mass_driver
decon = list(/obj/item/stack/sheet/plasteel = 3)
Expand Down
Loading
Loading