cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-21 21:10:30 +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 00:14:26 -05: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/structures/bonfire.dm
+2 -2
View File
@@ -75,14 +75,14 @@ GLOBAL_LIST_EMPTY(total_active_bonfires)
if(fuel >= max(max_fuel * 0.1, 50) && on_fire)
to_chat(H, SPAN_NOTICE("You grab a burning stick from the fire."))
fuel -= 40
var/obj/item/device/flashlight/flare/torch/stick/torch = new(get_turf(user))
var/obj/item/flashlight/flare/torch/stick/torch = new(get_turf(user))
H.put_in_active_hand(torch)
/obj/structure/bonfire/attackby(obj/item/attacking_item, mob/user)
if(attacking_item.isFlameSource() && !on_fire) // needs to go last or else nothing else will work
light(user)
return
if(on_fire && (istype(attacking_item, /obj/item/flame) || istype(attacking_item, /obj/item/device/flashlight/flare/torch) || istype(attacking_item, /obj/item/clothing/mask/smokable))) //light unlit stuff
if(on_fire && (istype(attacking_item, /obj/item/flame) || istype(attacking_item, /obj/item/flashlight/flare/torch) || istype(attacking_item, /obj/item/clothing/mask/smokable))) //light unlit stuff
attacking_item.attackby(src, user)
return
if(fuel < max_fuel)
code/game/objects/structures/carts/engicart.dm
+5 -5
View File
@@ -7,7 +7,7 @@
var/list/my_glass = list()
var/list/my_metal = list()
var/list/my_plasteel = list()
var/obj/item/device/lightreplacer/my_lightreplacer = null
var/obj/item/lightreplacer/my_lightreplacer = null
var/obj/item/storage/toolbox/mechanical/my_blue_toolbox = null
var/obj/item/storage/toolbox/electrical/my_yellow_toolbox = null
var/obj/item/storage/toolbox/emergency/my_red_toolbox = null
@@ -18,7 +18,7 @@
/obj/item/stack/material/glass,
/obj/item/stack/material/steel,
/obj/item/stack/material/plasteel,
/obj/item/device/lightreplacer,
/obj/item/lightreplacer,
/obj/item/storage/toolbox/mechanical,
/obj/item/storage/toolbox/electrical,
/obj/item/storage/toolbox/emergency
@@ -134,7 +134,7 @@
else
storage_is_full = TRUE
if(istype(attacking_item, /obj/item/device/lightreplacer)) //---- light replacer
if(istype(attacking_item, /obj/item/lightreplacer)) //---- light replacer
if(!my_lightreplacer)
my_lightreplacer = attacking_item
should_store = TRUE
@@ -239,7 +239,7 @@
user.put_in_hands(chosen_item)
to_chat(user, SPAN_NOTICE("You take [my_plasteel[chosen_item]] from [src]."))
my_plasteel -= chosen_item
if(/obj/item/device/lightreplacer, /obj/item/device/lightreplacer/advanced)
if(/obj/item/lightreplacer, /obj/item/lightreplacer/advanced)
if(my_lightreplacer)
user.put_in_hands(my_lightreplacer)
to_chat(user, SPAN_NOTICE("You take [my_lightreplacer] from [src]."))
@@ -302,7 +302,7 @@
/obj/structure/cart/storage/engineeringcart/full/Initialize()
. = ..()
my_lightreplacer = new /obj/item/device/lightreplacer(src)
my_lightreplacer = new /obj/item/lightreplacer(src)
my_blue_toolbox = new /obj/item/storage/toolbox/mechanical(src)
my_yellow_toolbox = new /obj/item/storage/toolbox/electrical(src)
my_red_toolbox = new /obj/item/storage/toolbox/emergency(src)
code/game/objects/structures/carts/janicart.dm
+8 -8
View File
@@ -7,7 +7,7 @@
var/obj/item/storage/bag/trash/my_bag = null
var/obj/item/mop/my_mop = null
var/obj/item/reagent_containers/spray/my_spray = null
var/obj/item/device/lightreplacer/my_lightreplacer = null
var/obj/item/lightreplacer/my_lightreplacer = null
var/obj/structure/mopbucket/my_bucket = null
var/signs = 0
var/max_signs = 4
@@ -16,7 +16,7 @@
/obj/item/storage/bag/trash,
/obj/item/mop,
/obj/item/reagent_containers/spray,
/obj/item/device/lightreplacer,
/obj/item/lightreplacer,
/obj/item/clothing/suit/caution
))
@@ -54,7 +54,7 @@
my_bag = new /obj/item/storage/bag/trash(src)
my_mop = new /obj/item/mop(src)
my_spray = new /obj/item/reagent_containers/spray/cleaner(src)
my_lightreplacer = new /obj/item/device/lightreplacer(src)
my_lightreplacer = new /obj/item/lightreplacer(src)
for(signs, signs < max_signs, signs++)
new /obj/item/clothing/suit/caution(src)
@@ -144,8 +144,8 @@
held_container.afterattack(my_bucket, user, 1)
/// If its an advanced light replacer, try to dump the broken lights in the trash.
else if(istype(held_item, /obj/item/device/lightreplacer))
var/obj/item/device/lightreplacer/held_lightreplacer = held_item
else if(istype(held_item, /obj/item/lightreplacer))
var/obj/item/lightreplacer/held_lightreplacer = held_item
if(held_lightreplacer.store_broken)
return my_bag.attackby(held_item, user)
@@ -171,7 +171,7 @@
var/should_store = FALSE
var/storage_is_full = FALSE
if(istype(attacking_item, /obj/item/device/lightreplacer)) //---- light replacer
if(istype(attacking_item, /obj/item/lightreplacer)) //---- light replacer
if(!my_lightreplacer)
my_lightreplacer = attacking_item
should_store = TRUE
@@ -238,7 +238,7 @@
user.put_in_hands(my_spray)
to_chat(user, SPAN_NOTICE("You take [my_spray] from [src]."))
my_spray = null
if(istype(chosen_item, /obj/item/device/lightreplacer) && my_lightreplacer)
if(istype(chosen_item, /obj/item/lightreplacer) && my_lightreplacer)
user.put_in_hands(my_lightreplacer)
to_chat(user, SPAN_NOTICE("You take [my_lightreplacer] from [src]."))
my_lightreplacer = null
@@ -322,7 +322,7 @@
AddOverlays("cart_spray")
has_items = TRUE
if(my_lightreplacer)
if(istype(my_lightreplacer, /obj/item/device/lightreplacer/advanced))
if(istype(my_lightreplacer, /obj/item/lightreplacer/advanced))
AddOverlays("cart_adv_replacer")
else
AddOverlays("cart_replacer")
code/game/objects/structures/crates_lockers/closets.dm
+7 -7
View File
@@ -414,8 +414,8 @@
user.drop_from_inventory(attacking_item,loc)
else
user.drop_item()
else if(istype(attacking_item, /obj/item/device/cratescanner))
var/obj/item/device/cratescanner/Cscanner = attacking_item
else if(istype(attacking_item, /obj/item/cratescanner))
var/obj/item/cratescanner/Cscanner = attacking_item
if(locked)
to_chat(user, SPAN_WARNING("[attacking_item] refuses to scan \the [src]. Unlock it first!"))
return
@@ -484,8 +484,8 @@
attacking_item.play_tool_sound(get_turf(src), 50)
wrenched = TRUE
anchored = TRUE
else if(istype(attacking_item, /obj/item/device/hand_labeler))
var/obj/item/device/hand_labeler/HL = attacking_item
else if(istype(attacking_item, /obj/item/hand_labeler))
var/obj/item/hand_labeler/HL = attacking_item
if(HL.mode == 1)
return
else
@@ -840,17 +840,17 @@
Contents Scanner
==========================
*/
/obj/item/device/cratescanner
/obj/item/cratescanner
name = "crate contents scanner"
desc = "A handheld device used to scan and print a manifest of a container's contents. Does not work on locked crates, for privacy reasons."
icon = 'icons/obj/item/device/cratescanner.dmi'
icon = 'icons/obj/item/cratescanner.dmi'
icon_state = "cratescanner"
matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 140)
w_class = WEIGHT_CLASS_SMALL
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
/obj/item/device/cratescanner/proc/print_contents(targetname, targetcontents, targetloc)
/obj/item/cratescanner/proc/print_contents(targetname, targetcontents, targetloc)
var/output = list()
var/list/outputstring
for(var/atom/item in targetcontents)
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+4 -4
View File
@@ -16,8 +16,8 @@
/obj/structure/closet/gmcloset/fill()
new /obj/item/clothing/head/that(src)
new /obj/item/clothing/head/that(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/clothing/head/pin/flower(src)
new /obj/item/clothing/head/pin/flower/pink(src)
new /obj/item/clothing/head/pin/flower/yellow(src)
@@ -45,8 +45,8 @@
new /obj/item/clothing/under/waiter(src)
if(prob(1))
new /obj/item/gun/energy/mousegun(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/storage/box/gloves(src)
new /obj/item/storage/box/mousetraps(src)
new /obj/item/clothing/under/rank/chef(src)
code/game/objects/structures/crates_lockers/closets/malfunction.dm
+1 -1
View File
@@ -9,4 +9,4 @@
new /obj/item/clothing/suit/space/void(src)
new /obj/item/crowbar(src)
new /obj/item/cell(src)
new /obj/item/device/multitool(src)
new /obj/item/multitool(src)
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+27 -27
View File
@@ -15,19 +15,19 @@
new /obj/item/storage/backpack/duffel/eng(src)
new /obj/item/blueprints(src)
new /obj/item/clothing/head/welding(src)
new /obj/item/device/megaphone/engi(src)
new /obj/item/megaphone/engi(src)
new /obj/item/storage/toolbox/mechanical(src)
new /obj/item/device/multitool(src)
new /obj/item/device/flash(src)
new /obj/item/multitool(src)
new /obj/item/flash(src)
new /obj/item/taperoll/engineering(src)
new /obj/item/rfd/piping(src)
new /obj/item/gun/energy/disruptorpistol/miniature(src)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/device/gps/engineering(src)
new /obj/item/gps/engineering(src)
new /obj/item/pipewrench(src)
new /obj/item/grenade/chem_grenade/large/phoroncleaner(src)
new /obj/item/crowbar/rescue_axe/red(src)
new /obj/item/device/radio/eng/off(src)
new /obj/item/radio/eng/off(src)
new /obj/item/grenade/chem_grenade/antifuel(src)
new /obj/item/storage/lockbox/shuttle_blueprints(src)
new /obj/item/blueprints/outpost(src)
@@ -47,8 +47,8 @@
/obj/item/clothing/gloves/yellow/specialu = 1,
/obj/item/clothing/gloves/yellow/specialt = 1,
/obj/item/clothing/shoes/workboots/brown = 1,
/obj/item/device/radio/headset/heads/ce = 1,
/obj/item/device/radio/headset/heads/ce/alt = 1,
/obj/item/radio/headset/heads/ce = 1,
/obj/item/radio/headset/heads/ce/alt = 1,
/obj/item/clothing/suit/storage/hazardvest/ce = 1,
/obj/item/clothing/mask/gas/alt = 1,
/obj/item/clothing/mask/gas/half = 1,
@@ -68,25 +68,25 @@
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/clothing/accessory/storage/pouches/brown(src)
new /obj/item/storage/toolbox/mechanical(src)
new /obj/item/device/radio/headset/headset_eng(src)
new /obj/item/device/radio/headset/headset_eng/alt(src)
new /obj/item/radio/headset/headset_eng(src)
new /obj/item/radio/headset/headset_eng/alt(src)
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/taperoll/engineering(src)
new /obj/item/device/radio/eng/off(src)
new /obj/item/radio/eng/off(src)
new /obj/item/storage/belt/utility(src)
new /obj/item/storage/belt/utility/alt(src)
new /obj/item/device/gps/engineering(src)
new /obj/item/gps/engineering(src)
new /obj/item/pipewrench(src)
new /obj/item/device/flashlight/heavy(src)
new /obj/item/flashlight/heavy(src)
new /obj/item/grenade/chem_grenade/antifuel(src)
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/gloves/yellow/specialu(src)
new /obj/item/clothing/gloves/yellow/specialt(src)
// Painters
new /obj/item/device/paint_sprayer(src)
new /obj/item/device/pipe_painter(src)
new /obj/item/paint_sprayer(src)
new /obj/item/pipe_painter(src)
// Atmospherics Technician
/obj/structure/closet/secure_closet/atmos_personal
@@ -101,26 +101,26 @@
new /obj/item/clothing/accessory/storage/pouches/brown(src)
new /obj/item/clothing/suit/fire/atmos(src)
new /obj/item/extinguisher(src)
new /obj/item/device/radio/headset/headset_eng(src)
new /obj/item/device/radio/headset/headset_eng/alt(src)
new /obj/item/radio/headset/headset_eng(src)
new /obj/item/radio/headset/headset_eng/alt(src)
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/taperoll/engineering(src)
new /obj/item/reagent_containers/extinguisher_refill(src)
new /obj/item/rfd/piping(src)
new /obj/item/device/radio/eng/off(src)
new /obj/item/radio/eng/off(src)
new /obj/item/storage/belt/utility(src)
new /obj/item/storage/belt/utility/alt(src)
new /obj/item/device/gps/engineering(src)
new /obj/item/gps/engineering(src)
new /obj/item/pipewrench(src)
new /obj/item/crowbar/rescue_axe(src)
new /obj/item/device/flashlight/heavy(src)
new /obj/item/flashlight/heavy(src)
new /obj/item/grenade/chem_grenade/antifuel(src)
new /obj/item/device/debugger(src)
new /obj/item/debugger(src)
// Painters
new /obj/item/device/paint_sprayer(src)
new /obj/item/device/pipe_painter(src)
new /obj/item/paint_sprayer(src)
new /obj/item/pipe_painter(src)
// Electrical Supplies
/obj/structure/closet/secure_closet/engineering_electrical
@@ -144,12 +144,12 @@
new /obj/item/module/power_control(src)
new /obj/item/module/power_control(src)
// 3 Multitools
new /obj/item/device/multitool(src)
new /obj/item/device/multitool(src)
new /obj/item/device/multitool(src)
new /obj/item/multitool(src)
new /obj/item/multitool(src)
new /obj/item/multitool(src)
// 2 Debuggers
new /obj/item/device/debugger(src)
new /obj/item/device/debugger(src)
new /obj/item/debugger(src)
new /obj/item/debugger(src)
// Welding Supplies
/obj/structure/closet/secure_closet/engineering_welding
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+4 -4
View File
@@ -6,8 +6,8 @@
/obj/structure/closet/secure_closet/hydroponics/fill()
..()
new /obj/item/storage/bag/plants(src)
new /obj/item/device/analyzer/plant_analyzer(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/analyzer/plant_analyzer(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/material/minihoe(src)
new /obj/item/material/hatchet(src)
new /obj/item/wirecutters/clippers(src)
@@ -30,8 +30,8 @@
new /obj/item/clothing/under/rank/scientist/botany(src)
new /obj/item/storage/bag/plants(src)
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/device/analyzer/plant_analyzer(src)
new /obj/item/device/radio/headset/headset_sci(src)
new /obj/item/analyzer/plant_analyzer(src)
new /obj/item/radio/headset/headset_sci(src)
new /obj/item/clothing/head/bandana/hydro(src)
new /obj/item/material/minihoe(src)
new /obj/item/material/hatchet(src)
code/game/objects/structures/crates_lockers/closets/secure/marooning.dm
+2 -2
View File
@@ -21,8 +21,8 @@
starts_with = list(
// Tools
/obj/item/crowbar/red = 1,
/obj/item/device/flashlight/heavy = 1,
/obj/item/device/gps/marooning_equipment = 1,
/obj/item/flashlight/heavy = 1,
/obj/item/gps/marooning_equipment = 1,
/obj/item/airbubble = 1,
// Rations
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+18 -18
View File
@@ -89,8 +89,8 @@
new /obj/item/clothing/suit/storage/toggle/labcoat/zeng(src)
new /obj/item/clothing/head/headmirror
new /obj/item/clothing/shoes/sneakers/medsci(src)
new /obj/item/device/radio/headset/headset_med(src)
new /obj/item/device/radio/headset/headset_med/alt(src)
new /obj/item/radio/headset/headset_med(src)
new /obj/item/radio/headset/headset_med/alt(src)
new /obj/item/clothing/glasses/hud/health/aviator(src)
new /obj/item/clothing/glasses/eyepatch/hud/medical(src)
@@ -105,18 +105,18 @@
new /obj/item/storage/backpack/satchel/med(src)
new /obj/item/storage/backpack/duffel/med(src)
new /obj/item/clothing/head/hardhat/paramedic(src)
new /obj/item/device/radio/headset/headset_med(src)
new /obj/item/radio/headset/headset_med(src)
new /obj/item/clothing/glasses/hud/health(src)
new /obj/item/storage/backpack/medic(src)
new /obj/item/clothing/accessory/storage/white_vest(src)
new /obj/item/clothing/suit/storage/medical_chest_rig(src)
new /obj/item/device/flashlight/pen(src)
new /obj/item/flashlight/pen(src)
new /obj/item/clothing/accessory/stethoscope(src)
new /obj/item/storage/belt/medical/paramedic(src)
new /obj/item/device/gps/medical(src)
new /obj/item/gps/medical(src)
new /obj/item/reagent_containers/hypospray(src)
new /obj/item/taperoll/medical(src)
new /obj/item/device/radio/med(src)
new /obj/item/radio/med(src)
new /obj/item/roller(src)
new /obj/item/crowbar/red(src)
new /obj/item/clothing/mask/gas/alt(src)
@@ -138,10 +138,10 @@
new /obj/item/clothing/shoes/sneakers/medsci(src)
new /obj/item/clothing/under/rank/chief_medical_officer(src)
new /obj/item/storage/box/gloves(src)
new /obj/item/device/radio/headset/heads/cmo(src)
new /obj/item/device/radio/headset/heads/cmo/alt(src)
new /obj/item/device/megaphone/med(src)
new /obj/item/device/flash(src)
new /obj/item/radio/headset/heads/cmo(src)
new /obj/item/radio/headset/heads/cmo/alt(src)
new /obj/item/megaphone/med(src)
new /obj/item/flash(src)
new /obj/item/clothing/accessory/storage/white_vest(src)
new /obj/item/reagent_containers/hypospray/cmo(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)
@@ -153,10 +153,10 @@
new /obj/item/storage/belt/medical(src)
new /obj/item/clothing/accessory/stethoscope(src)
new /obj/item/storage/box/fancy/keypouch/med(src)
new /obj/item/device/advanced_healthanalyzer(src)
new /obj/item/advanced_healthanalyzer(src)
new /obj/item/gun/energy/disruptorpistol/miniature(src)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/device/eftpos(src)
new /obj/item/eftpos(src)
/obj/structure/closet/secure_closet/CMO2
name = "chief medical officer's attire"
@@ -177,7 +177,7 @@
new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt(src)
new /obj/item/clothing/shoes/sneakers/brown (src)
new /obj/item/device/radio/headset/heads/cmo(src)
new /obj/item/radio/headset/heads/cmo(src)
/obj/structure/closet/secure_closet/animal
name = "animal control closet"
@@ -185,10 +185,10 @@
/obj/structure/closet/secure_closet/animal/fill()
..()
new /obj/item/device/assembly/signaler(src)
new /obj/item/device/radio/electropack(src)
new /obj/item/device/radio/electropack(src)
new /obj/item/device/radio/electropack(src)
new /obj/item/assembly/signaler(src)
new /obj/item/radio/electropack(src)
new /obj/item/radio/electropack(src)
new /obj/item/radio/electropack(src)
/obj/structure/closet/secure_closet/chemical
name = "chemistry equipment closet"
@@ -226,7 +226,7 @@
new /obj/item/toy/plushie/therapy(src)
new /obj/item/toy/plushie/slime(src)
new /obj/item/toy/plushie/bee(src)
new /obj/item/device/flashlight/pen(src)
new /obj/item/flashlight/pen(src)
new /obj/item/storage/box/stressball(src)
// Empty
code/game/objects/structures/crates_lockers/closets/secure/operations.dm
+22 -22
View File
@@ -11,8 +11,8 @@
/obj/structure/closet/secure_closet/operations_manager/fill()
new /obj/item/clothing/under/rank/operations_manager(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/device/radio/headset/operations_manager(src)
new /obj/item/device/radio/headset/operations_manager/alt(src)
new /obj/item/radio/headset/operations_manager(src)
new /obj/item/radio/headset/operations_manager/alt(src)
new /obj/item/storage/box/fancy/keypouch/cargo(src)
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/glasses/welding(src)
@@ -21,16 +21,16 @@
new /obj/item/clothing/head/beret/cargo(src)
new /obj/item/modular_computer/handheld/preset/supply/cargo_delivery(src)
new /obj/item/export_scanner(src)
new /obj/item/device/orbital_dropper/drill(src)
new /obj/item/device/megaphone/cargo(src)
new /obj/item/orbital_dropper/drill(src)
new /obj/item/megaphone/cargo(src)
new /obj/item/storage/stickersheet/goldstar(src)
new /obj/item/gun/energy/disruptorpistol/miniature(src)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/storage/belt/utility/full(src)
new /obj/item/device/multitool(src)
new /obj/item/device/memorywiper(src)
new /obj/item/device/price_scanner(src)
new /obj/item/device/robotanalyzer(src)
new /obj/item/multitool(src)
new /obj/item/memorywiper(src)
new /obj/item/price_scanner(src)
new /obj/item/robotanalyzer(src)
// Hangar Technician
/obj/structure/closet/secure_closet/hangar_tech
@@ -43,15 +43,15 @@
new /obj/item/storage/backpack/industrial(src)
new /obj/item/storage/backpack/duffel/eng(src)
new /obj/item/clothing/under/rank/hangar_technician(src)
new /obj/item/device/radio/headset/headset_cargo(src)
new /obj/item/device/radio/headset/headset_cargo/alt(src)
new /obj/item/radio/headset/headset_cargo(src)
new /obj/item/radio/headset/headset_cargo/alt(src)
new /obj/item/modular_computer/handheld/preset/supply/cargo_delivery(src)
new /obj/item/export_scanner(src)
new /obj/item/device/price_scanner(src)
new /obj/item/device/cratescanner(src)
new /obj/item/price_scanner(src)
new /obj/item/cratescanner(src)
new /obj/item/clipboard(src)
new /obj/item/storage/belt/utility(src)
new /obj/item/device/flashlight/marshallingwand(src)
new /obj/item/flashlight/marshallingwand(src)
// Machinist
/obj/structure/closet/secure_closet/machinist
@@ -67,9 +67,9 @@
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/gloves/yellow/specialu(src)
new /obj/item/clothing/gloves/yellow/specialt(src)
new /obj/item/device/multitool(src)
new /obj/item/multitool(src)
new /obj/item/ipc_tag_scanner(src)
new /obj/item/device/robotanalyzer(src)
new /obj/item/robotanalyzer(src)
new /obj/item/storage/belt/utility(src)
new /obj/item/storage/belt/utility/alt(src)
new /obj/item/storage/toolbox/mechanical(src)
@@ -88,19 +88,19 @@
else
new /obj/item/storage/backpack/satchel/eng(src)
new /obj/item/storage/backpack/duffel/eng(src)
new /obj/item/device/radio/headset/headset_cargo(src)
new /obj/item/radio/headset/headset_cargo(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/device/analyzer(src)
new /obj/item/analyzer(src)
new /obj/item/storage/bag/ore(src)
new /obj/item/shovel(src)
new /obj/item/pickaxe(src)
new /obj/item/gun/custom_ka/frame01/prebuilt(src)
new /obj/item/ore_detector(src)
new /obj/item/key/minecarts(src)
new /obj/item/device/gps/mining(src)
new /obj/item/gps/mining(src)
new /obj/item/book/manual/ka_custom(src)
new /obj/item/device/radio(src)
new /obj/item/device/flashlight/lantern(src)
new /obj/item/radio(src)
new /obj/item/flashlight/lantern(src)
new /obj/item/sleeping_bag/mining(src)
// Merchant
@@ -122,6 +122,6 @@
new /obj/item/clothing/suit/space(src)
new /obj/item/tank/oxygen(src)
new /obj/item/cargo_backpack(src)
new /obj/item/device/gps/mining(src)
new /obj/item/device/flashlight/lantern(src)
new /obj/item/gps/mining(src)
new /obj/item/flashlight/lantern(src)
new /obj/item/pickaxe(src)
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+4 -4
View File
@@ -9,8 +9,8 @@
new /obj/item/storage/backpack(src)
else
new /obj/item/storage/backpack/satchel(src)
new /obj/item/device/radio/headset(src)
new /obj/item/device/radio/headset/alt(src)
new /obj/item/radio/headset(src)
new /obj/item/radio/headset/alt(src)
/obj/structure/closet/secure_closet/personal/patient
name = "patient's closet"
@@ -33,8 +33,8 @@
/obj/structure/closet/secure_closet/personal/cabinet/fill()
new /obj/item/storage/backpack/satchel/leather/withwallet(src)
new /obj/item/device/radio/headset(src)
new /obj/item/device/radio/headset/alt(src)
new /obj/item/radio/headset(src)
new /obj/item/radio/headset/alt(src)
/obj/structure/closet/secure_closet/personal/attackby(obj/item/attacking_item, mob/user)
if (opened)
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+12 -12
View File
@@ -7,8 +7,8 @@
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/shoes/sneakers/medsci(src)
new /obj/item/device/radio/headset/headset_sci(src)
new /obj/item/device/radio/headset/headset_sci/alt(src)
new /obj/item/radio/headset/headset_sci(src)
new /obj/item/radio/headset/headset_sci/alt(src)
new /obj/item/tank/air(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/taperoll/science(src)
@@ -29,24 +29,24 @@
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/clothing/shoes/laceup/brown(src)
new /obj/item/storage/box/gloves(src)
new /obj/item/device/radio/headset/heads/rd(src)
new /obj/item/device/radio/headset/heads/rd/alt(src)
new /obj/item/radio/headset/heads/rd(src)
new /obj/item/radio/headset/heads/rd/alt(src)
new /obj/item/tank/air(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/device/flash(src)
new /obj/item/flash(src)
new /obj/item/storage/box/firingpinsRD(src)
new /obj/item/device/pin_extractor(src)
new /obj/item/pin_extractor(src)
new /obj/item/storage/box/fancy/keypouch/sci(src)
new /obj/item/aicard(src)
new /obj/item/device/paicard(src)
new /obj/item/paicard(src)
new /obj/item/storage/box/tethers(src)
new /obj/item/taperoll/science(src)
new /obj/item/gun/energy/disruptorpistol/miniature(src)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/storage/box/psireceiver(src)
new /obj/item/device/megaphone/sci(src)
new /obj/item/device/taperecorder(src)
new /obj/item/megaphone/sci(src)
new /obj/item/taperecorder(src)
new /obj/item/sampler(src)
new /obj/item/storage/box/shells/tranquilizer(src)
new /obj/item/modular_computer/laptop/preset/supply/robotics(src)
@@ -70,6 +70,6 @@
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/clothing/shoes/laceup/brown(src)
new /obj/item/clothing/gloves/latex/nitrile(src)
new /obj/item/device/radio/headset/heads/rd(src)
new /obj/item/device/radio/headset/heads/rd/alt(src)
new /obj/item/device/megaphone/sci(src)
new /obj/item/radio/headset/heads/rd(src)
new /obj/item/radio/headset/heads/rd/alt(src)
new /obj/item/megaphone/sci(src)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+49 -49
View File
@@ -14,14 +14,14 @@
new /obj/item/clothing/head/helmet(src)
new /obj/item/clothing/suit/armor/carrier/generic(src)
//Tools
new /obj/item/device/radio/headset/heads/captain(src)
new /obj/item/device/radio/headset/heads/captain/alt(src)
new /obj/item/device/megaphone/command(src)
new /obj/item/radio/headset/heads/captain(src)
new /obj/item/radio/headset/heads/captain/alt(src)
new /obj/item/megaphone/command(src)
new /obj/item/gun/energy/repeater/pistol(src)
new /obj/item/device/flash(src)
new /obj/item/flash(src)
new /obj/item/melee/telebaton(src)
new /obj/item/device/radio/off(src)
new /obj/item/device/taperecorder(src)
new /obj/item/radio/off(src)
new /obj/item/taperecorder(src)
// uniform briefcases
new /obj/item/storage/briefcase/nt/captain(src)
new /obj/item/storage/briefcase/nt/captain_white(src)
@@ -67,16 +67,16 @@
new /obj/item/clothing/head/helmet(src)
new /obj/item/clothing/accessory/holster/waist(src)
//Tools
new /obj/item/device/radio/headset/heads/xo(src)
new /obj/item/device/radio/headset/heads/xo/alt(src)
new /obj/item/device/megaphone/command(src)
new /obj/item/radio/headset/heads/xo(src)
new /obj/item/radio/headset/heads/xo/alt(src)
new /obj/item/megaphone/command(src)
new /obj/item/storage/stickersheet/goldstar(src)
new /obj/item/gun/energy/repeater/pistol(src)
new /obj/item/gun/projectile/sec/flash(src)
new /obj/item/device/flash(src)
new /obj/item/device/eftpos(src)
new /obj/item/flash(src)
new /obj/item/eftpos(src)
new /obj/item/book/manual/wiki/security_space_law(src)
new /obj/item/device/radio/off(src)
new /obj/item/radio/off(src)
/obj/structure/closet/secure_closet/xo2
name = "executive officer's attire"
@@ -123,23 +123,23 @@
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/clothing/mask/gas/half(src)
//Tools
new /obj/item/device/radio/headset/heads/hos(src)
new /obj/item/device/radio/headset/heads/hos/alt(src)
new /obj/item/device/megaphone/sec(src)
new /obj/item/radio/headset/heads/hos(src)
new /obj/item/radio/headset/heads/hos/alt(src)
new /obj/item/megaphone/sec(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/clothing/glasses/sunglasses/sechud/head(src)
new /obj/item/shield/riot/tact(src)
new /obj/item/device/flashlight/maglight(src)
new /obj/item/flashlight/maglight(src)
new /obj/item/melee/telebaton(src)
new /obj/item/gun/energy/repeater/pistol(src)
new /obj/item/taperoll/police(src)
new /obj/item/device/breath_analyzer(src)
new /obj/item/breath_analyzer(src)
new /obj/item/crowbar/red(src)
new /obj/item/ipc_tag_scanner(src)
new /obj/item/device/taperecorder(src)
new /obj/item/device/binoculars(src)
new /obj/item/device/radio/sec(src)
new /obj/item/device/multitool(src)
new /obj/item/taperecorder(src)
new /obj/item/binoculars(src)
new /obj/item/radio/sec(src)
new /obj/item/multitool(src)
//Belts
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/storage/belt/security/full(src)
@@ -164,12 +164,12 @@
new /obj/item/clothing/head/helmet/hos(src)
//Tools
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
new /obj/item/device/radio/headset/heads/hos(src)
new /obj/item/device/radio/headset/heads/hos/alt(src)
new /obj/item/radio/headset/heads/hos(src)
new /obj/item/radio/headset/heads/hos/alt(src)
//Belts
new /obj/item/storage/belt/security(src)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/device/breath_analyzer(src)
new /obj/item/breath_analyzer(src)
/obj/structure/closet/secure_closet/warden
name = "warden's locker"
@@ -196,24 +196,24 @@
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/clothing/mask/gas/half(src)
//Tools
new /obj/item/device/radio/headset/headset_warden(src)
new /obj/item/device/radio/headset/headset_warden/alt(src)
new /obj/item/radio/headset/headset_warden(src)
new /obj/item/radio/headset/headset_warden/alt(src)
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/taperoll/police(src)
new /obj/item/gun/energy/disruptorpistol(src)
new /obj/item/device/breath_analyzer(src)
new /obj/item/breath_analyzer(src)
//Belts
new /obj/item/clothing/accessory/storage/black_vest(src)
new /obj/item/clothing/accessory/holster/hip(src)
new /obj/item/storage/belt/security/full(src)
new /obj/item/storage/belt/security/vestbelt(src)
// Utility
new /obj/item/device/radio/sec(src)
new /obj/item/radio/sec(src)
new /obj/item/crowbar(src)
new /obj/item/device/flashlight/maglight(src)
new /obj/item/flashlight/maglight(src)
new /obj/item/wrench(src)
new /obj/item/device/multitool(src)
new /obj/item/multitool(src)
/obj/structure/closet/secure_closet/security_cadet
@@ -232,14 +232,14 @@
new /obj/item/clothing/suit/storage/hazardvest/security(src)
new /obj/item/clothing/under/rank/cadet(src)
//Tools
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/radio/headset/headset_sec/alt(src)
new /obj/item/device/flash(src)
new /obj/item/radio/headset/headset_sec(src)
new /obj/item/radio/headset/headset_sec/alt(src)
new /obj/item/flash(src)
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/taperoll/police(src)
new /obj/item/device/hailer(src)
new /obj/item/device/holowarrant(src)
new /obj/item/device/flashlight/flare/glowstick/red(src)
new /obj/item/hailer(src)
new /obj/item/holowarrant(src)
new /obj/item/flashlight/flare/glowstick/red(src)
//Belts
new /obj/item/clothing/accessory/storage/black_vest(src)
new /obj/item/clothing/accessory/storage/pouches/black(src)
@@ -265,15 +265,15 @@
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/clothing/mask/gas/half(src)
//Tools
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/radio/headset/headset_sec/alt(src)
new /obj/item/radio/headset/headset_sec(src)
new /obj/item/radio/headset/headset_sec/alt(src)
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/gun/energy/disruptorpistol/security(src)
new /obj/item/taperoll/police(src)
new /obj/item/device/hailer(src)
new /obj/item/device/flashlight/flare/glowstick/red(src)
new /obj/item/device/breath_analyzer(src)
new /obj/item/hailer(src)
new /obj/item/flashlight/flare/glowstick/red(src)
new /obj/item/breath_analyzer(src)
//Belts
new /obj/item/clothing/accessory/storage/black_vest(src)
new /obj/item/clothing/accessory/storage/pouches/black(src)
@@ -297,12 +297,12 @@
new /obj/item/clothing/accessory/badge/investigator(src)
new /obj/item/clothing/mask/gas/half(src)
//Tools
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/radio/headset/headset_sec/alt(src)
new /obj/item/radio/headset/headset_sec(src)
new /obj/item/radio/headset/headset_sec/alt(src)
new /obj/item/clothing/suit/armor/carrier/officer(src)
new /obj/item/gun/energy/disruptorpistol/miniature/security(src)
new /obj/item/device/laser_pointer/blue(src)
new /obj/item/device/camera_film(src)
new /obj/item/laser_pointer/blue(src)
new /obj/item/camera_film(src)
new /obj/item/stamp/investigations(src)
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
@@ -377,10 +377,10 @@
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/gun/energy/disruptorpistol/miniature(src)
new /obj/item/device/radio/headset/headset_com(src)
new /obj/item/device/radio/headset/headset_com/alt(src)
new /obj/item/device/radio/off(src)
new /obj/item/device/gps(src)
new /obj/item/radio/headset/headset_com(src)
new /obj/item/radio/headset/headset_com/alt(src)
new /obj/item/radio/off(src)
new /obj/item/gps(src)
// Evidence Storage Locker
/obj/structure/closet/secure_closet/evidence
code/game/objects/structures/crates_lockers/closets/secure/service.dm
+9 -9
View File
@@ -6,24 +6,24 @@
req_access = list(ACCESS_JANITOR)
/obj/structure/closet/secure_closet/custodial/fill()
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/storage/box/janitorgloves(src)
new /obj/item/storage/belt/custodial(src)
new /obj/item/clothing/accessory/holster/utility/custodial/hip(src)
new /obj/item/clothing/accessory/holster/utility/custodial/armpit(src)
new /obj/item/clothing/shoes/galoshes(src)
new /obj/item/gun/energy/mousegun(src)
new /obj/item/device/flashlight(src)
new /obj/item/flashlight(src)
new /obj/item/reagent_containers/spray/cleaner(src)
new /obj/item/soap/nanotrasen(src)
new /obj/item/reagent_containers/glass/rag(src)
new /obj/item/reagent_containers/glass/rag/advanced(src)
new /obj/item/device/lightreplacer(src)
new /obj/item/lightreplacer(src)
new /obj/item/storage/bag/trash(src)
new /obj/item/grenade/chem_grenade/cleaner(src)
new /obj/item/grenade/chem_grenade/cleaner(src)
new /obj/item/grenade/chem_grenade/cleaner(src)
new /obj/item/device/gps/janitor(src)
new /obj/item/gps/janitor(src)
new /obj/item/taperoll/custodial(src)
new /obj/item/storage/box/lights/mixed(src)
new /obj/item/storage/box/mousetraps(src)
@@ -37,11 +37,11 @@
new /obj/item/storage/box/janitorgloves(src)
new /obj/item/storage/belt/custodial(src)
new /obj/item/clothing/shoes/galoshes(src)
new /obj/item/device/flashlight(src)
new /obj/item/flashlight(src)
new /obj/item/reagent_containers/spray/cleaner(src)
new /obj/item/soap/red_soap(src)
new /obj/item/reagent_containers/glass/rag(src)
new /obj/item/device/lightreplacer(src)
new /obj/item/lightreplacer(src)
new /obj/item/storage/bag/trash(src)
new /obj/item/grenade/chem_grenade/cleaner(src)
new /obj/item/grenade/chem_grenade/cleaner(src)
@@ -62,11 +62,11 @@
/obj/structure/closet/secure_closet/journalist/fill()
new /obj/item/storage/photo_album(src)
new /obj/item/device/camera_film(src)
new /obj/item/device/camera(src)
new /obj/item/camera_film(src)
new /obj/item/camera(src)
new /obj/item/paper_scanner(src)
new /obj/item/folder/white(src)
new /obj/item/storage/secure/briefcase(src)
new /obj/item/clipboard(src)
new /obj/item/folder/red(src)
new /obj/item/device/tvcamera(src)
new /obj/item/tvcamera(src)
code/game/objects/structures/crates_lockers/closets/sol_gear.dm
+2 -2
View File
@@ -147,10 +147,10 @@
new /obj/item/clothing/suit/storage/vest(src)
new /obj/item/clothing/head/helmet(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/device/radio/headset/heads/captain(src)
new /obj/item/radio/headset/heads/captain(src)
new /obj/item/clothing/gloves/white(src)
new /obj/item/gun/energy/pistol(src)
new /obj/item/device/flash(src)
new /obj/item/flash(src)
new /obj/item/melee/telebaton(src)
new /obj/item/melee/ceremonial_sword(src)
new /obj/item/clothing/under/rank/sol(src)
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+2 -2
View File
@@ -15,7 +15,7 @@
new /obj/item/crowbar/red(src)
new /obj/item/cell/high(src)
new /obj/item/card/id/syndicate(src)
new /obj/item/device/multitool(src)
new /obj/item/multitool(src)
new /obj/item/shield/energy(src)
new /obj/item/clothing/shoes/magboots/syndie(src)
@@ -54,7 +54,7 @@
new /obj/item/pinpointer/nukeop(src)
new /obj/item/pinpointer/nukeop(src)
new /obj/item/modular_computer/handheld/pda/syndicate(src)
var/obj/item/device/radio/uplink/U = new(src)
var/obj/item/radio/uplink/U = new(src)
U.hidden_uplink.telecrystals = 40
U.hidden_uplink.bluecrystals = 20
return
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+18 -18
View File
@@ -27,7 +27,7 @@
new /obj/item/clothing/mask/breath(src)
new /obj/item/clothing/suit/space/emergency(src)
new /obj/item/clothing/head/helmet/space/emergency(src)
new /obj/item/device/oxycandle(src)
new /obj/item/oxycandle(src)
new /obj/item/airbubble(src)
if ("aid")
new /obj/item/tank/emergency_oxygen(src)
@@ -36,7 +36,7 @@
new /obj/item/storage/firstaid/o2(src)
new /obj/item/clothing/suit/space/emergency(src)
new /obj/item/clothing/head/helmet/space/emergency(src)
new /obj/item/device/oxycandle(src)
new /obj/item/oxycandle(src)
new /obj/item/airbubble(src)
if ("tank")
new /obj/item/tank/emergency_oxygen/engi(src)
@@ -44,8 +44,8 @@
new /obj/item/tank/emergency_oxygen/engi(src)
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/device/oxycandle(src)
new /obj/item/device/oxycandle(src)
new /obj/item/oxycandle(src)
new /obj/item/oxycandle(src)
new /obj/item/airbubble(src)
if ("seal")
new /obj/item/tank/emergency_oxygen(src)
@@ -53,7 +53,7 @@
new /obj/item/clothing/mask/breath(src)
new /obj/item/clothing/suit/space/emergency(src)
new /obj/item/clothing/head/helmet/space/emergency(src)
new /obj/item/device/oxycandle(src)
new /obj/item/oxycandle(src)
new /obj/item/storage/bag/inflatable/emergency(src)
if ("all")
new /obj/item/storage/toolbox/emergency(src)
@@ -66,9 +66,9 @@
new /obj/item/clothing/suit/space/emergency(src)
new /obj/item/clothing/head/helmet/space/emergency(src)
new /obj/item/clothing/head/helmet/space/emergency(src)
new /obj/item/device/oxycandle(src)
new /obj/item/device/oxycandle(src)
new /obj/item/device/oxycandle(src)
new /obj/item/oxycandle(src)
new /obj/item/oxycandle(src)
new /obj/item/oxycandle(src)
new /obj/item/airbubble(src)
new /obj/item/airbubble(src)
new /obj/item/storage/bag/inflatable/emergency(src)
@@ -109,10 +109,10 @@
new /obj/item/clothing/suit/space/emergency(src)
new /obj/item/tank/emergency_oxygen(src)
new /obj/item/tank/emergency_oxygen(src)
new /obj/item/device/oxycandle(src)
new /obj/item/device/oxycandle(src)
new /obj/item/device/oxycandle(src)
new /obj/item/device/oxycandle(src)
new /obj/item/oxycandle(src)
new /obj/item/oxycandle(src)
new /obj/item/oxycandle(src)
new /obj/item/oxycandle(src)
/*
* Fire Closet
@@ -138,7 +138,7 @@
new /obj/item/clothing/suit/fire(src)
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/crowbar/rescue_axe/red(src)
new /obj/item/device/flashlight(src)
new /obj/item/flashlight(src)
new /obj/item/tank/oxygen/red(src)
new /obj/item/extinguisher(src)
new /obj/item/storage/bag/inflatable/emergency(src)
@@ -156,7 +156,7 @@
if(prob(40))
new /obj/item/clothing/suit/storage/hazardvest(src)
if(prob(70))
new /obj/item/device/flashlight(src)
new /obj/item/flashlight(src)
if(prob(70))
new /obj/item/screwdriver(src)
if(prob(70))
@@ -168,7 +168,7 @@
if(prob(70))
new /obj/item/wirecutters(src)
if(prob(70))
new /obj/item/device/t_scanner(src)
new /obj/item/t_scanner(src)
if(prob(20))
new /obj/item/storage/belt/utility(src)
if(prob(20))
@@ -180,7 +180,7 @@
if(prob(30))
new /obj/item/stack/cable_coil/random(src)
if(prob(20))
new /obj/item/device/multitool(src)
new /obj/item/multitool(src)
if(prob(5))
new /obj/item/clothing/gloves/yellow(src)
if(prob(40))
@@ -204,7 +204,7 @@
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/glasses/safety/goggles(src)
new /obj/item/storage/firstaid/radiation(src)
new /obj/item/device/geiger(src)
new /obj/item/geiger(src)
/*
* Bombsuit closet
@@ -232,4 +232,4 @@
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/clothing/head/bomb_hood/security(src)
new /obj/item/wirecutters/bomb(src)
new /obj/item/device/mine_detector(src)
new /obj/item/mine_detector(src)
code/game/objects/structures/crates_lockers/closets/walllocker.dm
+2 -2
View File
@@ -64,7 +64,7 @@
new /obj/item/clothing/head/hardhat/firefighter(src)
new /obj/item/clothing/suit/fire(src)
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/device/flashlight(src)
new /obj/item/flashlight(src)
new /obj/item/crowbar/rescue_axe/red(src)
new /obj/item/tank/oxygen/red(src)
new /obj/item/extinguisher(src)
@@ -79,7 +79,7 @@
new /obj/item/clothing/head/hardhat/firefighter(src)
new /obj/item/clothing/suit/fire(src)
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/device/flashlight(src)
new /obj/item/flashlight(src)
new /obj/item/tank/oxygen/red(src)
new /obj/item/extinguisher(src)
new /obj/item/ladder_mobile(src)
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+1 -1
View File
@@ -88,7 +88,7 @@
new /obj/item/storage/box/fancy/candle_box(src)
new /obj/item/storage/box/fancy/candle_box(src)
new /obj/item/deck/tarot(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/spirit_board(src)
new /obj/item/mesmetron(src)
new /obj/item/toy/plushie/therapy(src)
code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
+17 -17
View File
@@ -78,7 +78,7 @@
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss/emp(src)
new /obj/item/device/modkit/multi_species(src)
new /obj/item/modkit/multi_species(src)
new /obj/item/voidsuit_modkit_multi/coalition(src)
/obj/structure/closet/crate/secure/gear_loadout/eridani/fill()
@@ -169,7 +169,7 @@
new /obj/item/gun/projectile/pistol(src)
new /obj/item/ammo_magazine/mc9mm(src)
new /obj/item/grenade/chem_grenade/large/phoroncleaner(src)
new /obj/item/device/modkit/ipc(src)
new /obj/item/modkit/ipc(src)
/obj/structure/closet/crate/secure/gear_loadout/sol/fill()
new /obj/item/clothing/under/rank/sol/marine(src)
@@ -288,7 +288,7 @@
new /obj/item/clothing/suit/space/void/zenghu(src)
new /obj/item/tank/oxygen/red(src)
new /obj/item/clothing/shoes/magboots(src)
new /obj/item/device/modkit/multi_species(src)
new /obj/item/modkit/multi_species(src)
/obj/structure/closet/crate/gear_loadout/nanotrasen/suit/fill()
new /obj/item/rig/nanotrasen(src)
@@ -299,14 +299,14 @@
new /obj/item/clothing/suit/space/void/hephaestus(src)
new /obj/item/tank/oxygen/red(src)
new /obj/item/clothing/shoes/magboots(src)
new /obj/item/device/modkit/unathi(src)
new /obj/item/modkit/unathi(src)
/obj/structure/closet/crate/gear_loadout/einstein/suit/fill()
new /obj/item/clothing/head/helmet/space/void/einstein(src)
new /obj/item/clothing/suit/space/void/einstein(src)
new /obj/item/tank/oxygen/red(src)
new /obj/item/clothing/shoes/magboots(src)
new /obj/item/device/modkit/multi_species(src)
new /obj/item/modkit/multi_species(src)
/obj/structure/closet/crate/secure/gear_loadout/dominia/fill()
new /obj/item/clothing/under/dominia/fleet(src)
@@ -390,7 +390,7 @@
new /obj/item/melee/energy/sword/pirate(src)
new /obj/item/shield/energy/dominia(src)
new /obj/item/voidsuit_modkit/dominianvoid(src)
new /obj/item/device/modkit/unathi(src)
new /obj/item/modkit/unathi(src)
/obj/structure/closet/crate/secure/gear_loadout/kosmostrelki/fill()
new /obj/item/clothing/under/tajaran/cosmonaut(src)
@@ -432,7 +432,7 @@
new /obj/item/gun/projectile/deagle/adhomai(src)
new /obj/item/ammo_magazine/a50(src)
new /obj/item/ammo_magazine/a50(src)
new /obj/item/device/augment_implanter/advanced_tesla(src)
new /obj/item/augment_implanter/advanced_tesla(src)
/obj/structure/closet/crate/secure/gear_loadout/kosmostrelki/single/fill()
new /obj/item/clothing/under/tajaran/cosmonaut(src)
@@ -572,7 +572,7 @@
new /obj/item/suppressor(src)
new /obj/item/ammo_magazine/mc9mm(src)
new /obj/item/ammo_magazine/mc9mm(src)
new /obj/item/device/modkit/multi_species(src)
new /obj/item/modkit/multi_species(src)
/obj/structure/closet/crate/gear_loadout/ceres/fill()
new /obj/item/rig/bunker/nerfed/equipped(src)
@@ -906,7 +906,7 @@
new /obj/item/ammo_magazine/a357(src)
new /obj/item/gun/projectile/gauss(src) //1 tungsten slug gun w/spare magazine
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/device/modkit/multi_species(src)
new /obj/item/modkit/multi_species(src)
/obj/structure/closet/crate/gear_loadout/qukala/fill()
new /obj/item/clothing/under/skrell/qukala(src)
@@ -1099,7 +1099,7 @@
new /obj/item/clothing/head/helmet/tcaf/tcaf_visor(src)
new /obj/item/gun/energy/blaster/tcaf(src)
new /obj/item/storage/belt/military(src)
new /obj/item/device/modkit/multi_species(src)
new /obj/item/modkit/multi_species(src)
/obj/structure/closet/crate/secure/gear_loadout/exclusionist/fill()
new /obj/item/clothing/under/gearharness(src)
@@ -1218,10 +1218,10 @@
new /obj/item/clothing/shoes/magboots(src)
new /obj/item/clothing/shoes/magboots(src)
new /obj/item/clothing/shoes/magboots(src)
new /obj/item/device/suit_cooling_unit(src)
new /obj/item/device/suit_cooling_unit(src)
new /obj/item/device/suit_cooling_unit(src)
new /obj/item/device/suit_cooling_unit(src)
new /obj/item/suit_cooling_unit(src)
new /obj/item/suit_cooling_unit(src)
new /obj/item/suit_cooling_unit(src)
new /obj/item/suit_cooling_unit(src)
/obj/structure/closet/crate/secure/gear_loadout/hoplan/single/fill()
new /obj/item/clothing/shoes/jackboots(src)
@@ -1247,7 +1247,7 @@
new /obj/item/clothing/head/helmet/space/void/golden_deep/hoplan(src)
new /obj/item/clothing/suit/space/void/golden_deep/hoplan(src)
new /obj/item/clothing/shoes/magboots(src)
new /obj/item/device/suit_cooling_unit(src)
new /obj/item/suit_cooling_unit(src)
//ninja stuff
/obj/structure/closet/crate/secure/gear_loadout/ninja
@@ -1296,7 +1296,7 @@
/obj/structure/closet/crate/secure/gear_loadout/ninja/tesla/fill()
..()
new /obj/item/device/augment_implanter/advanced_tesla(src)
new /obj/item/augment_implanter/advanced_tesla(src)
new /obj/item/clothing/accessory/holster/armpit/brown(src)
new /obj/item/gun/projectile/pistol/adhomai(src)
new /obj/item/ammo_magazine/mc9mm(src)
@@ -1417,7 +1417,7 @@
new /obj/item/reagent_containers/food/snacks/koisbar(src)
new /obj/item/reagent_containers/food/snacks/koisbar(src)
new /obj/item/gun/energy/vaurca/blaster(src)
new /obj/item/device/augment_implanter/hivenet_warfare(src)
new /obj/item/augment_implanter/hivenet_warfare(src)
/obj/structure/closet/crate/secure/gear_loadout/ninja/skrell
associated_hardsuit = /obj/item/rig/skrell/tup/ninja
code/game/objects/structures/fluff/engineering/maintenance.dm
+2 -2
View File
@@ -116,7 +116,7 @@ ABSTRACT_TYPE(/obj/structure/engineer_maintenance)
panel_tools = list(
/obj/item/pipewrench = /singleton/engineer_maintenance_tool/steam_pipe,
/obj/item/hammer = /singleton/engineer_maintenance_tool/steam_pipe,
/obj/item/device/multitool = /singleton/engineer_maintenance_tool/steam_pipe
/obj/item/multitool = /singleton/engineer_maintenance_tool/steam_pipe
)
/obj/structure/engineer_maintenance/pipe/wall
@@ -145,7 +145,7 @@ ABSTRACT_TYPE(/obj/structure/engineer_maintenance)
panel_tools = list(
/obj/item/wirecutters = /singleton/engineer_maintenance_tool/electrical_spark,
/obj/item/stack/cable_coil = /singleton/engineer_maintenance_tool/electrical_spark,
/obj/item/device/multitool = /singleton/engineer_maintenance_tool/electrical_hum
/obj/item/multitool = /singleton/engineer_maintenance_tool/electrical_hum
)
/obj/structure/engineer_maintenance/electric/wall
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+1 -1
View File
@@ -235,7 +235,7 @@
attacking_item.pixel_x = 10 //make sure they reach the pillow
attacking_item.pixel_y = -6
else if(istype(attacking_item, /obj/item/device/paint_sprayer))
else if(istype(attacking_item, /obj/item/paint_sprayer))
return
else if(!istype(attacking_item, /obj/item/bedsheet))
code/game/objects/structures/trash_pile.dm
+5 -5
View File
@@ -146,7 +146,7 @@
/obj/item/storage/box/fancy/cigarettes = 3,
/obj/item/storage/box/fancy/cigarettes/acmeco = 3,
/obj/item/storage/box/fancy/cigarettes/blank = 3,
/obj/item/device/radio/headset = 3,
/obj/item/radio/headset = 3,
/obj/item/camera_assembly = 3,
/obj/item/clothing/head/cone = 3,
/obj/item/cell/high = 3,
@@ -164,9 +164,9 @@
/obj/item/clothing/shoes/galoshes = 2,
/obj/item/clothing/pants/camo = 2,
/obj/item/clothing/under/syndicate/tacticool = 2,
/obj/item/device/camera = 2,
/obj/item/device/flashlight/flare = 2,
/obj/item/device/flashlight/flare/glowstick/random = 2,
/obj/item/camera = 2,
/obj/item/flashlight/flare = 2,
/obj/item/flashlight/flare/glowstick/random = 2,
/obj/item/cell/super = 2,
/obj/item/contraband/poster = 2,
/obj/item/reagent_containers/glass/rag = 2,
@@ -208,7 +208,7 @@
/obj/item/handcuffs/legcuffs = 2,
/obj/item/grenade/chem_grenade/gas = 2,
/obj/item/clothing/suit/storage/vest/heavy = 1,
/obj/item/device/radiojammer = 1,
/obj/item/radiojammer = 1,
/obj/item/trap = 1,
/obj/item/cell/hyper/empty = 1,
/obj/item/material/knife/tacknife = 1,
code/game/objects/structures/watercloset.dm
+1 -1
View File
@@ -186,7 +186,7 @@
G.clean_blood()
/obj/machinery/shower/attackby(obj/item/attacking_item, mob/user)
if(attacking_item.type == /obj/item/device/analyzer)
if(attacking_item.type == /obj/item/analyzer)
to_chat(user, SPAN_NOTICE("The water temperature seems to be [watertemp]."))
if(attacking_item.tool_behaviour == TOOL_WRENCH)
var/newtemp = input(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve") in temperature_settings