cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MDB Ignore] [IDB Ignore] Kills off /obj/item/device (#21774)

Browse Source 
This has zero reason to exist in our code base. We have no procs or
variables tied to this. I removed it to make future modifications
cleaner.

---------

Signed-off-by: Cody Brittain <1779662+Generalcamo@users.noreply.github.com>
This commit is contained in:
Cody Brittain
2026-02-01 05:14:26 +00:00
committed by GitHub
parent 75424095ac
commit 3f62424312
857 changed files with 8690 additions and 8599 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/cigs_lighters.dm
+2 -2
View File
@@ -286,7 +286,7 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable)
text = lightermes
else if(attacking_item.tool_behaviour == TOOL_WELDER)
text = weldermes
else if(istype(attacking_item, /obj/item/device/assembly/igniter))
else if(istype(attacking_item, /obj/item/assembly/igniter))
text = ignitermes
else
text = genericmes
@@ -670,7 +670,7 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable)
if(M.lit)
light(SPAN_NOTICE("[user] lights their [name] with their [attacking_item]."))
else if(istype(attacking_item, /obj/item/device/assembly/igniter))
else if(istype(attacking_item, /obj/item/assembly/igniter))
light(SPAN_NOTICE("[user] fiddles with [attacking_item], and manages to light their [name] with the power of science."))
user.update_inv_wear_mask(0)
code/game/objects/items/weapons/circuitboards/machinery/miscboards.dm
+1 -1
View File
@@ -52,7 +52,7 @@
req_components = list(
"/obj/item/stock_parts/capacitor" = 1,
"/obj/item/stock_parts/scanning_module" = 1,
"/obj/item/device/healthanalyzer" = 1)
"/obj/item/healthanalyzer" = 1)
/obj/item/circuitboard/bodyscannerconsole
name = T_BOARD("Body Scanner Console")
code/game/objects/items/weapons/cloaking_device.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/item/cloaking_device
name = "cloaking device"
desc = "Use this to become invisible to the human eye. Contains a removable power cell behind a screwed compartment"
icon = 'icons/obj/item/device/chameleon.dmi'
icon = 'icons/obj/item/chameleon.dmi'
icon_state = "shield0"
item_state = "electronic"
contained_sprite = TRUE
code/game/objects/items/weapons/flamethrower.dm
+3 -3
View File
@@ -23,7 +23,7 @@
var/lit = FALSE //on or off
var/operating = FALSE //cooldown
var/obj/item/weldingtool/welding_tool = null
var/obj/item/device/assembly/igniter/igniter = null
var/obj/item/assembly/igniter/igniter = null
var/obj/item/reagent_containers/fuel_container = null
/// How much range the flamethrower has. Upgraded welding tools increase this.
var/range = 4
@@ -149,7 +149,7 @@
return TRUE
else if(isigniter(attacking_item))
var/obj/item/device/assembly/igniter/I = attacking_item
var/obj/item/assembly/igniter/I = attacking_item
if(I.secured)
to_chat(user, SPAN_WARNING("\The [I] is not ready to attach yet! Use a screwdriver on it first."))
return TRUE
@@ -310,7 +310,7 @@
/obj/item/flamethrower/full/Initialize() // slightly weird looking initialize cuz it has to do some stuff first
welding_tool = new /obj/item/weldingtool(src)
welding_tool.status = FALSE
igniter = new /obj/item/device/assembly/igniter(src)
igniter = new /obj/item/assembly/igniter(src)
igniter.secured = FALSE
secured = TRUE
fuel_container = new /obj/item/reagent_containers/glass/beaker/large(src)
code/game/objects/items/weapons/grenades/chem_grenade.dm
+18 -18
View File
@@ -10,7 +10,7 @@
var/stage = 0
var/state = 0
var/path = 0
var/obj/item/device/assembly_holder/detonator = null
var/obj/item/assembly_holder/detonator = null
var/list/beakers = list()
var/list/allowed_containers = list(/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle)
var/affected_area = 3
@@ -61,8 +61,8 @@
/obj/item/grenade/chem_grenade/attackby(obj/item/attacking_item, mob/user)
if(istype(attacking_item,/obj/item/device/assembly_holder) && (!stage || stage==1) && path != 2)
var/obj/item/device/assembly_holder/det = attacking_item
if(istype(attacking_item,/obj/item/assembly_holder) && (!stage || stage==1) && path != 2)
var/obj/item/assembly_holder/det = attacking_item
if(istype(det.a_left,det.a_right.type) || (!isigniter(det.a_left) && !isigniter(det.a_right)))
to_chat(user, SPAN_WARNING("Assembly must contain one igniter."))
return
@@ -76,10 +76,10 @@
det.forceMove(src)
detonator = det
if(istimer(detonator.a_left))
var/obj/item/device/assembly/timer/T = detonator.a_left
var/obj/item/assembly/timer/T = detonator.a_left
det_time = 10*T.time
if(istimer(detonator.a_right))
var/obj/item/device/assembly/timer/T = detonator.a_right
var/obj/item/assembly/timer/T = detonator.a_right
det_time = 10*T.time
icon_state = initial(icon_state) +"_ass"
name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]"
@@ -159,10 +159,10 @@
playsound(src.loc, 'sound/items/Screwdriver2.ogg', 50, 1)
spawn(0) //Otherwise det_time is erroneously set to 0 after this
if(istimer(detonator.a_left)) //Make sure description reflects that the timer has been reset
var/obj/item/device/assembly/timer/T = detonator.a_left
var/obj/item/assembly/timer/T = detonator.a_left
det_time = 10*T.time
if(istimer(detonator.a_right))
var/obj/item/device/assembly/timer/T = detonator.a_right
var/obj/item/assembly/timer/T = detonator.a_right
det_time = 10*T.time
return
@@ -216,7 +216,7 @@
B2.reagents.add_reagent(/singleton/reagent/foaming_agent, 10)
B2.reagents.add_reagent(/singleton/reagent/acid/polyacid, 10)
detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
beakers += B1
beakers += B2
@@ -239,7 +239,7 @@
B2.reagents.add_reagent(/singleton/reagent/acid, 15)
B1.reagents.add_reagent(/singleton/reagent/fuel,20)
detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
beakers += B1
beakers += B2
@@ -261,7 +261,7 @@
B2.reagents.add_reagent(/singleton/reagent/phosphorus, 25)
B2.reagents.add_reagent(/singleton/reagent/sugar, 25)
detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
beakers += B1
beakers += B2
@@ -285,7 +285,7 @@
B2.reagents.add_reagent(/singleton/reagent/polysomnine,40)
B2.reagents.add_reagent(/singleton/reagent/phosphorus,20)
detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
beakers += B1
beakers += B2
@@ -306,7 +306,7 @@
B2.reagents.add_reagent(/singleton/reagent/water, 40)
B2.reagents.add_reagent(/singleton/reagent/spacecleaner, 10)
detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
beakers += B1
beakers += B2
@@ -327,7 +327,7 @@
B2.reagents.add_reagent(/singleton/reagent/water, 40)
B2.reagents.add_reagent(/singleton/reagent/antifuel, 10)
detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
beakers += B1
beakers += B2
@@ -349,7 +349,7 @@
B2.reagents.add_reagent(/singleton/reagent/phosphorus, 40)
B2.reagents.add_reagent(/singleton/reagent/sugar, 40)
detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
beakers += B1
beakers += B2
@@ -373,7 +373,7 @@
B2.reagents.add_reagent(/singleton/reagent/sugar, 40)
B2.reagents.add_reagent(/singleton/reagent/capsaicin/condensed, 80)
detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
beakers += B1
beakers += B2
@@ -395,7 +395,7 @@
B2.reagents.add_reagent(/singleton/reagent/water, 40)
B2.reagents.add_reagent(/singleton/reagent/toxin/fertilizer/monoammoniumphosphate, 20)
detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
beakers += B1
beakers += B2
@@ -419,9 +419,9 @@
B2.reagents.add_reagent(/singleton/reagent/sugar, 40)
B2.reagents.add_reagent(/singleton/reagent/toxin/hylemnomil, 80)
detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
var/obj/item/device/assembly/timer/tmr = detonator.a_left
var/obj/item/assembly/timer/tmr = detonator.a_left
tmr.time = 2
detonator.name = "[initial(detonator.name)] ([tmr.time] secs)"
code/game/objects/items/weapons/implants/implants/circuit.dm
+2 -2
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/assemblies/electronic_setups.dmi'
icon_state = "setup_implant"
known = TRUE
var/obj/item/device/electronic_assembly/implant/IC = null
var/obj/item/electronic_assembly/implant/IC = null
/obj/item/implant/integrated_circuit/isLegal()
return TRUE
@@ -44,7 +44,7 @@
return IC.examine(user, distance, is_adjacent, infix, suffix, show_extended)
/obj/item/implant/integrated_circuit/attackby(obj/item/attacking_item, mob/user)
if(attacking_item.tool_behaviour == TOOL_CROWBAR || istype(attacking_item, /obj/item/device/integrated_electronics) || istype(attacking_item, /obj/item/integrated_circuit) || attacking_item.tool_behaviour == TOOL_SCREWDRIVER || istype(attacking_item, /obj/item/cell/device) )
if(attacking_item.tool_behaviour == TOOL_CROWBAR || istype(attacking_item, /obj/item/integrated_electronics) || istype(attacking_item, /obj/item/integrated_circuit) || attacking_item.tool_behaviour == TOOL_SCREWDRIVER || istype(attacking_item, /obj/item/cell/device) )
IC.attackby(attacking_item, user)
else
..()
code/game/objects/items/weapons/landmines.dm
+2 -2
View File
@@ -458,7 +458,7 @@
icon = 'icons/obj/item/landmine/claymore.dmi'
icon_state = "m20"
var/datum/wires/landmine/claymore/trigger_wire
var/obj/item/device/assembly/signaler/signaler
var/obj/item/assembly/signaler/signaler
/obj/item/landmine/claymore/mechanics_hints(mob/user, distance, is_adjacent)
. += ..()
@@ -478,7 +478,7 @@
icon_state = (src.deployed) ? "[initial(icon_state)]_active" : initial(icon_state)
/obj/item/landmine/claymore/attackby(obj/item/attacking_item, mob/user)
if(istype(attacking_item, /obj/item/device/assembly/signaler))
if(istype(attacking_item, /obj/item/assembly/signaler))
if(!isnull(signaler))
to_chat(user, SPAN_NOTICE("There is already a signaler inserted in \the [src]."))
return
code/game/objects/items/weapons/storage/bags.dm
+2 -2
View File
@@ -56,9 +56,9 @@
else icon_state = "trashbag3"
/obj/item/storage/bag/trash/attackby(obj/item/attacking_item, mob/user)
if (istype (attacking_item, /obj/item/device/lightreplacer))
if (istype (attacking_item, /obj/item/lightreplacer))
var/count = 0
var/obj/item/device/lightreplacer/R = attacking_item
var/obj/item/lightreplacer/R = attacking_item
var/bagfull = 0
if (R.store_broken)
for(var/obj/item/light/L in R.contents)
code/game/objects/items/weapons/storage/belt.dm
+86 -86
View File
@@ -97,32 +97,32 @@
/obj/item/wirecutters,
/obj/item/wrench,
/obj/item/hammer,
/obj/item/device/multitool,
/obj/item/device/flashlight,
/obj/item/multitool,
/obj/item/flashlight,
/obj/item/stack/cable_coil,
/obj/item/device/t_scanner,
/obj/item/device/analyzer,
/obj/item/t_scanner,
/obj/item/analyzer,
/obj/item/taperoll/engineering,
/obj/item/device/robotanalyzer,
/obj/item/robotanalyzer,
/obj/item/material/minihoe,
/obj/item/material/hatchet,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/analyzer/plant_analyzer,
/obj/item/extinguisher/mini,
/obj/item/pipewrench,
/obj/item/powerdrill,
/obj/item/device/radio,
/obj/item/device/debugger,
/obj/item/device/eftpos,
/obj/item/radio,
/obj/item/debugger,
/obj/item/eftpos,
/obj/item/tape_roll,
/obj/item/device/geiger,
/obj/item/geiger,
/obj/item/clothing/gloves/yellow,
/obj/item/clothing/gloves/yellow/specialu,
/obj/item/clothing/gloves/yellow/specialt,
/obj/item/export_scanner,
/obj/item/device/price_scanner,
/obj/item/device/cratescanner,
/obj/item/device/destTagger,
/obj/item/device/quikpay
/obj/item/price_scanner,
/obj/item/cratescanner,
/obj/item/destTagger,
/obj/item/quikpay
)
content_overlays = TRUE
@@ -157,8 +157,8 @@
/obj/item/crowbar = 1,
/obj/item/wirecutters/toolbelt = 1,
/obj/item/stack/cable_coil/random = 1,
/obj/item/device/multitool = 1,
/obj/item/device/radio = 1
/obj/item/multitool = 1,
/obj/item/radio = 1
)
@@ -169,7 +169,7 @@
/obj/item/weldingtool = 1,
/obj/item/crowbar = 1,
/obj/item/wirecutters = 1,
/obj/item/device/t_scanner = 1
/obj/item/t_scanner = 1
)
/obj/item/storage/belt/utility/alt
@@ -183,8 +183,8 @@
icon_state = "medicalbelt"
item_state = "medical"
can_hold = list(
/obj/item/device/breath_analyzer,
/obj/item/device/healthanalyzer,
/obj/item/breath_analyzer,
/obj/item/healthanalyzer,
/obj/item/dnainjector,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/glass/beaker,
@@ -198,16 +198,16 @@
/obj/item/storage/box/fancy/cigarettes,
/obj/item/storage/pill_bottle,
/obj/item/stack/medical,
/obj/item/device/flashlight/pen,
/obj/item/flashlight/pen,
/obj/item/clothing/mask/surgical,
/obj/item/clothing/head/surgery,
/obj/item/clothing/gloves/latex,
/obj/item/reagent_containers/hypospray,
/obj/item/clothing/glasses/hud/health,
/obj/item/crowbar,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/extinguisher/mini,
/obj/item/device/radio,
/obj/item/radio,
/obj/item/taperoll/medical,
/obj/item/storage/box/fancy/med_pouch
)
@@ -221,17 +221,17 @@
/obj/item/reagent_containers/glass/bottle/butazoline = 1,
/obj/item/reagent_containers/glass/bottle/dermaline = 1,
/obj/item/reagent_containers/glass/bottle/perconol = 1,
/obj/item/device/flashlight/pen = 1,
/obj/item/flashlight/pen = 1,
/obj/item/storage/box/fancy/med_pouch/trauma = 1,
)
/obj/item/storage/belt/medical/full/inaprov
starts_with = list(
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2,
/obj/item/storage/pill_bottle/inaprovaline = 1,
/obj/item/clothing/gloves/latex = 1,
/obj/item/device/flashlight/pen = 1,
/obj/item/flashlight/pen = 1,
/obj/item/storage/box/fancy/med_pouch/trauma = 1,
)
@@ -258,8 +258,8 @@
storage_slots = 9
max_storage_space = DEFAULT_BACKPACK_STORAGE
can_hold = list(
/obj/item/device/breath_analyzer,
/obj/item/device/healthanalyzer,
/obj/item/breath_analyzer,
/obj/item/healthanalyzer,
/obj/item/dnainjector,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/glass/beaker,
@@ -273,23 +273,23 @@
/obj/item/storage/box/fancy/cigarettes,
/obj/item/storage/pill_bottle,
/obj/item/stack/medical,
/obj/item/device/flashlight/pen,
/obj/item/flashlight/pen,
/obj/item/clothing/mask/surgical,
/obj/item/clothing/head/surgery,
/obj/item/clothing/gloves/latex,
/obj/item/reagent_containers/hypospray,
/obj/item/clothing/glasses/hud/health,
/obj/item/crowbar,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/extinguisher/mini,
/obj/item/device/radio,
/obj/item/radio,
/obj/item/taperoll/medical,
/obj/item/handcuffs,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_magazine,
/obj/item/device/flash,
/obj/item/device/flashlight/maglight,
/obj/item/device/flashlight/flare,
/obj/item/flash,
/obj/item/flashlight/maglight,
/obj/item/flashlight/flare,
/obj/item/material/knife,
/obj/item/stack/telecrystal,
/obj/item/melee/baton,
@@ -319,7 +319,7 @@
/obj/item/grenade,
/obj/item/reagent_containers/spray/pepper,
/obj/item/handcuffs,
/obj/item/device/flash,
/obj/item/flash,
/obj/item/clothing/glasses,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_magazine,
@@ -328,12 +328,12 @@
/obj/item/gun/energy/taser,
/obj/item/flame/lighter,
/obj/item/clothing/glasses/hud/security,
/obj/item/device/flashlight/maglight,
/obj/item/device/flashlight/flare,
/obj/item/flashlight/maglight,
/obj/item/flashlight/flare,
/obj/item/modular_computer/handheld,
/obj/item/device/radio/headset,
/obj/item/device/hailer,
/obj/item/device/megaphone,
/obj/item/radio/headset,
/obj/item/hailer,
/obj/item/megaphone,
/obj/item/melee,
/obj/item/crowbar,
/obj/item/gun/projectile/sec,
@@ -343,14 +343,14 @@
/obj/item/material/knife/trench,
/obj/item/shield/energy,
/obj/item/shield/riot/tact,
/obj/item/device/holowarrant,
/obj/item/device/taperecorder,
/obj/item/device/radio,
/obj/item/device/laser_pointer,
/obj/item/device/camera,
/obj/item/holowarrant,
/obj/item/taperecorder,
/obj/item/radio,
/obj/item/laser_pointer,
/obj/item/camera,
/obj/item/clipboard,
/obj/item/journal/notepad,
/obj/item/device/breath_analyzer
/obj/item/breath_analyzer
)
content_overlays = TRUE
@@ -359,8 +359,8 @@
/obj/item/melee/baton/loaded = 1,
/obj/item/reagent_containers/spray/pepper = 1,
/obj/item/handcuffs = 2,
/obj/item/device/flash = 1,
/obj/item/device/holowarrant = 1
/obj/item/flash = 1,
/obj/item/holowarrant = 1
)
/obj/item/storage/belt/security/full/alt
@@ -368,7 +368,7 @@
/obj/item/melee/baton/loaded = 1,
/obj/item/reagent_containers/spray/pepper = 1,
/obj/item/handcuffs = 2,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/gun/energy/taser = 1,
)
@@ -377,9 +377,9 @@
/obj/item/melee/baton/loaded = 1,
/obj/item/reagent_containers/spray/pepper = 1,
/obj/item/handcuffs = 2,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/gun/energy/disruptorpistol = 1,
/obj/item/device/flashlight/flare = 1,
/obj/item/flashlight/flare = 1,
)
/obj/item/storage/belt/security/full/pistol45
@@ -387,7 +387,7 @@
/obj/item/melee/baton/loaded = 1,
/obj/item/reagent_containers/spray/pepper = 1,
/obj/item/handcuffs = 1,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/gun/projectile/sec = 1,
/obj/item/ammo_magazine/c45m/rubber = 2,
)
@@ -395,9 +395,9 @@
/obj/item/storage/belt/security/full/investigator
starts_with = list(
/obj/item/taperoll/police = 1,
/obj/item/device/flash = 1,
/obj/item/device/camera/detective = 1,
/obj/item/device/taperecorder = 1
/obj/item/flash = 1,
/obj/item/camera/detective = 1,
/obj/item/taperecorder = 1
)
/obj/item/storage/belt/security/vestbelt
@@ -415,11 +415,11 @@
item_state = "soulstonebelt"
storage_slots = 6
can_hold = list(
/obj/item/device/soulstone
/obj/item/soulstone
)
/obj/item/storage/belt/soulstone/full
starts_with = list(/obj/item/device/soulstone = 6)
starts_with = list(/obj/item/soulstone = 6)
/obj/item/storage/belt/champion
name = "championship belt"
@@ -451,14 +451,14 @@
can_hold = list(
/obj/item/grenade,
/obj/item/handcuffs,
/obj/item/device/flash,
/obj/item/flash,
/obj/item/clothing/glasses,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_magazine,
/obj/item/melee/baton,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/modular_computer/handheld,
/obj/item/device/radio/headset,
/obj/item/radio/headset,
/obj/item/melee,
/obj/item/shield/energy,
/obj/item/pinpointer,
@@ -468,12 +468,12 @@
/obj/item/gun/energy/crossbow,
/obj/item/material/knife/trench,
/obj/item/ammo_casing/a145,
/obj/item/device/radio/uplink,
/obj/item/radio/uplink,
/obj/item/card/emag,
/obj/item/device/multitool/hacktool,
/obj/item/multitool/hacktool,
/obj/item/reagent_containers/hypospray/combat,
/obj/item/stack/telecrystal,
/obj/item/device/radio,
/obj/item/radio,
/obj/item/shield/riot/tact,
/obj/item/material/knife/tacknife,
/obj/item/cell/hydrogen
@@ -497,19 +497,19 @@
/obj/item/crowbar,
/obj/item/screwdriver,
/obj/item/wrench,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/extinguisher/mini,
/obj/item/device/radio,
/obj/item/radio,
/obj/item/clothing/gloves,
/obj/item/clothing/glasses,
/obj/item/reagent_containers/spray,
/obj/item/grenade/chem_grenade,
/obj/item/device/lightreplacer,
/obj/item/lightreplacer,
/obj/item/soap,
/obj/item/storage/bag/trash,
/obj/item/reagent_containers/glass/rag,
/obj/item/gun/energy/mousegun,
/obj/item/device/gps,
/obj/item/gps,
/obj/item/taperoll/custodial
)
@@ -534,13 +534,13 @@
/obj/item/plastique/seismic,
/obj/item/extraction_pack,
/obj/item/ore_radar,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/stack/cable_coil,
/obj/item/stack/flag,
/obj/item/device/wormhole_jaunter,
/obj/item/device/analyzer,
/obj/item/wormhole_jaunter,
/obj/item/analyzer,
/obj/item/extinguisher/mini,
/obj/item/device/radio,
/obj/item/radio,
/obj/item/clothing/gloves,
/obj/item/clothing/glasses/material,
/obj/item/pickaxe,
@@ -551,7 +551,7 @@
/obj/item/reagent_containers/food/drinks/bottle,
/obj/item/stack/medical,
/obj/item/reagent_containers/hypospray,
/obj/item/device/gps,
/obj/item/gps,
/obj/item/storage/bag/ore,
/obj/item/reagent_containers/pill,
/obj/item/storage/pill_bottle,
@@ -562,9 +562,9 @@
/obj/item/extraction_pack,
/obj/item/rfd/mining,
/obj/item/gun/custom_ka,
/obj/item/device/orbital_dropper,
/obj/item/orbital_dropper,
/obj/item/ore_detector,
/obj/item/device/spaceflare,
/obj/item/spaceflare,
/obj/item/cell
)
@@ -573,7 +573,7 @@
/obj/item/crowbar = 1,
/obj/item/pickaxe = 1,
/obj/item/shovel = 1,
/obj/item/device/analyzer = 1,
/obj/item/analyzer = 1,
/obj/item/stack/flag/red = 1,
/obj/item/ore_radar = 1,
/obj/item/storage/bag/ore = 1,
@@ -600,12 +600,12 @@
/obj/item/material/hatchet,
/obj/item/wirecutters,
/obj/item/reagent_containers/spray, //includes if you ever wish to get a spraybottle full of other chemicals, Like water
/obj/item/device/analyzer/plant_analyzer,
/obj/item/analyzer/plant_analyzer,
/obj/item/clothing/gloves/botanic_leather,
/obj/item/device/radio,
/obj/item/radio,
/obj/item/crowbar,
/obj/item/device/analyzer,
/obj/item/device/t_scanner,
/obj/item/analyzer,
/obj/item/t_scanner,
)
/obj/item/storage/belt/hydro/full
@@ -613,7 +613,7 @@
/obj/item/material/minihoe = 1,
/obj/item/material/hatchet = 1,
/obj/item/wirecutters/clippers = 1,
/obj/item/device/analyzer/plant_analyzer = 1,
/obj/item/analyzer/plant_analyzer = 1,
/obj/item/storage/bag/plants = 1
)
@@ -630,15 +630,15 @@
can_hold = list(
/obj/item/grenade,
/obj/item/handcuffs,
/obj/item/device/flash,
/obj/item/device/paicard,
/obj/item/flash,
/obj/item/paicard,
/obj/item/clothing/glasses,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_magazine,
/obj/item/melee/baton,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/modular_computer/handheld,
/obj/item/device/radio/headset,
/obj/item/radio/headset,
/obj/item/melee,
/obj/item/crowbar,
/obj/item/screwdriver,
@@ -648,14 +648,14 @@
/obj/item/gun/projectile/pistol,
/obj/item/gun/energy/crossbow,
/obj/item/ammo_casing/a145,
/obj/item/device/radio/uplink,
/obj/item/radio/uplink,
/obj/item/card/emag,
/obj/item/device/multitool/hacktool,
/obj/item/multitool/hacktool,
/obj/item/reagent_containers,
/obj/item/stack/telecrystal,
/obj/item/material/sword,
/obj/item/material/star,
/obj/item/device/radio
/obj/item/radio
)
/obj/item/storage/belt/fannypack
code/game/objects/items/weapons/storage/boxes.dm
+27 -27
View File
@@ -180,14 +180,14 @@
can_hold = list(
/obj/item/clothing/mask,
/obj/item/tank/emergency_oxygen,
/obj/item/device/flashlight/flare,
/obj/item/flashlight/flare,
/obj/item/stack/medical,
/obj/item/reagent_containers/hypospray/autoinjector,
/obj/item/reagent_containers/inhaler,
/obj/item/device/oxycandle,
/obj/item/oxycandle,
/obj/item/extinguisher/mini,
/obj/item/device/radio,
/obj/item/device/flashlight,
/obj/item/radio,
/obj/item/flashlight,
/obj/item/reagent_containers/food/drinks/flask,
/obj/item/storage/box/fancy/cigarettes,
/obj/item/flame/lighter,
@@ -198,8 +198,8 @@
starts_with = list(
/obj/item/clothing/mask/breath = 1,
/obj/item/tank/emergency_oxygen = 1,
/obj/item/device/oxycandle = 1,
/obj/item/device/flashlight/flare/glowstick/red = 1,
/obj/item/oxycandle = 1,
/obj/item/flashlight/flare/glowstick/red = 1,
/obj/item/stack/medical/bruise_pack = 1,
/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1
)
@@ -209,8 +209,8 @@
starts_with = list(
/obj/item/clothing/mask/breath = 1,
/obj/item/tank/emergency_oxygen/engi = 1,
/obj/item/device/oxycandle = 1,
/obj/item/device/flashlight/flare = 1,
/obj/item/oxycandle = 1,
/obj/item/flashlight/flare = 1,
/obj/item/stack/medical/bruise_pack = 1,
/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1
)
@@ -467,38 +467,38 @@
name = "box of firing pins"
desc = "A box of NT brand Firearm authentication pins; Needed to operate most weapons."
illustration = "firingpin"
starts_with = list(/obj/item/device/firing_pin = 7)
starts_with = list(/obj/item/firing_pin = 7)
/obj/item/storage/box/securitypins
name = "box of wireless-control firing pins"
desc = "A box of NT brand Firearm authentication pins; Needed to operate most weapons. These firing pins are wireless-control enabled."
illustration = "firingpin"
starts_with = list(/obj/item/device/firing_pin/wireless = 7)
starts_with = list(/obj/item/firing_pin/wireless = 7)
/obj/item/storage/box/testpins
name = "box of firing pins"
desc = "A box of NT brand Testing Authentication pins; allows guns to fire in designated firing ranges."
illustration = "firingpin"
starts_with = list(/obj/item/device/firing_pin/test_range = 7)
starts_with = list(/obj/item/firing_pin/test_range = 7)
/obj/item/storage/box/loyaltypins
name = "box of firing pins"
desc = "A box of specialised \"loyalty\" authentication pins produced by NanoTrasen; these check to see if the user of the gun it's installed in has been implanted with a mind shield implant. Often used in ERTs."
illustration = "firingpin"
starts_with = list(/obj/item/device/firing_pin/implant/loyalty = 7)
starts_with = list(/obj/item/firing_pin/implant/loyalty = 7)
/obj/item/storage/box/loyaltypins/fill()
..()
new /obj/item/device/firing_pin/implant/loyalty(src)
new /obj/item/device/firing_pin/implant/loyalty(src)
new /obj/item/device/firing_pin/implant/loyalty(src)
new /obj/item/device/firing_pin/implant/loyalty(src)
new /obj/item/firing_pin/implant/loyalty(src)
new /obj/item/firing_pin/implant/loyalty(src)
new /obj/item/firing_pin/implant/loyalty(src)
new /obj/item/firing_pin/implant/loyalty(src)
/obj/item/storage/box/firingpinsRD
name = "box of assorted firing pins"
desc = "A box of varied assortment of firing pins. Appears to have R&D stickers on all sides of the box. Also seems to have a smiley face sticker on the top of it."
illustration = "firingpin"
starts_with = list(/obj/item/device/firing_pin = 2, /obj/item/device/firing_pin/access = 2, /obj/item/device/firing_pin/implant/loyalty = 2, /obj/item/device/firing_pin/psionic = 1, /obj/item/device/firing_pin/dna = 1)
starts_with = list(/obj/item/firing_pin = 2, /obj/item/firing_pin/access = 2, /obj/item/firing_pin/implant/loyalty = 2, /obj/item/firing_pin/psionic = 1, /obj/item/firing_pin/dna = 1)
/obj/item/storage/box/psireceiver
name = "box of psionic receivers"
@@ -698,7 +698,7 @@
name = "box of Pest-B-Gon mousetraps"
desc = "<B><span class='warning'>WARNING:</span></B> <I>Keep out of reach of children</I>."
illustration = "mousetraps"
starts_with = list(/obj/item/device/assembly/mousetrap = 6)
starts_with = list(/obj/item/assembly/mousetrap = 6)
/obj/item/storage/box/pillbottles
name = "box of pill bottles"
@@ -1029,19 +1029,19 @@
name = "hadiist manifesto box"
desc = "A box filled with copies of the Hadiist Manifesto"
illustration = "paper"
starts_with = list(/obj/item/device/versebook/pra = 6)
starts_with = list(/obj/item/versebook/pra = 6)
/obj/item/storage/box/dpra_manifesto
name = "al'mariist manifesto box"
desc = "A box filled with copies of 'In Defense of Al'mari's Legacy'."
illustration = "paper"
starts_with = list(/obj/item/device/versebook/dpra = 6)
starts_with = list(/obj/item/versebook/dpra = 6)
/obj/item/storage/box/nka_manifesto
name = "royalist manifesto card box"
desc = "A box filled with copies of 'The New Kingdom'."
illustration = "paper"
starts_with = list(/obj/item/device/versebook/nka = 6)
starts_with = list(/obj/item/versebook/nka = 6)
/obj/item/storage/box/suns_flags
name = "s'rand'marr Worship flag box"
@@ -1358,7 +1358,7 @@
/obj/item/storage/box/encryption_key
name = "box"
illustration = "circuit"
starts_with = list(/obj/item/device/encryptionkey/rev = 8)
starts_with = list(/obj/item/encryptionkey/rev = 8)
/obj/item/storage/box/encryption_key/antagonist_hints(mob/user, distance, is_adjacent)
. += ..()
@@ -1483,10 +1483,10 @@
foldable = FALSE
max_storage_space = DEFAULT_BOX_STORAGE
can_hold = list(
/obj/item/device/flashlight/flare
/obj/item/flashlight/flare
)
starts_with = list(
/obj/item/device/flashlight/flare = 12
/obj/item/flashlight/flare = 12
)
// Magnetic Locks
@@ -1498,10 +1498,10 @@
foldable = FALSE
max_storage_space = DEFAULT_BOX_STORAGE
can_hold = list(
/obj/item/device/magnetic_lock
/obj/item/magnetic_lock
)
starts_with = list(
/obj/item/device/magnetic_lock = 4
/obj/item/magnetic_lock = 4
)
// Power Cells
@@ -1583,7 +1583,7 @@
desc = "A box containing 5 claymore landmines, relative detonators, and a spare one to trigger them all."
starts_with = list(
/obj/item/landmine/claymore = 5,
/obj/item/device/assembly/signaler = 6
/obj/item/assembly/signaler = 6
)
/obj/item/storage/box/unique/tea
code/game/objects/items/weapons/storage/firstaid.dm
+12 -12
View File
@@ -40,7 +40,7 @@
/obj/item/storage/pill_bottle/inaprovaline = 1,
/obj/item/storage/pill_bottle/perconol = 1,
/obj/item/stack/medical/splint = 2,
/obj/item/device/healthanalyzer = 1
/obj/item/healthanalyzer = 1
)
/obj/item/storage/firstaid/fire
@@ -61,7 +61,7 @@
/obj/item/stack/medical/advanced/ointment = 4,
/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/dermaline = 4,
/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/mortaphenyl = 4,
/obj/item/device/healthanalyzer = 1
/obj/item/healthanalyzer = 1
)
/obj/item/storage/firstaid/toxin
@@ -81,7 +81,7 @@
starts_with = list(
/obj/item/storage/box/fancy/med_pouch/toxin = 8,
/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/fluvectionem = 2,
/obj/item/device/healthanalyzer = 1
/obj/item/healthanalyzer = 1
)
/obj/item/storage/firstaid/o2
@@ -114,7 +114,7 @@
/obj/item/stack/medical/advanced/bruise_pack = 3,
/obj/item/stack/medical/advanced/ointment = 2,
/obj/item/stack/medical/splint = 1,
/obj/item/device/healthanalyzer = 1
/obj/item/healthanalyzer = 1
)
/obj/item/storage/firstaid/large/adv
@@ -127,7 +127,7 @@
/obj/item/stack/medical/advanced/bruise_pack = 5,
/obj/item/stack/medical/advanced/ointment = 4,
/obj/item/stack/medical/splint = 2,
/obj/item/device/healthanalyzer = 1
/obj/item/healthanalyzer = 1
)
/obj/item/storage/firstaid/combat
@@ -143,7 +143,7 @@
/obj/item/storage/pill_bottle/mortaphenyl = 1,
/obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone = 1,
/obj/item/stack/medical/splint = 1,
/obj/item/device/healthanalyzer = 1
/obj/item/healthanalyzer = 1
)
/obj/item/storage/firstaid/large/combat
@@ -160,7 +160,7 @@
/obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone = 1,
/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/fluvectionem = 1,
/obj/item/stack/medical/splint = 1,
/obj/item/device/healthanalyzer = 1
/obj/item/healthanalyzer = 1
)
/obj/item/storage/firstaid/surgery
@@ -208,7 +208,7 @@
/obj/item/stack/medical/advanced/bruise_pack = 4,
/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/butazoline = 4,
/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/mortaphenyl = 4,
/obj/item/device/healthanalyzer = 1
/obj/item/healthanalyzer = 1
)
/obj/item/storage/firstaid/radiation
@@ -229,7 +229,7 @@
/obj/item/storage/box/fancy/med_pouch/radiation = 6,
/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/dermaline = 1,
/obj/item/stack/medical/ointment = 2,
/obj/item/device/healthanalyzer = 1
/obj/item/healthanalyzer = 1
)
/obj/item/storage/firstaid/stab // Generic first aid kit for mappers that covers all bases.
@@ -243,7 +243,7 @@
/obj/item/storage/box/fancy/med_pouch/oxyloss = 1,
/obj/item/storage/box/fancy/med_pouch/toxin = 1,
/obj/item/storage/box/fancy/med_pouch/radiation = 1,
/obj/item/device/healthanalyzer = 1
/obj/item/healthanalyzer = 1
)
/obj/item/storage/firstaid/large/stab // Generic first aid kit for mappers that covers all bases.
@@ -257,7 +257,7 @@
/obj/item/storage/box/fancy/med_pouch/oxyloss = 2,
/obj/item/storage/box/fancy/med_pouch/toxin = 2,
/obj/item/storage/box/fancy/med_pouch/radiation = 2,
/obj/item/device/healthanalyzer = 1
/obj/item/healthanalyzer = 1
)
/obj/item/storage/firstaid/sleekstab
@@ -274,7 +274,7 @@
/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/inaprovaline = 2,
/obj/item/reagent_containers/hypospray/autoinjector/oxygen = 1,
/obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1,
/obj/item/device/healthanalyzer = 1
/obj/item/healthanalyzer = 1
)
code/game/objects/items/weapons/storage/storage.dm
+4 -4
View File
@@ -537,12 +537,12 @@
if(LAZYLEN(can_hold))
var/can_hold_item = can_hold_strict ? (item_to_check.type in can_hold) : is_type_in_list(item_to_check, can_hold)
if(!can_hold_item)
if(!stop_messages && ! istype(item_to_check, /obj/item/device/hand_labeler))
if(!stop_messages && ! istype(item_to_check, /obj/item/hand_labeler))
to_chat(usr, SPAN_NOTICE("\The [src] cannot hold \the [item_to_check]."))
return FALSE
var/max_instances = can_hold[item_to_check.type]
if(max_instances && instances_of_type_in_list(item_to_check, contents, TRUE) >= max_instances)
if(!stop_messages && !istype(item_to_check, /obj/item/device/hand_labeler))
if(!stop_messages && !istype(item_to_check, /obj/item/hand_labeler))
to_chat(usr, SPAN_NOTICE("\The [src] has no more space specifically for \the [item_to_check]."))
return FALSE
@@ -733,8 +733,8 @@
to_chat(user, SPAN_WARNING("Trying to place a loaded tray into [src] was a bad idea."))
return
if(istype(attacking_item, /obj/item/device/hand_labeler))
var/obj/item/device/hand_labeler/HL = attacking_item
if(istype(attacking_item, /obj/item/hand_labeler))
var/obj/item/hand_labeler/HL = attacking_item
if(HL.mode == 1)
return
code/game/objects/items/weapons/storage/toolbox.dm
+7 -7
View File
@@ -31,15 +31,15 @@
starts_with = list(
/obj/item/crowbar/red = 1,
/obj/item/extinguisher/mini = 1,
/obj/item/device/radio = 1
/obj/item/radio = 1
)
/obj/item/storage/toolbox/emergency/fill()
. = ..()
if(prob(50))
new /obj/item/device/flashlight(src)
new /obj/item/flashlight(src)
else
new /obj/item/device/flashlight/flare/glowstick/red(src)
new /obj/item/flashlight/flare/glowstick/red(src)
if(prob(30))
new /obj/item/weldingtool/emergency(src)
new /obj/item/clothing/glasses/welding/emergency(src)
@@ -53,7 +53,7 @@
/obj/item/wrench = 1,\
/obj/item/weldingtool = 1,
/obj/item/crowbar = 1,\
/obj/item/device/analyzer = 1,\
/obj/item/analyzer = 1,\
/obj/item/wirecutters = 1\
)
@@ -64,7 +64,7 @@
starts_with = list(\
/obj/item/screwdriver = 1,\
/obj/item/wirecutters = 1,\
/obj/item/device/t_scanner = 1,\
/obj/item/t_scanner = 1,\
/obj/item/crowbar = 1\
)
@@ -90,7 +90,7 @@
/obj/item/wrench = 1,
/obj/item/mining_scanner = 1,
/obj/item/cell/high = 1,
/obj/item/device/orbital_dropper/drill = 1
/obj/item/orbital_dropper/drill = 1
)
/obj/item/storage/toolbox/ka
@@ -118,7 +118,7 @@
/obj/item/weldingtool = 1,
/obj/item/crowbar = 1,\
/obj/item/wirecutters = 1,\
/obj/item/device/multitool = 1,\
/obj/item/multitool = 1,\
)
code/game/objects/items/weapons/storage/uplink_kits.dm
+4 -4
View File
@@ -83,9 +83,9 @@
starts_with = list(
/obj/item/stamp/chameleon = 1,
/obj/item/pen/chameleon = 1,
/obj/item/device/destTagger = 1,
/obj/item/destTagger = 1,
/obj/item/stack/packageWrap = 1,
/obj/item/device/hand_labeler = 1,
/obj/item/hand_labeler = 1,
/obj/item/folder/filled = 1
)
@@ -109,7 +109,7 @@
/obj/item/storage/box/syndie_kit/spy
name = "spy kit"
desc = "For when you want to conduct voyeurism from afar."
starts_with = list(/obj/item/device/spy_bug = 6, /obj/item/device/spy_monitor = 1)
starts_with = list(/obj/item/spy_bug = 6, /obj/item/spy_monitor = 1)
/obj/item/storage/box/syndie_kit/spy/hidden
name = "box"
@@ -228,7 +228,7 @@
/obj/item/storage/box/syndie_kit/radsuit
name = "radiation suit kit"
desc = "Contains a radiation suit and geiger counter to protect you from radiation."
starts_with = list(/obj/item/clothing/head/radiation = 1, /obj/item/clothing/suit/radiation = 1, /obj/item/clothing/glasses/safety/goggles = 1, /obj/item/device/geiger = 1, /obj/item/reagent_containers/pill/hyronalin = 1)
starts_with = list(/obj/item/clothing/head/radiation = 1, /obj/item/clothing/suit/radiation = 1, /obj/item/clothing/glasses/safety/goggles = 1, /obj/item/geiger = 1, /obj/item/reagent_containers/pill/hyronalin = 1)
/obj/item/storage/box/syndie_kit/syringe_gun
name = "syringe gun kit"
code/game/objects/items/weapons/storage/wallets.dm
+3 -3
View File
@@ -16,7 +16,7 @@
/obj/item/clothing/accessory/badge,
/obj/item/clothing/accessory/locket,
/obj/item/clothing/ring,
/obj/item/device/flashlight/pen,
/obj/item/flashlight/pen,
/obj/item/seeds,
/obj/item/coin,
/obj/item/stack/dice,
@@ -32,8 +32,8 @@
/obj/item/photo,
/obj/item/reagent_containers/pill,
/obj/item/stamp,
/obj/item/device/paicard,
/obj/item/device/encryptionkey,
/obj/item/paicard,
/obj/item/encryptionkey,
/obj/item/fluff,
/obj/item/storage/business_card_holder,
/obj/item/sample,
code/game/objects/items/weapons/surgery_tools.dm
+3 -3
View File
@@ -253,7 +253,7 @@
/obj/item/surgery/fix_o_vein = "tray_fixovein",
/obj/item/stack/medical/advanced/bruise_pack = "tray_bruise_pack",
/obj/item/autopsy_scanner = "tray_autopsy_scanner",
/obj/item/device/mass_spectrometer = "tray_mass_spectrometer",
/obj/item/mass_spectrometer = "tray_mass_spectrometer",
/obj/item/reagent_containers/glass/beaker/vial = "tray_vial",
/obj/item/reagent_containers/syringe = "tray_syringe"
)
@@ -313,7 +313,7 @@
/obj/item/surgery/surgicaldrill = 1,
/obj/item/surgery/cautery = 1,
/obj/item/autopsy_scanner = 1,
/obj/item/device/mass_spectrometer = 1,
/obj/item/mass_spectrometer = 1,
/obj/item/reagent_containers/glass/beaker/vial = 1,
/obj/item/reagent_containers/syringe = 1
)
@@ -326,7 +326,7 @@
/obj/item/surgery/surgicaldrill,
/obj/item/surgery/cautery,
/obj/item/autopsy_scanner,
/obj/item/device/mass_spectrometer,
/obj/item/mass_spectrometer,
/obj/item/reagent_containers/glass/beaker/vial,
/obj/item/reagent_containers/syringe
)
code/game/objects/items/weapons/tanks/tanks.dm
+7 -7
View File
@@ -59,16 +59,16 @@
STOP_PROCESSING(SSprocessing, src)
if(istype(loc, /obj/item/device/transfer_valve))
var/obj/item/device/transfer_valve/TTV = loc
if(istype(loc, /obj/item/transfer_valve))
var/obj/item/transfer_valve/TTV = loc
TTV.remove_tank(src)
return ..()
/obj/item/tank/attackby(obj/item/attacking_item, mob/user)
..()
if ((istype(attacking_item, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
var/obj/item/device/analyzer/A = attacking_item
if ((istype(attacking_item, /obj/item/analyzer)) && get_dist(user, src) <= 1)
var/obj/item/analyzer/A = attacking_item
A.analyze_gases(src, user)
if (istype(attacking_item, /obj/item/toy/balloon))
@@ -76,7 +76,7 @@
B.blow(src)
src.add_fingerprint(user)
if(istype(attacking_item, /obj/item/device/assembly_holder))
if(istype(attacking_item, /obj/item/assembly_holder))
bomb_assemble(attacking_item, user)
/obj/item/tank/attack_self(mob/user as mob)
@@ -93,7 +93,7 @@
/obj/item/tank/ui_host(mob/user)
. = ..()
if(istype(loc,/obj/item/device/transfer_valve))
if(istype(loc,/obj/item/transfer_valve))
return loc
/obj/item/tank/ui_data(mob/user)
@@ -242,7 +242,7 @@
var/pressure = air_contents.return_pressure()
if(pressure > TANK_FRAGMENT_PRESSURE)
if(!istype(src.loc,/obj/item/device/transfer_valve))
if(!istype(src.loc,/obj/item/transfer_valve))
message_admins("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast].")
log_game("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast].")
code/game/objects/items/weapons/teleportation.dm
+1 -1
View File
@@ -76,7 +76,7 @@ Frequency:
if (sr)
src.temp += "<B>Located Beacons:</B><BR>"
for(var/obj/item/device/radio/beacon/W in GLOB.teleportbeacons)
for(var/obj/item/radio/beacon/W in GLOB.teleportbeacons)
if (W.get_frequency() == src.frequency)
var/turf/tr = get_turf(W)
if (tr.z == sr.z && tr)
code/game/objects/items/weapons/tether.dm
+1 -1
View File
@@ -3,7 +3,7 @@ GLOBAL_LIST_INIT_TYPED(all_tethers, /obj/item/tethering_device, list())
/obj/item/tethering_device
name = "tethering device"
desc = "A device used by explorers to keep track of partners by way of electro-tether."
icon = 'icons/obj/item/device/gps.dmi'
icon = 'icons/obj/item/gps.dmi'
icon_state = "gps"
item_state = "radio"
contained_sprite = TRUE