shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kills off /obj/item/device (#6561)

Browse Source
This commit is contained in:
kevinz000
2018-04-29 22:06:58 -07:00
committed by Poojawa
parent ab3035a4ea
commit 3369c804b2
538 changed files with 6728 additions and 6707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/airalarm.dm
+3 -3
View File
@@ -667,7 +667,7 @@
to_chat(user, "<span class='notice'>The wires have been [panel_open ? "exposed" : "unexposed"].</span>")
update_icon()
return
else if(istype(W, /obj/item/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card
else if(istype(W, /obj/item/card/id) || istype(W, /obj/item/pda))// trying to unlock the interface with an ID card
togglelock(user)
else if(panel_open && is_wire_tool(W))
wires.interact(user)
@@ -715,8 +715,8 @@
qdel(W)
return
if(istype(W, /obj/item/device/electroadaptive_pseudocircuit))
var/obj/item/device/electroadaptive_pseudocircuit/P = W
if(istype(W, /obj/item/electroadaptive_pseudocircuit))
var/obj/item/electroadaptive_pseudocircuit/P = W
if(!P.adapt_circuit(user, 25))
return
user.visible_message("<span class='notice'>[user] fabricates a circuit and places it into [src].</span>", \
code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+2 -2
View File
@@ -27,8 +27,8 @@
var/obj/item/reagent_containers/glass/beaker = null
var/reagent_transfer = 0
var/obj/item/device/radio/radio
var/radio_key = /obj/item/device/encryptionkey/headset_med
var/obj/item/radio/radio
var/radio_key = /obj/item/encryptionkey/headset_med
var/radio_channel = "Medical"
var/running_anim = FALSE
code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm
+1 -1
View File
@@ -20,7 +20,7 @@
..(intact)
/obj/machinery/atmospherics/components/unary/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/analyzer))
if(istype(W, /obj/item/analyzer))
atmosanalyzer_scan(airs[1], user)
else
return ..()
code/modules/atmospherics/machinery/pipes/pipes.dm
+1 -1
View File
@@ -63,7 +63,7 @@
return parent.air.remove(amount)
/obj/machinery/atmospherics/pipe/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/analyzer))
if(istype(W, /obj/item/analyzer))
atmosanalyzer_scan(parent.air, user)
if(istype(W, /obj/item/pipe_meter))
var/obj/item/pipe_meter/meter = W
code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
+1 -1
View File
@@ -138,7 +138,7 @@
"<span class='notice'>You fasten [src] to the port.</span>", \
"<span class='italics'>You hear a ratchet.</span>")
update_icon()
else if(istype(W, /obj/item/device/analyzer) && Adjacent(user))
else if(istype(W, /obj/item/analyzer) && Adjacent(user))
atmosanalyzer_scan(air_contents, user)
else
return ..()