cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-28 07:38:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes devices

Browse Source
This commit is contained in:
atermonera
2022-04-17 19:14:43 -08:00
parent 7a9806d9b4
commit 9d71839ac6
600 changed files with 5636 additions and 5530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+6 -6
View File
@@ -15,7 +15,7 @@
starts_with = list(
/obj/item/clothing/head/that = 2,
/obj/item/device/radio/headset/headset_service = 2,
/obj/item/radio/headset/headset_service = 2,
/obj/item/clothing/head/pin/flower,
/obj/item/clothing/head/pin/flower/pink,
/obj/item/clothing/head/pin/flower/yellow,
@@ -41,7 +41,7 @@
starts_with = list(
/obj/item/clothing/under/sundress,
/obj/item/clothing/under/waiter = 2,
/obj/item/device/radio/headset/headset_service = 2,
/obj/item/radio/headset/headset_service = 2,
/obj/item/storage/box/mousetraps = 2,
/obj/item/clothing/under/rank/chef,
/obj/item/clothing/head/chefhat,
@@ -59,14 +59,14 @@
starts_with = list(
/obj/item/clothing/under/rank/janitor,
/obj/item/clothing/under/dress/maid/janitor,
/obj/item/device/radio/headset/headset_service,
/obj/item/radio/headset/headset_service,
/obj/item/cartridge/janitor,
/obj/item/clothing/gloves/black,
/obj/item/clothing/head/soft/purple,
/obj/item/clothing/head/beret/purple,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/clothing/suit/caution = 4,
/obj/item/device/lightreplacer,
/obj/item/lightreplacer,
/obj/item/storage/bag/trash,
/obj/item/storage/belt/janitor,
/obj/item/clothing/shoes/galoshes)
@@ -98,4 +98,4 @@
/obj/item/clothing/glasses/sunglasses/big = 2,
/obj/item/clothing/under/lawyer/blue = 2,
/obj/item/clothing/under/lawyer/blue/skirt = 2,
/obj/item/device/tape/random = 2)
/obj/item/tape/random = 2)
code/game/objects/structures/crates_lockers/closets/malfunction.dm
+1 -1
View File
@@ -9,4 +9,4 @@
/obj/item/clothing/suit/space/void,
/obj/item/tool/crowbar,
/obj/item/cell,
/obj/item/device/multitool)
/obj/item/multitool)
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+7 -7
View File
@@ -11,8 +11,8 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo,
/obj/item/clothing/shoes/boots/winter/supply,
/obj/item/clothing/shoes/black,
/obj/item/device/radio/headset/headset_cargo,
/obj/item/device/radio/headset/headset_cargo/alt,
/obj/item/radio/headset/headset_cargo,
/obj/item/radio/headset/headset_cargo/alt,
/obj/item/clothing/gloves/black,
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/head/soft)
@@ -37,8 +37,8 @@
/obj/item/clothing/under/rank/cargo/jeans,
/obj/item/clothing/under/rank/cargo/jeans/female,
/obj/item/clothing/shoes/brown,
/obj/item/device/radio/headset/headset_cargo,
/obj/item/device/radio/headset/headset_cargo/alt,
/obj/item/radio/headset/headset_cargo,
/obj/item/radio/headset/headset_cargo/alt,
/obj/item/clothing/gloves/black,
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/suit/fire/firefighter,
@@ -64,13 +64,13 @@
closet_appearance = /decl/closet_appearance/secure_closet/mining
starts_with = list(
/obj/item/device/radio/headset/headset_mine,
/obj/item/radio/headset/headset_mine,
/obj/item/clothing/under/rank/miner,
/obj/item/clothing/gloves/black,
/obj/item/clothing/shoes/black,
/obj/item/device/analyzer,
/obj/item/analyzer,
/obj/item/storage/bag/ore,
/obj/item/device/flashlight/lantern,
/obj/item/flashlight/lantern,
/obj/item/shovel,
/obj/item/pickaxe,
/obj/item/clothing/glasses/material,
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+11 -11
View File
@@ -15,15 +15,15 @@
/obj/item/clothing/gloves/yellow,
/obj/item/clothing/shoes/brown,
/obj/item/cartridge/ce,
/obj/item/device/radio/headset/heads/ce,
/obj/item/device/radio/headset/heads/ce/alt,
/obj/item/radio/headset/heads/ce,
/obj/item/radio/headset/heads/ce/alt,
/obj/item/storage/toolbox/mechanical,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
/obj/item/device/multitool,
/obj/item/multitool,
/obj/item/storage/belt/utility/chief/full,
/obj/item/device/flash,
/obj/item/device/t_scanner/upgraded,
/obj/item/flash,
/obj/item/t_scanner/upgraded,
/obj/item/taperoll/engineering,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering,
/obj/item/clothing/shoes/boots/winter/engineering,
@@ -47,7 +47,7 @@
/obj/item/clothing/gloves/yellow = 2,
/obj/item/storage/toolbox/electrical = 3,
/obj/item/module/power_control = 3,
/obj/item/device/multitool = 3)
/obj/item/multitool = 3)
/obj/structure/closet/secure_closet/engineering_welding
@@ -69,8 +69,8 @@
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/storage/toolbox/mechanical,
/obj/item/device/radio/headset/headset_eng,
/obj/item/device/radio/headset/headset_eng/alt,
/obj/item/radio/headset/headset_eng,
/obj/item/radio/headset/headset_eng/alt,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
/obj/item/clothing/glasses/meson,
@@ -100,11 +100,11 @@
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/clothing/suit/fire/firefighter,
/obj/item/clothing/head/hardhat/red,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/extinguisher,
/obj/item/clamp,
/obj/item/device/radio/headset/headset_eng,
/obj/item/device/radio/headset/headset_eng/alt,
/obj/item/radio/headset/headset_eng,
/obj/item/radio/headset/headset_eng/alt,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
/obj/item/cartridge/atmos,
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+2 -2
View File
@@ -6,8 +6,8 @@
starts_with = list(
/obj/item/storage/bag/plants,
/obj/item/clothing/under/rank/hydroponics,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/radio/headset/headset_service,
/obj/item/analyzer/plant_analyzer,
/obj/item/radio/headset/headset_service,
/obj/item/clothing/head/greenbandana,
/obj/item/material/minihoe,
/obj/item/material/knife/machete/hatchet,
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+17 -17
View File
@@ -37,8 +37,8 @@
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/shoes/white,
/obj/item/cartridge/medical,
/obj/item/device/radio/headset/headset_med,
/obj/item/device/radio/headset/headset_med/alt,
/obj/item/radio/headset/headset_med,
/obj/item/radio/headset/headset_med/alt,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
/obj/item/clothing/shoes/boots/winter/medical,
/obj/item/clothing/under/rank/nursesuit,
@@ -103,22 +103,22 @@
/obj/item/clothing/mask/gas,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/suit/storage/toggle/labcoat/emt,
/obj/item/device/radio/headset/headset_med/alt,
/obj/item/radio/headset/headset_med/alt,
/obj/item/cartridge/medical,
/obj/item/storage/briefcase/inflatable,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/tank/emergency/oxygen/engi,
/obj/item/clothing/glasses/hud/health,
/obj/item/device/healthanalyzer,
/obj/item/device/radio/off,
/obj/item/healthanalyzer,
/obj/item/radio/off,
/obj/random/medical,
/obj/item/tool/crowbar,
/obj/item/extinguisher/mini,
/obj/item/storage/box/freezer,
/obj/item/clothing/accessory/storage/white_vest,
/obj/item/taperoll/medical,
/obj/item/device/gps/medical,
/obj/item/device/geiger
/obj/item/gps/medical,
/obj/item/geiger
)
/obj/structure/closet/secure_closet/CMO
@@ -134,9 +134,9 @@
/obj/item/cartridge/cmo,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/shoes/brown,
/obj/item/device/radio/headset/heads/cmo,
/obj/item/device/radio/headset/heads/cmo/alt,
/obj/item/device/flash,
/obj/item/radio/headset/heads/cmo,
/obj/item/radio/headset/heads/cmo/alt,
/obj/item/flash,
/obj/item/reagent_containers/hypospray/vial,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
/obj/item/clothing/shoes/boots/winter/medical,
@@ -146,7 +146,7 @@
/obj/item/clothing/suit/bio_suit/cmo,
/obj/item/clothing/head/bio_hood/cmo,
/obj/item/clothing/shoes/white,
/obj/item/device/gps/medical/cmo)
/obj/item/gps/medical/cmo)
/obj/structure/closet/secure_closet/CMO/Initialize()
if(prob(50))
@@ -179,8 +179,8 @@
req_access = list(access_surgery)
starts_with = list(
/obj/item/device/assembly/signaler,
/obj/item/device/radio/electropack = 3)
/obj/item/assembly/signaler,
/obj/item/radio/electropack = 3)
/obj/structure/closet/secure_closet/chemical
@@ -217,9 +217,9 @@
/obj/item/reagent_containers/pill/methylphenidate,
/obj/item/clipboard,
/obj/item/folder/white,
/obj/item/device/taperecorder,
/obj/item/device/tape/random = 3,
/obj/item/device/camera,
/obj/item/taperecorder,
/obj/item/tape/random = 3,
/obj/item/camera,
/obj/item/toy/plushie/therapy/blue)
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+2 -2
View File
@@ -5,7 +5,7 @@
var/registered_name = null
starts_with = list(
/obj/item/device/radio/headset)
/obj/item/radio/headset)
/obj/structure/closet/secure_closet/personal/Initialize()
if(prob(50))
@@ -32,7 +32,7 @@
starts_with = list(
/obj/item/storage/backpack/satchel/withwallet,
/obj/item/device/radio/headset
/obj/item/radio/headset
)
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W as obj, mob/user as mob)
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+13 -13
View File
@@ -7,7 +7,7 @@
/obj/item/clothing/under/rank/scientist,
/obj/item/clothing/suit/storage/toggle/labcoat,
/obj/item/clothing/shoes/white,
/obj/item/device/radio/headset/headset_sci,
/obj/item/radio/headset/headset_sci,
/obj/item/tank/air,
/obj/item/clothing/mask/gas,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
@@ -38,11 +38,11 @@
/obj/item/clothing/shoes/white,
/obj/item/clothing/shoes/laceup/brown,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/device/radio/headset/heads/rd,
/obj/item/device/radio/headset/heads/rd/alt,
/obj/item/radio/headset/heads/rd,
/obj/item/radio/headset/heads/rd/alt,
/obj/item/tank/air,
/obj/item/clothing/mask/gas,
/obj/item/device/flash,
/obj/item/flash,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
/obj/item/clothing/shoes/boots/winter/science)
@@ -57,7 +57,7 @@
/obj/item/clothing/shoes/white,
/obj/item/melee/umbrella, // vorestation addition,
/obj/item/clothing/glasses/science,
/obj/item/device/radio/headset/headset_sci,
/obj/item/radio/headset/headset_sci,
/obj/item/storage/belt/archaeology,
/obj/item/storage/excavation)
@@ -68,16 +68,16 @@
starts_with = list(
/obj/item/storage/belt/archaeology,
/obj/item/storage/excavation,
/obj/item/device/flashlight/lantern,
/obj/item/device/ano_scanner,
/obj/item/device/depth_scanner,
/obj/item/device/core_sampler,
/obj/item/device/gps,
/obj/item/device/beacon_locator,
/obj/item/device/radio/beacon,
/obj/item/flashlight/lantern,
/obj/item/ano_scanner,
/obj/item/depth_scanner,
/obj/item/core_sampler,
/obj/item/gps,
/obj/item/beacon_locator,
/obj/item/radio/beacon,
/obj/item/clothing/glasses/meson,
/obj/item/pickaxe,
/obj/item/device/measuring_tape,
/obj/item/measuring_tape,
/obj/item/pickaxe/hand,
/obj/item/storage/bag/fossils,
/obj/item/hand_labeler)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+29 -29
View File
@@ -9,11 +9,11 @@
/obj/item/clothing/suit/storage/vest,
/obj/item/cartridge/captain,
/obj/item/storage/lockbox/medal,
/obj/item/device/radio/headset/heads/captain,
/obj/item/device/radio/headset/heads/captain/alt,
/obj/item/radio/headset/heads/captain,
/obj/item/radio/headset/heads/captain/alt,
/obj/item/gun/energy/gun,
/obj/item/melee/telebaton,
/obj/item/device/flash,
/obj/item/flash,
/obj/item/storage/box/ids)
@@ -26,12 +26,12 @@
/obj/item/clothing/suit/storage/vest,
/obj/item/clothing/head/helmet,
/obj/item/cartridge/hop,
/obj/item/device/radio/headset/heads/hop,
/obj/item/device/radio/headset/heads/hop/alt,
/obj/item/radio/headset/heads/hop,
/obj/item/radio/headset/heads/hop/alt,
/obj/item/storage/box/ids = 2,
/obj/item/gun/energy/gun,
/obj/item/gun/projectile/sec/flash,
/obj/item/device/flash)
/obj/item/flash)
/obj/structure/closet/secure_closet/hop2
name = "head of personnel's attire"
@@ -76,8 +76,8 @@
/obj/item/clothing/suit/storage/vest/hoscoat,
/obj/item/clothing/head/helmet/dermal,
/obj/item/cartridge/hos,
/obj/item/device/radio/headset/heads/hos,
/obj/item/device/radio/headset/heads/hos/alt,
/obj/item/radio/headset/heads/hos,
/obj/item/radio/headset/heads/hos/alt,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/shield/riot,
@@ -88,7 +88,7 @@
/obj/item/tool/crowbar/red,
/obj/item/storage/box/flashbangs,
/obj/item/storage/belt/security,
/obj/item/device/flash,
/obj/item/flash,
/obj/item/melee/baton/loaded,
/obj/item/gun/magnetic/railgun/heater/pistol/hos,
/obj/item/rcd_ammo/large,
@@ -98,7 +98,7 @@
/obj/item/clothing/head/beret/sec/corporate/hos,
/obj/item/clothing/suit/storage/hooded/wintercoat/security,
/obj/item/clothing/shoes/boots/winter/security,
/obj/item/device/flashlight/maglight,
/obj/item/flashlight/maglight,
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/mask/gas/sechailer/swat/hos)
@@ -128,8 +128,8 @@
/obj/item/clothing/head/helmet/warden,
/obj/item/clothing/head/helmet/warden/hat,
/obj/item/cartridge/security,
/obj/item/device/radio/headset/headset_sec,
/obj/item/device/radio/headset/headset_sec/alt,
/obj/item/radio/headset/headset_sec,
/obj/item/radio/headset/headset_sec/alt,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/badge/holo/warden,
@@ -143,8 +143,8 @@
/obj/item/clothing/head/beret/sec/corporate/warden,
/obj/item/clothing/suit/storage/hooded/wintercoat/security,
/obj/item/clothing/shoes/boots/winter/security,
/obj/item/device/flashlight/maglight,
/obj/item/device/megaphone,
/obj/item/flashlight/maglight,
/obj/item/megaphone,
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/mask/gas/sechailer/swat/warden)
@@ -166,17 +166,17 @@
/obj/item/clothing/suit/storage/vest/officer,
/obj/item/clothing/head/helmet,
/obj/item/cartridge/security,
/obj/item/device/radio/headset/headset_sec,
/obj/item/device/radio/headset/headset_sec/alt,
/obj/item/radio/headset/headset_sec,
/obj/item/radio/headset/headset_sec/alt,
/obj/item/storage/belt/security,
/obj/item/device/flash,
/obj/item/flash,
/obj/item/reagent_containers/spray/pepper,
/obj/item/grenade/flashbang,
/obj/item/melee/baton/loaded,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/device/hailer,
/obj/item/device/flashlight/flare,
/obj/item/hailer,
/obj/item/flashlight/flare,
/obj/item/clothing/accessory/storage/black_vest,
/obj/item/clothing/head/soft/sec/corp,
/obj/item/clothing/under/rank/security/corp,
@@ -185,7 +185,7 @@
/obj/item/cell/device/weapon,
/obj/item/clothing/suit/storage/hooded/wintercoat/security,
/obj/item/clothing/shoes/boots/winter/security,
/obj/item/device/flashlight/maglight)
/obj/item/flashlight/maglight)
/obj/structure/closet/secure_closet/security/Initialize()
if(prob(50))
@@ -200,22 +200,22 @@
/obj/structure/closet/secure_closet/security/cargo/Initialize()
starts_with += /obj/item/clothing/accessory/armband/cargo
starts_with += /obj/item/device/encryptionkey/headset_cargo
starts_with += /obj/item/encryptionkey/headset_cargo
return ..()
/obj/structure/closet/secure_closet/security/engine/Initialize()
starts_with += /obj/item/clothing/accessory/armband/engine
starts_with += /obj/item/device/encryptionkey/headset_eng
starts_with += /obj/item/encryptionkey/headset_eng
return ..()
/obj/structure/closet/secure_closet/security/science/Initialize()
starts_with += /obj/item/clothing/accessory/armband/science
starts_with += /obj/item/device/encryptionkey/headset_sci
starts_with += /obj/item/encryptionkey/headset_sci
return ..()
/obj/structure/closet/secure_closet/security/med/Initialize()
starts_with += /obj/item/clothing/accessory/armband/medblue
starts_with += /obj/item/device/encryptionkey/headset_med
starts_with += /obj/item/encryptionkey/headset_med
return ..()
@@ -234,17 +234,17 @@
/obj/item/gun/energy/stunrevolver/vintage,
/obj/item/storage/belt/detective,
/obj/item/storage/box/evidence,
/obj/item/device/radio/headset/headset_sec,
/obj/item/device/radio/headset/headset_sec/alt,
/obj/item/radio/headset/headset_sec,
/obj/item/radio/headset/headset_sec/alt,
/obj/item/clothing/suit/storage/vest/detective,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/holster/armpit,
/obj/item/device/flashlight/maglight,
/obj/item/flashlight/maglight,
/obj/item/reagent_containers/food/drinks/flask/detflask,
/obj/item/storage/briefcase/crimekit,
/obj/item/device/taperecorder,
/obj/item/taperecorder,
/obj/item/storage/bag/detective,
/obj/item/device/tape/random = 3)
/obj/item/tape/random = 3)
/obj/structure/closet/secure_closet/injection
name = "lethal injections locker"
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+3 -3
View File
@@ -15,7 +15,7 @@
/obj/item/tool/crowbar/red,
/obj/item/cell/high,
/obj/item/card/id/syndicate,
/obj/item/device/multitool,
/obj/item/multitool,
/obj/item/shield/energy,
/obj/item/clothing/shoes/magboots)
@@ -40,8 +40,8 @@
/obj/item/storage/box/flashbangs,
/obj/item/gun/energy/gun = 5,
/obj/item/pinpointer/nukeop = 5,
/obj/item/device/pda/syndicate,
/obj/item/device/radio/uplink)
/obj/item/pda/syndicate,
/obj/item/radio/uplink)
/obj/structure/closet/syndicate/resources
desc = "An old, dusty locker."
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+7 -7
View File
@@ -72,7 +72,7 @@
starts_with = list(
/obj/item/clothing/suit/fire/firefighter,
/obj/item/clothing/mask/gas,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/tank/oxygen/red,
/obj/item/extinguisher,
/obj/item/clothing/head/hardhat/red)
@@ -81,7 +81,7 @@
starts_with = list(
/obj/item/clothing/suit/fire/firefighter = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/device/flashlight = 2,
/obj/item/flashlight = 2,
/obj/item/tank/oxygen/red = 2,
/obj/item/extinguisher = 2,
/obj/item/clothing/head/hardhat/red = 2)
@@ -99,7 +99,7 @@
if(prob(40))
starts_with += /obj/item/clothing/suit/storage/hazardvest
if(prob(70))
starts_with += /obj/item/device/flashlight
starts_with += /obj/item/flashlight
if(prob(70))
starts_with += /obj/item/tool/screwdriver
if(prob(70))
@@ -111,7 +111,7 @@
if(prob(70))
starts_with += /obj/item/tool/wirecutters
if(prob(70))
starts_with += /obj/item/device/t_scanner
starts_with += /obj/item/t_scanner
if(prob(20))
starts_with += /obj/item/storage/belt/utility
if(prob(30))
@@ -121,7 +121,7 @@
if(prob(30))
starts_with += /obj/item/stack/cable_coil/random
if(prob(20))
starts_with += /obj/item/device/multitool
starts_with += /obj/item/multitool
if(prob(5))
starts_with += /obj/item/clothing/gloves/yellow
if(prob(40))
@@ -140,7 +140,7 @@
starts_with = list(
/obj/item/clothing/suit/radiation = 2,
/obj/item/clothing/head/radiation = 2,
/obj/item/device/geiger = 2)
/obj/item/geiger = 2)
/*
* Bombsuit closet
@@ -191,7 +191,7 @@
starts_with = list(
/obj/item/clothing/suit/fire/firefighter,
/obj/item/clothing/mask/gas,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/tank/oxygen/red,
/obj/item/extinguisher,
/obj/item/clothing/head/hardhat/red)
code/game/objects/structures/crates_lockers/closets/walllocker.dm
+1 -1
View File
@@ -142,7 +142,7 @@
starts_with = list(
/obj/item/clothing/suit/fire/firefighter,
/obj/item/clothing/mask/gas,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/tank/oxygen/red,
/obj/item/extinguisher,
/obj/item/clothing/head/hardhat/red)
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+1 -1
View File
@@ -402,7 +402,7 @@
/obj/item/clothing/under/rank/centcom,
/obj/item/clothing/under/ert,
/obj/item/clothing/under/syndicate/combat,
/obj/item/device/radio/headset/ert/alt,
/obj/item/radio/headset/ert/alt,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/shoes/boots/swat,
/obj/item/clothing/gloves/swat,
code/game/objects/structures/crates_lockers/crates.dm
+3 -3
View File
@@ -25,7 +25,7 @@
if(!src.can_open())
return 0
if(rigged && locate(/obj/item/device/radio/electropack) in src)
if(rigged && locate(/obj/item/radio/electropack) in src)
if(isliving(usr))
var/mob/living/L = usr
if(L.electrocute_act(17, src))
@@ -109,7 +109,7 @@
to_chat(user , "<span class='notice'>You rig [src].</span>")
rigged = 1
return
else if(istype(W, /obj/item/device/radio/electropack))
else if(istype(W, /obj/item/radio/electropack))
if(rigged)
to_chat(user , "<span class='notice'>You attach [W] to [src].</span>")
user.drop_item()
@@ -208,7 +208,7 @@
src.toggle(user)
/obj/structure/closet/crate/secure/attackby(obj/item/W as obj, mob/user as mob)
if(is_type_in_list(W, list(/obj/item/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/tool/wirecutters)))
if(is_type_in_list(W, list(/obj/item/packageWrap, /obj/item/stack/cable_coil, /obj/item/radio/electropack, /obj/item/tool/wirecutters)))
return ..()
if(istype(W, /obj/item/melee/energy/blade))
emag_act(INFINITY, user)
code/game/objects/structures/fireaxe.dm
+3 -3
View File
@@ -30,7 +30,7 @@
// hasaxe = 1
if (isrobot(user) || locked)
if(istype(O, /obj/item/device/multitool))
if(istype(O, /obj/item/multitool))
to_chat(user, "<span class='warning'>Resetting circuitry...</span>")
playsound(src, 'sound/machines/lockreset.ogg', 50, 1)
if(do_after(user, 20 * O.toolspeed))
@@ -38,7 +38,7 @@
to_chat(user, "<span class = 'caution'> You disable the locking modules.</span>")
update_icon()
return
else if(istype(O, /obj/item/weapon))
else if(istype(O))
var/obj/item/W = O
if(smashed || open)
if(open)
@@ -75,7 +75,7 @@
else
if(smashed)
return
if(istype(O, /obj/item/device/multitool))
if(istype(O, /obj/item/multitool))
if(open)
open = 0
update_icon()
code/game/objects/structures/ghost_pods/human.dm
+4 -4
View File
@@ -35,7 +35,7 @@
clothing_possibilities |= subtypesof(/obj/item/clothing/under/color)
clothing_possibilities |= subtypesof(/obj/item/clothing/head/soft)
clothing_possibilities |= /obj/item/clothing/shoes/black
clothing_possibilities |= /obj/item/device/radio/headset
clothing_possibilities |= /obj/item/radio/headset
/obj/structure/ghost_pod/ghost_activated/human/create_occupant(var/mob/M)
..()
@@ -71,7 +71,7 @@
if(!head_options)
head_options = list()
head_options |= path
if(ispath(path, /obj/item/device/radio/headset))
if(ispath(path, /obj/item/radio/headset))
if(!headset_options)
headset_options = list()
headset_options |= path
@@ -163,7 +163,7 @@
clothing_possibilities |= subtypesof(/obj/item/clothing/under/utility)
clothing_possibilities |= subtypesof(/obj/item/clothing/head/beret)
clothing_possibilities |= /obj/item/clothing/shoes/black
clothing_possibilities |= /obj/item/device/radio/headset
clothing_possibilities |= /obj/item/radio/headset
/obj/structure/ghost_pod/manual/human/create_occupant(var/mob/M)
..()
@@ -199,7 +199,7 @@
if(!head_options)
head_options = list()
head_options |= path
if(ispath(path, /obj/item/device/radio/headset))
if(ispath(path, /obj/item/radio/headset))
if(!headset_options)
headset_options = list()
headset_options |= path
code/game/objects/structures/janicart.dm
+2 -2
View File
@@ -15,7 +15,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
var/obj/item/storage/bag/trash/mybag = null
var/obj/item/mop/mymop = null
var/obj/item/reagent_containers/spray/myspray = null
var/obj/item/device/lightreplacer/myreplacer = null
var/obj/item/lightreplacer/myreplacer = null
var/obj/structure/mopbucket/mybucket = null
var/has_items = FALSE
var/dismantled = TRUE
@@ -77,7 +77,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
to_chat(user, "<span class='notice'>You put [I] into [src].</span>")
return 1
else if(istype(I, /obj/item/device/lightreplacer) && !myreplacer)
else if(istype(I, /obj/item/lightreplacer) && !myreplacer)
user.unEquip(I, 0, src)
myreplacer = I
update_icon()
code/game/objects/structures/loot_piles.dm
+36 -36
View File
@@ -131,13 +131,13 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
icon_states_to_use = list("junk_pile1", "junk_pile2", "junk_pile3", "junk_pile4", "junk_pile5")
common_loot = list(
/obj/item/device/flashlight/flare,
/obj/item/device/flashlight/glowstick,
/obj/item/device/flashlight/glowstick/blue,
/obj/item/device/flashlight/glowstick/orange,
/obj/item/device/flashlight/glowstick/red,
/obj/item/device/flashlight/glowstick/yellow,
/obj/item/device/flashlight/pen,
/obj/item/flashlight/flare,
/obj/item/flashlight/glowstick,
/obj/item/flashlight/glowstick/blue,
/obj/item/flashlight/glowstick/orange,
/obj/item/flashlight/glowstick/red,
/obj/item/flashlight/glowstick/yellow,
/obj/item/flashlight/pen,
/obj/item/cell,
/obj/item/cell/device,
/obj/item/clothing/mask/gas,
@@ -195,10 +195,10 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/clothing/suit/caution,
/obj/item/clothing/head/cone,
/obj/item/card/emag_broken,
/obj/item/device/camera,
/obj/item/device/pda,
/obj/item/device/radio/headset,
/obj/item/device/paicard,
/obj/item/camera,
/obj/item/pda,
/obj/item/radio/headset,
/obj/item/paicard,
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose
)
@@ -363,20 +363,20 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/circuitboard/rcon_console,
/obj/item/smes_coil,
/obj/item/cartridge/engineering,
/obj/item/device/analyzer,
/obj/item/device/healthanalyzer,
/obj/item/device/robotanalyzer,
/obj/item/device/lightreplacer,
/obj/item/device/radio,
/obj/item/device/hailer,
/obj/item/device/gps,
/obj/item/device/geiger,
/obj/item/device/mass_spectrometer,
/obj/item/analyzer,
/obj/item/healthanalyzer,
/obj/item/robotanalyzer,
/obj/item/lightreplacer,
/obj/item/radio,
/obj/item/hailer,
/obj/item/gps,
/obj/item/geiger,
/obj/item/mass_spectrometer,
/obj/item/tool/wrench,
/obj/item/tool/screwdriver,
/obj/item/tool/wirecutters,
/obj/item/mining_scanner/advanced,
/obj/item/device/multitool,
/obj/item/multitool,
/obj/item/mecha_parts/mecha_equipment/generator,
/obj/item/mecha_parts/mecha_equipment/tool/cable_layer,
/obj/item/mecha_parts/mecha_equipment/tool/drill,
@@ -402,9 +402,9 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/smes_coil/super_io,
/obj/item/cartridge/captain,
/obj/item/disk/integrated_circuit/upgrade/advanced,
/obj/item/device/tvcamera,
/obj/item/device/universal_translator,
/obj/item/device/aicard,
/obj/item/tvcamera,
/obj/item/universal_translator,
/obj/item/aicard,
/obj/item/borg/upgrade/jetpack,
/obj/item/borg/upgrade/advhealth,
/obj/item/borg/upgrade/vtec,
@@ -456,7 +456,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
// May contain alien tools.
/obj/structure/loot_pile/surface/alien/engineering
uncommon_loot = list(
/obj/item/device/multitool/alien,
/obj/item/multitool/alien,
/obj/item/stack/cable_coil/alien,
/obj/item/tool/crowbar/alien,
/obj/item/tool/screwdriver/alien,
@@ -502,7 +502,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
chance_rare = 10
common_loot = list(
/obj/item/device/multitool/alien,
/obj/item/multitool/alien,
/obj/item/stack/cable_coil/alien,
/obj/item/tool/crowbar/alien,
/obj/item/tool/screwdriver/alien,
@@ -640,9 +640,9 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/mecha_parts/part/ripley_right_arm,
/obj/item/mecha_parts/part/ripley_left_leg,
/obj/item/mecha_parts/part/ripley_right_leg,
/obj/item/device/kit/paint/ripley,
/obj/item/device/kit/paint/ripley/flames_red,
/obj/item/device/kit/paint/ripley/flames_blue
/obj/item/kit/paint/ripley,
/obj/item/kit/paint/ripley/flames_red,
/obj/item/kit/paint/ripley/flames_blue
)
uncommon_loot = list(
@@ -683,7 +683,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/mecha_parts/part/ripley_right_arm,
/obj/item/mecha_parts/part/ripley_left_leg,
/obj/item/mecha_parts/part/ripley_right_leg,
/obj/item/device/kit/paint/ripley/death
/obj/item/kit/paint/ripley/death
)
uncommon_loot = list(
@@ -770,9 +770,9 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade,
/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser,
/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser,
/obj/item/device/kit/paint/gygax,
/obj/item/device/kit/paint/gygax/darkgygax,
/obj/item/device/kit/paint/gygax/recitence
/obj/item/kit/paint/gygax,
/obj/item/kit/paint/gygax/darkgygax,
/obj/item/kit/paint/gygax/recitence
)
rare_loot = list(
@@ -823,9 +823,9 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade,
/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser,
/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster,
/obj/item/device/kit/paint/durand,
/obj/item/device/kit/paint/durand/seraph,
/obj/item/device/kit/paint/durand/phazon
/obj/item/kit/paint/durand,
/obj/item/kit/paint/durand/seraph,
/obj/item/kit/paint/durand/phazon
)
rare_loot = list(
code/game/objects/structures/props/alien_props.dm
+2
View File
@@ -102,6 +102,8 @@
name = "alien object"
desc = "You have no idea what this thing does."
icon = 'icons/obj/device.dmi'
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
icon_state = "health"
w_class = ITEMSIZE_SMALL
var/static/list/possible_states = list("health", "spider", "slime", "emp", "species", "egg", "vent", "mindshock", "viral", "gland")
code/game/objects/structures/props/fake_ai.dm
+1 -1
View File
@@ -7,7 +7,7 @@
icon_state = "ai"
/obj/structure/prop/fake_ai/attackby(obj/O, mob/user)
if(istype(O, /obj/item/device/aicard)) // People trying to card the fake AI will get told its impossible.
if(istype(O, /obj/item/aicard)) // People trying to card the fake AI will get told its impossible.
to_chat(user, span("warning", "This core does not appear to have a suitable port to use \the [O] on..."))
return TRUE
return ..()
code/game/objects/structures/props/puzzledoor.dm
+1 -1
View File
@@ -60,7 +60,7 @@
to_chat(user, "<span class='notice'>\The [src] does not respond to your touch.</span>")
/obj/machinery/door/blast/puzzle/attackby(obj/item/C as obj, mob/user as mob)
if(istype(C, /obj/item/weapon))
if(istype(C))
if(C.pry == 1 && (user.a_intent != I_HURT || (stat & BROKEN)))
if(istype(C,/obj/item/material/twohanded/fireaxe))
var/obj/item/material/twohanded/fireaxe/F = C
code/game/objects/structures/simple_doors.dm
+1 -1
View File
@@ -132,7 +132,7 @@
if(do_after(user,digTool.digspeed*hardness) && src)
visible_message("<span class='danger'>[user] finished digging [src]!</span>")
Dismantle()
else if(istype(W,/obj/item/weapon)) //not sure, can't not just weapons get passed to this proc?
else if(istype(W)) //not sure, can't not just weapons get passed to this proc?
hardness -= W.force/10
visible_message("<span class='danger'>[user] hits [src] with [W]!</span>")
if(material == get_material_by_name("resin"))
code/game/objects/structures/watercloset.dm
+1 -1
View File
@@ -202,7 +202,7 @@
soundloop.stop()
/obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob)
if(I.type == /obj/item/device/analyzer)
if(I.type == /obj/item/analyzer)
to_chat(user, "<span class='notice'>The water temperature seems to be [watertemp].</span>")
if(I.is_wrench())
var/newtemp = input(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve") in temperature_settings
code/game/objects/structures/window.dm
+4 -4
View File
@@ -605,8 +605,8 @@
fulltile = TRUE
/obj/structure/window/reinforced/polarized/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/device/multitool) && !anchored) // Only allow programming if unanchored!
var/obj/item/device/multitool/MT = W
if(istype(W, /obj/item/multitool) && !anchored) // Only allow programming if unanchored!
var/obj/item/multitool/MT = W
// First check if they have a windowtint button buffered
if(istype(MT.connectable, /obj/machinery/button/windowtint))
var/obj/machinery/button/windowtint/buffered_button = MT.connectable
@@ -665,8 +665,8 @@
icon_state = "light[active]"
/obj/machinery/button/windowtint/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/device/multitool))
var/obj/item/device/multitool/MT = W
if(istype(W, /obj/item/multitool))
var/obj/item/multitool/MT = W
if(!id)
// If no ID is set yet (newly built button?) let them select an ID for first-time use!
var/t = sanitizeSafe(input(user, "Enter an ID for \the [src].", src.name, null), MAX_NAME_LEN)