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/station_goals/bsa.dm
+10 -10
View File
@@ -40,8 +40,8 @@
icon_state = "power_box"
/obj/machinery/bsa/back/multitool_act(mob/living/user, obj/item/I)
if(istype(I, /obj/item/device/multitool)) // Only this multitool type has a data buffer.
var/obj/item/device/multitool/M = I
if(istype(I, /obj/item/multitool)) // Only this multitool type has a data buffer.
var/obj/item/multitool/M = I
M.buffer = src
to_chat(user, "<span class='notice'>You store linkage information in [I]'s buffer.</span>")
else
@@ -54,8 +54,8 @@
icon_state = "emitter_center"
/obj/machinery/bsa/front/multitool_act(mob/living/user, obj/item/I)
if(istype(I, /obj/item/device/multitool)) // Only this multitool type has a data buffer.
var/obj/item/device/multitool/M = I
if(istype(I, /obj/item/multitool)) // Only this multitool type has a data buffer.
var/obj/item/multitool/M = I
M.buffer = src
to_chat(user, "<span class='notice'>You store linkage information in [I]'s buffer.</span>")
else
@@ -70,8 +70,8 @@
var/obj/machinery/bsa/front/front
/obj/machinery/bsa/middle/multitool_act(mob/living/user, obj/item/I)
if(istype(I, /obj/item/device/multitool)) // Only this multitool type has a data buffer.
var/obj/item/device/multitool/M = I
if(istype(I, /obj/item/multitool)) // Only this multitool type has a data buffer.
var/obj/item/multitool/M = I
if(M.buffer)
if(istype(M.buffer, /obj/machinery/bsa/back))
back = M.buffer
@@ -253,7 +253,7 @@
/obj/machinery/computer/bsa_control/proc/calibrate(mob/user)
var/list/gps_locators = list()
for(var/obj/item/device/gps/G in GLOB.GPS_list) //nulls on the list somehow
for(var/obj/item/gps/G in GLOB.GPS_list) //nulls on the list somehow
if(G.tracking)
gps_locators[G.gpstag] = G
@@ -267,14 +267,14 @@
/obj/machinery/computer/bsa_control/proc/get_target_name()
if(istype(target, /area))
return get_area_name(target, TRUE)
else if(istype(target, /obj/item/device/gps))
var/obj/item/device/gps/G = target
else if(istype(target, /obj/item/gps))
var/obj/item/gps/G = target
return G.gpstag
/obj/machinery/computer/bsa_control/proc/get_impact_turf()
if(istype(target, /area))
return pick(get_area_turfs(target))
else if(istype(target, /obj/item/device/gps))
else if(istype(target, /obj/item/gps))
return get_turf(target)
/obj/machinery/computer/bsa_control/proc/fire(mob/user)
code/modules/station_goals/dna_vault.dm
+5 -5
View File
@@ -59,7 +59,7 @@
return FALSE
/obj/item/device/dna_probe
/obj/item/dna_probe
name = "DNA Sampler"
desc = "Can be used to take chemical and genetic samples of pretty much anything."
icon = 'icons/obj/syringe.dmi'
@@ -72,12 +72,12 @@
var/list/plants = list()
var/list/dna = list()
/obj/item/device/dna_probe/proc/clear_data()
/obj/item/dna_probe/proc/clear_data()
animals = list()
plants = list()
dna = list()
/obj/item/device/dna_probe/afterattack(atom/target, mob/user, proximity)
/obj/item/dna_probe/afterattack(atom/target, mob/user, proximity)
..()
if(!proximity || !target)
return
@@ -223,8 +223,8 @@
/obj/machinery/dna_vault/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/device/dna_probe))
var/obj/item/device/dna_probe/P = I
if(istype(I, /obj/item/dna_probe))
var/obj/item/dna_probe/P = I
var/uploaded = 0
for(var/plant in P.plants)
if(!plants[plant])
code/modules/station_goals/shield.dm
+1 -1
View File
@@ -121,7 +121,7 @@
icon_state = active ? "sat_active" : "sat_inactive"
/obj/machinery/satellite/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/device/multitool))
if(istype(I, /obj/item/multitool))
to_chat(user, "<span class='notice'>// NTSAT-[id] // Mode : [active ? "PRIMARY" : "STANDBY"] //[(obj_flags & EMAGGED) ? "DEBUG_MODE //" : ""]</span>")
else
return ..()