mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-30 07:27:57 +01:00
merge conflict fix
This commit is contained in:
Kyep
@@ -12,16 +12,16 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/bar/New()
|
||||
..()
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/reagent_containers/food/drinks/cans/beer( src )
|
||||
new /obj/item/reagent_containers/food/drinks/cans/beer( src )
|
||||
|
||||
/obj/structure/closet/secure_closet/bar/update_icon()
|
||||
if(broken)
|
||||
|
||||
@@ -13,10 +13,10 @@
|
||||
new /obj/item/clothing/under/rank/cargotech(src)
|
||||
new /obj/item/clothing/under/rank/cargotech/skirt(src)
|
||||
new /obj/item/clothing/shoes/black(src)
|
||||
new /obj/item/device/radio/headset/headset_cargo(src)
|
||||
new /obj/item/radio/headset/headset_cargo(src)
|
||||
new /obj/item/clothing/gloves/fingerless(src)
|
||||
new /obj/item/clothing/head/soft(src)
|
||||
// new /obj/item/weapon/cartridge/quartermaster(src)
|
||||
// new /obj/item/cartridge/quartermaster(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/quartermaster
|
||||
@@ -34,11 +34,11 @@
|
||||
new /obj/item/clothing/under/rank/cargo(src)
|
||||
new /obj/item/clothing/under/rank/cargo/skirt(src)
|
||||
new /obj/item/clothing/shoes/brown(src)
|
||||
new /obj/item/device/radio/headset/headset_cargo(src)
|
||||
new /obj/item/radio/headset/headset_cargo(src)
|
||||
new /obj/item/clothing/gloves/fingerless(src)
|
||||
new /obj/item/clothing/suit/fire/firefighter(src)
|
||||
new /obj/item/weapon/tank/emergency_oxygen(src)
|
||||
new /obj/item/tank/emergency_oxygen(src)
|
||||
new /obj/item/clothing/mask/gas(src)
|
||||
new /obj/item/clothing/glasses/meson(src)
|
||||
new /obj/item/clothing/head/soft(src)
|
||||
new /obj/item/weapon/door_remote/quartermaster(src)
|
||||
new /obj/item/door_remote/quartermaster(src)
|
||||
|
||||
@@ -20,12 +20,12 @@
|
||||
new /obj/item/clothing/head/witchhunter_hat(src)
|
||||
new /obj/item/clothing/suit/holidaypriest(src)
|
||||
new /obj/item/clothing/under/wedding/bride_white(src)
|
||||
new /obj/item/weapon/storage/backpack/cultpack (src)
|
||||
new /obj/item/storage/backpack/cultpack (src)
|
||||
new /obj/item/clothing/head/helmet/riot/knight/templar(src)
|
||||
new /obj/item/clothing/suit/armor/riot/knight/templar(src)
|
||||
new /obj/item/weapon/storage/fancy/candle_box/eternal(src)
|
||||
new /obj/item/weapon/storage/fancy/candle_box/eternal(src)
|
||||
new /obj/item/weapon/storage/fancy/candle_box/eternal(src)
|
||||
new /obj/item/storage/fancy/candle_box/eternal(src)
|
||||
new /obj/item/storage/fancy/candle_box/eternal(src)
|
||||
new /obj/item/storage/fancy/candle_box/eternal(src)
|
||||
new /obj/item/clothing/gloves/ring/silver(src)
|
||||
new /obj/item/clothing/gloves/ring/silver(src)
|
||||
new /obj/item/clothing/gloves/ring/gold(src)
|
||||
|
||||
@@ -11,31 +11,31 @@
|
||||
/obj/structure/closet/secure_closet/engineering_chief/New()
|
||||
..()
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/storage/backpack/industrial(src)
|
||||
new /obj/item/storage/backpack/industrial(src)
|
||||
else
|
||||
new /obj/item/weapon/storage/backpack/satchel_eng(src)
|
||||
new /obj/item/weapon/storage/backpack/duffel/engineering(src)
|
||||
new /obj/item/storage/backpack/satchel_eng(src)
|
||||
new /obj/item/storage/backpack/duffel/engineering(src)
|
||||
new /obj/item/clothing/head/beret/ce(src)
|
||||
new /obj/item/areaeditor/blueprints(src)
|
||||
new /obj/item/weapon/storage/box/permits(src)
|
||||
new /obj/item/storage/box/permits(src)
|
||||
new /obj/item/clothing/under/rank/chief_engineer(src)
|
||||
new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
|
||||
new /obj/item/clothing/head/hardhat/white(src)
|
||||
new /obj/item/clothing/glasses/welding/superior(src)
|
||||
new /obj/item/clothing/gloves/color/yellow(src)
|
||||
new /obj/item/clothing/shoes/brown(src)
|
||||
new /obj/item/weapon/cartridge/ce(src)
|
||||
new /obj/item/device/radio/headset/heads/ce(src)
|
||||
new /obj/item/weapon/storage/toolbox/mechanical(src)
|
||||
new /obj/item/cartridge/ce(src)
|
||||
new /obj/item/radio/headset/heads/ce(src)
|
||||
new /obj/item/storage/toolbox/mechanical(src)
|
||||
new /obj/item/clothing/suit/storage/hazardvest(src)
|
||||
new /obj/item/clothing/mask/gas(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/clothing/head/beret/eng(src)
|
||||
new /obj/item/weapon/door_remote/chief_engineer(src)
|
||||
new /obj/item/weapon/rpd(src)
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/mug/ce(src)
|
||||
new /obj/item/door_remote/chief_engineer(src)
|
||||
new /obj/item/rpd(src)
|
||||
new /obj/item/reagent_containers/food/drinks/mug/ce(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/engineering_electrical
|
||||
@@ -52,15 +52,15 @@
|
||||
..()
|
||||
new /obj/item/clothing/gloves/color/yellow(src)
|
||||
new /obj/item/clothing/gloves/color/yellow(src)
|
||||
new /obj/item/weapon/storage/toolbox/electrical(src)
|
||||
new /obj/item/weapon/storage/toolbox/electrical(src)
|
||||
new /obj/item/weapon/storage/toolbox/electrical(src)
|
||||
new /obj/item/weapon/apc_electronics(src)
|
||||
new /obj/item/weapon/apc_electronics(src)
|
||||
new /obj/item/weapon/apc_electronics(src)
|
||||
new /obj/item/device/multitool(src)
|
||||
new /obj/item/device/multitool(src)
|
||||
new /obj/item/device/multitool(src)
|
||||
new /obj/item/storage/toolbox/electrical(src)
|
||||
new /obj/item/storage/toolbox/electrical(src)
|
||||
new /obj/item/storage/toolbox/electrical(src)
|
||||
new /obj/item/apc_electronics(src)
|
||||
new /obj/item/apc_electronics(src)
|
||||
new /obj/item/apc_electronics(src)
|
||||
new /obj/item/multitool(src)
|
||||
new /obj/item/multitool(src)
|
||||
new /obj/item/multitool(src)
|
||||
new /obj/item/clothing/head/beret/eng
|
||||
|
||||
|
||||
@@ -79,9 +79,9 @@
|
||||
new /obj/item/clothing/head/welding(src)
|
||||
new /obj/item/clothing/head/welding(src)
|
||||
new /obj/item/clothing/head/welding(src)
|
||||
new /obj/item/weapon/weldingtool/largetank(src)
|
||||
new /obj/item/weapon/weldingtool/largetank(src)
|
||||
new /obj/item/weapon/weldingtool/largetank(src)
|
||||
new /obj/item/weldingtool/largetank(src)
|
||||
new /obj/item/weldingtool/largetank(src)
|
||||
new /obj/item/weldingtool/largetank(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/engineering_personal
|
||||
@@ -97,18 +97,18 @@
|
||||
/obj/structure/closet/secure_closet/engineering_personal/New()
|
||||
..()
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/storage/backpack/industrial(src)
|
||||
new /obj/item/storage/backpack/industrial(src)
|
||||
else
|
||||
new /obj/item/weapon/storage/backpack/satchel_eng(src)
|
||||
new /obj/item/weapon/storage/backpack/duffel/engineering(src)
|
||||
new /obj/item/weapon/storage/toolbox/mechanical(src)
|
||||
new /obj/item/device/radio/headset/headset_eng(src)
|
||||
new /obj/item/storage/backpack/satchel_eng(src)
|
||||
new /obj/item/storage/backpack/duffel/engineering(src)
|
||||
new /obj/item/storage/toolbox/mechanical(src)
|
||||
new /obj/item/radio/headset/headset_eng(src)
|
||||
new /obj/item/clothing/under/rank/engineer(src)
|
||||
new /obj/item/clothing/under/rank/engineer/skirt(src)
|
||||
new /obj/item/clothing/suit/storage/hazardvest(src)
|
||||
new /obj/item/clothing/mask/gas(src)
|
||||
new /obj/item/clothing/glasses/meson(src)
|
||||
new /obj/item/weapon/cartridge/engineering(src)
|
||||
new /obj/item/cartridge/engineering(src)
|
||||
new /obj/item/taperoll/engineering(src)
|
||||
new /obj/item/clothing/head/beret/eng(src)
|
||||
|
||||
@@ -125,20 +125,20 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/atmos_personal/New()
|
||||
..()
|
||||
new /obj/item/device/radio/headset/headset_eng(src)
|
||||
new /obj/item/weapon/cartridge/atmos(src)
|
||||
new /obj/item/weapon/storage/toolbox/mechanical(src)
|
||||
new /obj/item/radio/headset/headset_eng(src)
|
||||
new /obj/item/cartridge/atmos(src)
|
||||
new /obj/item/storage/toolbox/mechanical(src)
|
||||
new /obj/item/taperoll/engineering(src)
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/storage/backpack/industrial(src)
|
||||
new /obj/item/storage/backpack/industrial(src)
|
||||
else
|
||||
new /obj/item/weapon/storage/backpack/satchel_eng(src)
|
||||
new /obj/item/weapon/storage/backpack/duffel/atmos(src)
|
||||
new /obj/item/weapon/extinguisher(src)
|
||||
new /obj/item/storage/backpack/satchel_eng(src)
|
||||
new /obj/item/storage/backpack/duffel/atmos(src)
|
||||
new /obj/item/extinguisher(src)
|
||||
new /obj/item/clothing/suit/storage/hazardvest(src)
|
||||
new /obj/item/clothing/mask/gas(src)
|
||||
new /obj/item/weapon/tank/emergency_oxygen/engi(src)
|
||||
new /obj/item/weapon/watertank/atmos(src)
|
||||
new /obj/item/tank/emergency_oxygen/engi(src)
|
||||
new /obj/item/watertank/atmos(src)
|
||||
new /obj/item/clothing/suit/fire/atmos(src)
|
||||
new /obj/item/clothing/head/hardhat/atmos(src)
|
||||
new /obj/item/weapon/rpd(src)
|
||||
new /obj/item/rpd(src)
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
// IF INDIANA JONES CAN DO IT SO CAN YOU
|
||||
|
||||
// Bomb in here? (using same search as space transits searching for nuke disk)
|
||||
var/list/bombs = search_contents_for(/obj/item/device/transfer_valve)
|
||||
var/list/bombs = search_contents_for(/obj/item/transfer_valve)
|
||||
if(!isemptylist(bombs)) // You're fucked.
|
||||
..(severity)
|
||||
|
||||
@@ -31,9 +31,9 @@
|
||||
New()
|
||||
..()
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/weapon/reagent_containers/food/condiment/flour(src)
|
||||
new /obj/item/weapon/reagent_containers/food/condiment/rice(src)
|
||||
new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
|
||||
new /obj/item/reagent_containers/food/condiment/flour(src)
|
||||
new /obj/item/reagent_containers/food/condiment/rice(src)
|
||||
new /obj/item/reagent_containers/food/condiment/sugar(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/freezer/kitchen/mining
|
||||
@@ -52,7 +52,7 @@
|
||||
/obj/structure/closet/secure_closet/freezer/meat/New()
|
||||
..()
|
||||
for(var/i in 1 to 4)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
|
||||
new /obj/item/reagent_containers/food/snacks/meat/monkey(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/freezer/fridge
|
||||
@@ -67,10 +67,10 @@
|
||||
/obj/structure/closet/secure_closet/freezer/fridge/New()
|
||||
..()
|
||||
for(var/i in 1 to 5)
|
||||
new /obj/item/weapon/reagent_containers/food/condiment/milk(src)
|
||||
new /obj/item/weapon/reagent_containers/food/condiment/soymilk(src)
|
||||
new /obj/item/reagent_containers/food/condiment/milk(src)
|
||||
new /obj/item/reagent_containers/food/condiment/soymilk(src)
|
||||
for(var/i in 1 to 2)
|
||||
new /obj/item/weapon/storage/fancy/egg_box(src)
|
||||
new /obj/item/storage/fancy/egg_box(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/freezer/money
|
||||
|
||||
@@ -26,10 +26,10 @@
|
||||
else
|
||||
var/lazors = 0
|
||||
var/shottas = 0
|
||||
for(var/obj/item/weapon/gun/G in contents)
|
||||
if(istype(G, /obj/item/weapon/gun/energy))
|
||||
for(var/obj/item/gun/G in contents)
|
||||
if(istype(G, /obj/item/gun/energy))
|
||||
lazors++
|
||||
if(istype(G, /obj/item/weapon/gun/projectile/))
|
||||
if(istype(G, /obj/item/gun/projectile/))
|
||||
shottas++
|
||||
if(lazors || shottas)
|
||||
for(var/i = 0 to 2)
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
new /obj/item/clothing/suit/apron(src)
|
||||
if(2)
|
||||
new /obj/item/clothing/suit/apron/overalls(src)
|
||||
new /obj/item/weapon/storage/bag/plants/portaseeder(src)
|
||||
new /obj/item/storage/bag/plants/portaseeder(src)
|
||||
new /obj/item/clothing/under/rank/hydroponics(src)
|
||||
new /obj/item/device/plant_analyzer(src)
|
||||
new /obj/item/device/radio/headset/headset_service(src)
|
||||
new /obj/item/plant_analyzer(src)
|
||||
new /obj/item/radio/headset/headset_service(src)
|
||||
new /obj/item/clothing/mask/bandana/botany(src)
|
||||
new /obj/item/weapon/cultivator(src)
|
||||
new /obj/item/weapon/hatchet(src)
|
||||
new /obj/item/weapon/storage/box/disks_plantgene(src)
|
||||
new /obj/item/cultivator(src)
|
||||
new /obj/item/hatchet(src)
|
||||
new /obj/item/storage/box/disks_plantgene(src)
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/medical1/New()
|
||||
..()
|
||||
new /obj/item/weapon/storage/box/autoinjectors(src)
|
||||
new /obj/item/weapon/storage/box/syringes(src)
|
||||
new /obj/item/weapon/reagent_containers/dropper(src)
|
||||
new /obj/item/weapon/reagent_containers/dropper(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/beaker(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/beaker(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/epinephrine(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/epinephrine(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/charcoal(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/charcoal(src)
|
||||
new /obj/item/storage/box/autoinjectors(src)
|
||||
new /obj/item/storage/box/syringes(src)
|
||||
new /obj/item/reagent_containers/dropper(src)
|
||||
new /obj/item/reagent_containers/dropper(src)
|
||||
new /obj/item/reagent_containers/glass/beaker(src)
|
||||
new /obj/item/reagent_containers/glass/beaker(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/epinephrine(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/epinephrine(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/charcoal(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/charcoal(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/medical2
|
||||
@@ -36,9 +36,9 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/medical2/New()
|
||||
..()
|
||||
new /obj/item/weapon/tank/anesthetic(src)
|
||||
new /obj/item/weapon/tank/anesthetic(src)
|
||||
new /obj/item/weapon/tank/anesthetic(src)
|
||||
new /obj/item/tank/anesthetic(src)
|
||||
new /obj/item/tank/anesthetic(src)
|
||||
new /obj/item/tank/anesthetic(src)
|
||||
new /obj/item/clothing/mask/breath/medical(src)
|
||||
new /obj/item/clothing/mask/breath/medical(src)
|
||||
new /obj/item/clothing/mask/breath/medical(src)
|
||||
@@ -57,17 +57,17 @@
|
||||
/obj/structure/closet/secure_closet/medical3/New()
|
||||
..()
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/storage/backpack/medic(src)
|
||||
new /obj/item/storage/backpack/medic(src)
|
||||
else
|
||||
new /obj/item/weapon/storage/backpack/satchel_med(src)
|
||||
new /obj/item/weapon/storage/backpack/duffel/medical(src)
|
||||
new /obj/item/storage/backpack/satchel_med(src)
|
||||
new /obj/item/storage/backpack/duffel/medical(src)
|
||||
new /obj/item/clothing/under/rank/medical(src)
|
||||
new /obj/item/clothing/suit/storage/labcoat(src)
|
||||
new /obj/item/clothing/shoes/white(src)
|
||||
new /obj/item/device/radio/headset/headset_med(src)
|
||||
new /obj/item/radio/headset/headset_med(src)
|
||||
new /obj/item/clothing/gloves/color/latex/nitrile(src)
|
||||
new /obj/item/weapon/defibrillator/loaded(src)
|
||||
new /obj/item/weapon/storage/belt/medical(src)
|
||||
new /obj/item/defibrillator/loaded(src)
|
||||
new /obj/item/storage/belt/medical(src)
|
||||
new /obj/item/clothing/glasses/hud/health(src)
|
||||
new /obj/item/clothing/shoes/sandal/white(src)
|
||||
|
||||
@@ -86,40 +86,40 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/exam/New()
|
||||
..()
|
||||
new /obj/item/weapon/storage/box/syringes(src)
|
||||
new /obj/item/weapon/reagent_containers/dropper(src)
|
||||
new /obj/item/weapon/storage/belt/medical(src)
|
||||
new /obj/item/storage/box/syringes(src)
|
||||
new /obj/item/reagent_containers/dropper(src)
|
||||
new /obj/item/storage/belt/medical(src)
|
||||
new /obj/item/clothing/mask/surgical(src)
|
||||
new /obj/item/clothing/glasses/hud/health(src)
|
||||
new /obj/item/clothing/gloves/color/latex/nitrile(src)
|
||||
new /obj/item/clothing/accessory/stethoscope(src)
|
||||
new /obj/item/device/flashlight/pen(src)
|
||||
new /obj/item/weapon/storage/firstaid/regular(src)
|
||||
new /obj/item/weapon/storage/firstaid/adv(src)
|
||||
new /obj/item/weapon/storage/firstaid/brute(src)
|
||||
new /obj/item/weapon/storage/firstaid/fire(src)
|
||||
new /obj/item/weapon/storage/firstaid/o2(src)
|
||||
new /obj/item/weapon/storage/firstaid/toxin(src)
|
||||
new /obj/item/flashlight/pen(src)
|
||||
new /obj/item/storage/firstaid/regular(src)
|
||||
new /obj/item/storage/firstaid/adv(src)
|
||||
new /obj/item/storage/firstaid/brute(src)
|
||||
new /obj/item/storage/firstaid/fire(src)
|
||||
new /obj/item/storage/firstaid/o2(src)
|
||||
new /obj/item/storage/firstaid/toxin(src)
|
||||
|
||||
|
||||
// Psychiatrist's pill bottle
|
||||
/obj/item/weapon/storage/pill_bottle/psychiatrist
|
||||
/obj/item/storage/pill_bottle/psychiatrist
|
||||
name = "psychiatrist's pill bottle"
|
||||
desc = "Contains various pills to calm or sedate patients."
|
||||
|
||||
/obj/item/weapon/storage/pill_bottle/psychiatrist/New()
|
||||
/obj/item/storage/pill_bottle/psychiatrist/New()
|
||||
..()
|
||||
new /obj/item/weapon/reagent_containers/food/pill/haloperidol(src)
|
||||
new /obj/item/weapon/reagent_containers/food/pill/haloperidol(src)
|
||||
new /obj/item/weapon/reagent_containers/food/pill/haloperidol(src)
|
||||
new /obj/item/weapon/reagent_containers/food/pill/methamphetamine(src)
|
||||
new /obj/item/weapon/reagent_containers/food/pill/methamphetamine(src)
|
||||
new /obj/item/weapon/reagent_containers/food/pill/methamphetamine(src)
|
||||
new /obj/item/weapon/reagent_containers/food/pill/patch/nicotine(src)
|
||||
new /obj/item/weapon/reagent_containers/food/pill/patch/nicotine(src)
|
||||
new /obj/item/weapon/reagent_containers/food/pill/patch/nicotine(src)
|
||||
new /obj/item/weapon/reagent_containers/food/pill/hydrocodone(src)
|
||||
new /obj/item/weapon/reagent_containers/food/pill/hydrocodone(src)
|
||||
new /obj/item/reagent_containers/food/pill/haloperidol(src)
|
||||
new /obj/item/reagent_containers/food/pill/haloperidol(src)
|
||||
new /obj/item/reagent_containers/food/pill/haloperidol(src)
|
||||
new /obj/item/reagent_containers/food/pill/methamphetamine(src)
|
||||
new /obj/item/reagent_containers/food/pill/methamphetamine(src)
|
||||
new /obj/item/reagent_containers/food/pill/methamphetamine(src)
|
||||
new /obj/item/reagent_containers/food/pill/patch/nicotine(src)
|
||||
new /obj/item/reagent_containers/food/pill/patch/nicotine(src)
|
||||
new /obj/item/reagent_containers/food/pill/patch/nicotine(src)
|
||||
new /obj/item/reagent_containers/food/pill/hydrocodone(src)
|
||||
new /obj/item/reagent_containers/food/pill/hydrocodone(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/psychiatrist
|
||||
name = "psychiatrist's locker"
|
||||
@@ -134,15 +134,15 @@
|
||||
/obj/structure/closet/secure_closet/psychiatrist/New()
|
||||
..()
|
||||
new /obj/item/clothing/suit/straight_jacket(src)
|
||||
new /obj/item/weapon/reagent_containers/syringe(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/ether(src)
|
||||
new /obj/item/weapon/storage/fancy/cigarettes/cigpack_med(src)
|
||||
new /obj/item/weapon/storage/fancy/cigarettes/cigpack_med(src)
|
||||
new /obj/item/weapon/storage/fancy/cigarettes/cigpack_med(src)
|
||||
new /obj/item/weapon/storage/pill_bottle/psychiatrist(src)
|
||||
new /obj/item/reagent_containers/syringe(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/ether(src)
|
||||
new /obj/item/storage/fancy/cigarettes/cigpack_med(src)
|
||||
new /obj/item/storage/fancy/cigarettes/cigpack_med(src)
|
||||
new /obj/item/storage/fancy/cigarettes/cigpack_med(src)
|
||||
new /obj/item/storage/pill_bottle/psychiatrist(src)
|
||||
new /obj/random/plushie(src)
|
||||
for(var/i in 0 to 3)
|
||||
var/candy = pick(subtypesof(/obj/item/weapon/reagent_containers/food/snacks/candy/fudge))
|
||||
var/candy = pick(subtypesof(/obj/item/reagent_containers/food/snacks/candy/fudge))
|
||||
new candy(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/CMO
|
||||
@@ -158,10 +158,10 @@
|
||||
/obj/structure/closet/secure_closet/CMO/New()
|
||||
..()
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/storage/backpack/medic(src)
|
||||
new /obj/item/storage/backpack/medic(src)
|
||||
else
|
||||
new /obj/item/weapon/storage/backpack/satchel_med(src)
|
||||
new /obj/item/weapon/storage/backpack/duffel/medical(src)
|
||||
new /obj/item/storage/backpack/satchel_med(src)
|
||||
new /obj/item/storage/backpack/duffel/medical(src)
|
||||
new /obj/item/clothing/suit/bio_suit/cmo(src)
|
||||
new /obj/item/clothing/head/bio_hood/cmo(src)
|
||||
new /obj/item/clothing/shoes/white(src)
|
||||
@@ -178,15 +178,15 @@
|
||||
new /obj/item/clothing/suit/storage/labcoat/cmo(src)
|
||||
new /obj/item/clothing/under/rank/chief_medical_officer(src)
|
||||
new /obj/item/clothing/shoes/brown (src)
|
||||
new /obj/item/device/radio/headset/heads/cmo(src)
|
||||
new /obj/item/radio/headset/heads/cmo(src)
|
||||
new /obj/item/clothing/gloves/color/latex/nitrile(src)
|
||||
new /obj/item/weapon/defibrillator/compact/loaded(src)
|
||||
new /obj/item/weapon/storage/belt/medical(src)
|
||||
new /obj/item/device/flash(src)
|
||||
new /obj/item/weapon/reagent_containers/hypospray/CMO(src)
|
||||
new /obj/item/defibrillator/compact/loaded(src)
|
||||
new /obj/item/storage/belt/medical(src)
|
||||
new /obj/item/flash(src)
|
||||
new /obj/item/reagent_containers/hypospray/CMO(src)
|
||||
new /obj/item/organ/internal/cyberimp/eyes/hud/medical(src)
|
||||
new /obj/item/weapon/door_remote/chief_medical_officer(src)
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/mug/cmo(src)
|
||||
new /obj/item/door_remote/chief_medical_officer(src)
|
||||
new /obj/item/reagent_containers/food/drinks/mug/cmo(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/animal
|
||||
@@ -195,10 +195,10 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/animal/New()
|
||||
..()
|
||||
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
|
||||
@@ -214,8 +214,8 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/chemical/New()
|
||||
..()
|
||||
new /obj/item/weapon/storage/box/pillbottles(src)
|
||||
new /obj/item/weapon/storage/box/pillbottles(src)
|
||||
new /obj/item/storage/box/pillbottles(src)
|
||||
new /obj/item/storage/box/pillbottles(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/medical_wall
|
||||
@@ -259,9 +259,9 @@
|
||||
..()
|
||||
new /obj/item/clothing/suit/space/eva/paramedic(src)
|
||||
new /obj/item/clothing/head/helmet/space/eva/paramedic(src)
|
||||
new /obj/item/device/sensor_device(src)
|
||||
new /obj/item/sensor_device(src)
|
||||
new /obj/item/key/ambulance(src)
|
||||
new /obj/item/weapon/pinpointer/crew(src)
|
||||
new /obj/item/pinpointer/crew(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/reagents
|
||||
name = "chemical storage closet"
|
||||
@@ -276,9 +276,9 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/reagents/New()
|
||||
..()
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/phenol(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/ammonia(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/oil(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/acetone(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/acid(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/diethylamine(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/phenol(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/ammonia(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/oil(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/acetone(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/acid(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/diethylamine(src)
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/clown/New()
|
||||
..()
|
||||
new /obj/item/weapon/storage/backpack/clown(src)
|
||||
new /obj/item/storage/backpack/clown(src)
|
||||
new /obj/item/clothing/under/rank/clown(src)
|
||||
new /obj/item/clothing/shoes/clown_shoes(src)
|
||||
new /obj/item/device/radio/headset/headset_service(src)
|
||||
new /obj/item/radio/headset/headset_service(src)
|
||||
new /obj/item/clothing/mask/gas/clown_hat(src)
|
||||
new /obj/item/weapon/bikehorn(src)
|
||||
new /obj/item/weapon/reagent_containers/spray/waterflower(src)
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofbanana(src)
|
||||
new /obj/item/bikehorn(src)
|
||||
new /obj/item/reagent_containers/spray/waterflower(src)
|
||||
new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src)
|
||||
new /obj/item/toy/crayon/rainbow(src)
|
||||
new /obj/item/seeds/banana(src)
|
||||
|
||||
@@ -37,12 +37,12 @@
|
||||
..()
|
||||
new /obj/item/clothing/head/beret(src)
|
||||
new /obj/item/clothing/mask/gas/mime(src)
|
||||
new /obj/item/device/radio/headset/headset_service(src)
|
||||
new /obj/item/radio/headset/headset_service(src)
|
||||
new /obj/item/clothing/under/mime(src)
|
||||
new /obj/item/clothing/suit/suspenders(src)
|
||||
new /obj/item/clothing/gloves/color/white(src)
|
||||
new /obj/item/clothing/shoes/black(src)
|
||||
new /obj/item/weapon/storage/backpack/mime(src)
|
||||
new /obj/item/storage/backpack/mime(src)
|
||||
new /obj/item/toy/crayon/mime(src)
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(src)
|
||||
new /obj/item/weapon/cane(src)
|
||||
new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src)
|
||||
new /obj/item/cane(src)
|
||||
@@ -7,12 +7,12 @@
|
||||
/obj/structure/closet/secure_closet/personal/New()
|
||||
..()
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/storage/backpack/duffel(src)
|
||||
new /obj/item/storage/backpack/duffel(src)
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/storage/backpack(src)
|
||||
new /obj/item/storage/backpack(src)
|
||||
else
|
||||
new /obj/item/weapon/storage/backpack/satchel_norm(src)
|
||||
new /obj/item/device/radio/headset( src )
|
||||
new /obj/item/storage/backpack/satchel_norm(src)
|
||||
new /obj/item/radio/headset( src )
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/personal/patient
|
||||
@@ -51,20 +51,20 @@
|
||||
/obj/structure/closet/secure_closet/personal/cabinet/New()
|
||||
..()
|
||||
contents.Cut()
|
||||
new /obj/item/weapon/storage/backpack/satchel/withwallet( src )
|
||||
new /obj/item/device/radio/headset( src )
|
||||
new /obj/item/storage/backpack/satchel/withwallet( src )
|
||||
new /obj/item/radio/headset( src )
|
||||
|
||||
/obj/structure/closet/secure_closet/personal/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
|
||||
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W as obj, mob/user as mob, params)
|
||||
if(src.opened)
|
||||
if(istype(W, /obj/item/weapon/grab))
|
||||
if(istype(W, /obj/item/grab))
|
||||
src.MouseDrop_T(W:affecting, user) //act like they were dragged onto the closet
|
||||
user.drop_item()
|
||||
if(W) W.forceMove(loc)
|
||||
else if(istype(W, /obj/item/weapon/card/id))
|
||||
else if(istype(W, /obj/item/card/id))
|
||||
if(src.broken)
|
||||
to_chat(user, "<span class='warning'>It appears to be broken.</span>")
|
||||
return
|
||||
var/obj/item/weapon/card/id/I = W
|
||||
var/obj/item/card/id/I = W
|
||||
if(!I || !I.registered_name) return
|
||||
if(src == user.loc)
|
||||
to_chat(user, "<span class='notice'>You can't reach the lock from inside.</span>")
|
||||
@@ -83,7 +83,7 @@
|
||||
src.desc = "Owned by [I.registered_name]."
|
||||
else
|
||||
to_chat(user, "<span class='warning'>Access Denied</span>")
|
||||
else if((istype(W, /obj/item/weapon/card/emag) || istype(W, /obj/item/weapon/melee/energy/blade)) && !broken)
|
||||
else if((istype(W, /obj/item/card/emag) || istype(W, /obj/item/melee/energy/blade)) && !broken)
|
||||
emag_act(user)
|
||||
else
|
||||
to_chat(user, "<span class='warning'>Access Denied</span>")
|
||||
|
||||
@@ -10,15 +10,15 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/scientist/New()
|
||||
..()
|
||||
new /obj/item/weapon/storage/backpack/science(src)
|
||||
new /obj/item/weapon/storage/backpack/satchel_tox(src)
|
||||
new /obj/item/storage/backpack/science(src)
|
||||
new /obj/item/storage/backpack/satchel_tox(src)
|
||||
new /obj/item/clothing/under/rank/scientist(src)
|
||||
//new /obj/item/clothing/suit/labcoat/science(src)
|
||||
new /obj/item/clothing/suit/storage/labcoat/science(src)
|
||||
new /obj/item/clothing/shoes/white(src)
|
||||
// new /obj/item/weapon/cartridge/signal/toxins(src)
|
||||
new /obj/item/device/radio/headset/headset_sci(src)
|
||||
new /obj/item/weapon/tank/air(src)
|
||||
// new /obj/item/cartridge/signal/toxins(src)
|
||||
new /obj/item/radio/headset/headset_sci(src)
|
||||
new /obj/item/tank/air(src)
|
||||
new /obj/item/clothing/mask/gas(src)
|
||||
new /obj/item/clothing/shoes/sandal/white(src)
|
||||
|
||||
@@ -34,16 +34,16 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/roboticist/New()
|
||||
..()
|
||||
new /obj/item/weapon/storage/backpack(src)
|
||||
new /obj/item/weapon/storage/backpack(src)
|
||||
new /obj/item/weapon/storage/backpack/satchel_norm(src)
|
||||
new /obj/item/weapon/storage/backpack/satchel_norm(src)
|
||||
new /obj/item/weapon/storage/backpack/duffel(src)
|
||||
new /obj/item/weapon/storage/backpack/duffel(src)
|
||||
new /obj/item/storage/backpack(src)
|
||||
new /obj/item/storage/backpack(src)
|
||||
new /obj/item/storage/backpack/satchel_norm(src)
|
||||
new /obj/item/storage/backpack/satchel_norm(src)
|
||||
new /obj/item/storage/backpack/duffel(src)
|
||||
new /obj/item/storage/backpack/duffel(src)
|
||||
new /obj/item/clothing/suit/storage/labcoat(src)
|
||||
new /obj/item/clothing/suit/storage/labcoat(src)
|
||||
new /obj/item/device/radio/headset/headset_sci(src)
|
||||
new /obj/item/device/radio/headset/headset_sci(src)
|
||||
new /obj/item/radio/headset/headset_sci(src)
|
||||
new /obj/item/radio/headset/headset_sci(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/RD
|
||||
name = "research director's locker"
|
||||
@@ -61,17 +61,17 @@
|
||||
new /obj/item/clothing/head/bio_hood/scientist(src)
|
||||
new /obj/item/clothing/under/rank/research_director(src)
|
||||
new /obj/item/clothing/suit/storage/labcoat(src)
|
||||
new /obj/item/weapon/cartridge/rd(src)
|
||||
new /obj/item/cartridge/rd(src)
|
||||
new /obj/item/clothing/shoes/white(src)
|
||||
new /obj/item/clothing/gloves/color/latex(src)
|
||||
new /obj/item/device/radio/headset/heads/rd(src)
|
||||
new /obj/item/weapon/tank/air(src)
|
||||
new /obj/item/radio/headset/heads/rd(src)
|
||||
new /obj/item/tank/air(src)
|
||||
new /obj/item/clothing/mask/gas(src)
|
||||
new /obj/item/clothing/suit/armor/reactive/teleport(src)
|
||||
new /obj/item/device/flash(src)
|
||||
new /obj/item/device/laser_pointer(src)
|
||||
new /obj/item/weapon/door_remote/research_director(src)
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/mug/rd(src)
|
||||
new /obj/item/flash(src)
|
||||
new /obj/item/laser_pointer(src)
|
||||
new /obj/item/door_remote/research_director(src)
|
||||
new /obj/item/reagent_containers/food/drinks/mug/rd(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/research_reagents
|
||||
@@ -87,17 +87,17 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/research_reagents/New()
|
||||
..()
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/phenol(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/ammonia(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/oil(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/acetone(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/acid(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/diethylamine(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/morphine(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/morphine(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/morphine(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/morphine(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/insulin(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/insulin(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/insulin(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/insulin(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/phenol(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/ammonia(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/oil(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/acetone(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/acid(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/reagent/diethylamine(src)
|
||||
|
||||
@@ -67,12 +67,12 @@
|
||||
else
|
||||
to_chat(user, "<span class='notice'>Access Denied</span>")
|
||||
|
||||
/obj/structure/closet/secure_closet/attackby(obj/item/weapon/W, mob/user, params)
|
||||
if(istype(W, /obj/item/weapon/rcs))
|
||||
/obj/structure/closet/secure_closet/attackby(obj/item/W, mob/user, params)
|
||||
if(istype(W, /obj/item/rcs))
|
||||
return ..()
|
||||
|
||||
if(opened)
|
||||
if(istype(W, /obj/item/weapon/grab))
|
||||
if(istype(W, /obj/item/grab))
|
||||
if(large)
|
||||
MouseDrop_T(W:affecting, user) //act like they were dragged onto the closet
|
||||
else
|
||||
@@ -84,9 +84,9 @@
|
||||
return
|
||||
if(W)
|
||||
W.forceMove(loc)
|
||||
else if((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !broken)
|
||||
else if((istype(W, /obj/item/card/emag)||istype(W, /obj/item/melee/energy/blade)) && !broken)
|
||||
emag_act(user)
|
||||
else if(istype(W,/obj/item/stack/packageWrap) || istype(W,/obj/item/weapon/weldingtool))
|
||||
else if(istype(W,/obj/item/stack/packageWrap) || istype(W,/obj/item/weldingtool))
|
||||
return ..(W,user)
|
||||
else
|
||||
togglelock(user)
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
/obj/structure/closet/secure_closet/captains/New()
|
||||
..()
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/storage/backpack/captain(src)
|
||||
new /obj/item/storage/backpack/captain(src)
|
||||
else
|
||||
new /obj/item/weapon/storage/backpack/satchel_cap(src)
|
||||
new /obj/item/weapon/book/manual/faxes(src)
|
||||
new /obj/item/weapon/storage/backpack/duffel/captain(src)
|
||||
new /obj/item/storage/backpack/satchel_cap(src)
|
||||
new /obj/item/book/manual/faxes(src)
|
||||
new /obj/item/storage/backpack/duffel/captain(src)
|
||||
new /obj/item/clothing/suit/captunic(src)
|
||||
new /obj/item/clothing/suit/captunic/capjacket(src)
|
||||
new /obj/item/clothing/under/captainparade(src)
|
||||
@@ -23,15 +23,15 @@
|
||||
new /obj/item/clothing/under/rank/captain(src)
|
||||
new /obj/item/clothing/under/dress/dress_cap(src)
|
||||
new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src)
|
||||
new /obj/item/weapon/cartridge/captain(src)
|
||||
new /obj/item/cartridge/captain(src)
|
||||
new /obj/item/clothing/shoes/brown(src)
|
||||
new /obj/item/clothing/shoes/laceup(src)
|
||||
new /obj/item/device/radio/headset/heads/captain/alt(src)
|
||||
new /obj/item/radio/headset/heads/captain/alt(src)
|
||||
new /obj/item/clothing/gloves/color/captain(src)
|
||||
new /obj/item/weapon/storage/belt/rapier(src)
|
||||
new /obj/item/weapon/gun/energy/gun(src)
|
||||
new /obj/item/weapon/door_remote/captain(src)
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/mug/cap(src)
|
||||
new /obj/item/storage/belt/rapier(src)
|
||||
new /obj/item/gun/energy/gun(src)
|
||||
new /obj/item/door_remote/captain(src)
|
||||
new /obj/item/reagent_containers/food/drinks/mug/cap(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/hop
|
||||
@@ -48,16 +48,16 @@
|
||||
..()
|
||||
new /obj/item/clothing/glasses/sunglasses(src)
|
||||
new /obj/item/clothing/head/hopcap(src)
|
||||
new /obj/item/weapon/cartridge/hop(src)
|
||||
new /obj/item/device/radio/headset/heads/hop(src)
|
||||
new /obj/item/weapon/storage/box/ids(src)
|
||||
new /obj/item/weapon/storage/box/PDAs(src)
|
||||
new /obj/item/cartridge/hop(src)
|
||||
new /obj/item/radio/headset/heads/hop(src)
|
||||
new /obj/item/storage/box/ids(src)
|
||||
new /obj/item/storage/box/PDAs(src)
|
||||
new /obj/item/clothing/suit/armor/vest(src)
|
||||
new /obj/item/weapon/gun/energy/gun(src)
|
||||
new /obj/item/device/flash(src)
|
||||
new /obj/item/gun/energy/gun/mini(src)
|
||||
new /obj/item/flash(src)
|
||||
new /obj/item/clothing/accessory/petcollar(src)
|
||||
new /obj/item/weapon/door_remote/civillian(src)
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/mug/hop(src)
|
||||
new /obj/item/door_remote/civillian(src)
|
||||
new /obj/item/reagent_containers/food/drinks/mug/hop(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/hop2
|
||||
@@ -99,11 +99,11 @@
|
||||
/obj/structure/closet/secure_closet/hos/New()
|
||||
..()
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/storage/backpack/security(src)
|
||||
new /obj/item/storage/backpack/security(src)
|
||||
else
|
||||
new /obj/item/weapon/storage/backpack/satchel_sec(src)
|
||||
new /obj/item/weapon/cartridge/hos(src)
|
||||
new /obj/item/device/radio/headset/heads/hos/alt(src)
|
||||
new /obj/item/storage/backpack/satchel_sec(src)
|
||||
new /obj/item/cartridge/hos(src)
|
||||
new /obj/item/radio/headset/heads/hos/alt(src)
|
||||
new /obj/item/clothing/under/rank/head_of_security(src)
|
||||
new /obj/item/clothing/under/rank/head_of_security/formal(src)
|
||||
new /obj/item/clothing/under/rank/head_of_security/corp(src)
|
||||
@@ -113,16 +113,16 @@
|
||||
new /obj/item/clothing/head/HoS(src)
|
||||
new /obj/item/clothing/head/HoS/beret(src)
|
||||
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
|
||||
new /obj/item/weapon/storage/lockbox/mindshield(src)
|
||||
new /obj/item/weapon/storage/box/flashbangs(src)
|
||||
new /obj/item/storage/lockbox/mindshield(src)
|
||||
new /obj/item/storage/box/flashbangs(src)
|
||||
new /obj/item/clothing/mask/gas/sechailer/hos(src)
|
||||
new /obj/item/weapon/shield/riot/tele(src)
|
||||
new /obj/item/weapon/melee/baton/loaded(src)
|
||||
new /obj/item/weapon/storage/belt/security/sec(src)
|
||||
new /obj/item/shield/riot/tele(src)
|
||||
new /obj/item/melee/baton/loaded(src)
|
||||
new /obj/item/storage/belt/security/sec(src)
|
||||
new /obj/item/taperoll/police(src)
|
||||
new /obj/item/weapon/gun/energy/gun/hos(src)
|
||||
new /obj/item/weapon/door_remote/head_of_security(src)
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/mug/hos(src)
|
||||
new /obj/item/gun/energy/gun/hos(src)
|
||||
new /obj/item/door_remote/head_of_security(src)
|
||||
new /obj/item/reagent_containers/food/drinks/mug/hos(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/warden
|
||||
@@ -138,10 +138,10 @@
|
||||
/obj/structure/closet/secure_closet/warden/New()
|
||||
..()
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/storage/backpack/security(src)
|
||||
new /obj/item/storage/backpack/security(src)
|
||||
else
|
||||
new /obj/item/weapon/storage/backpack/satchel_sec(src)
|
||||
new /obj/item/device/radio/headset/headset_sec/alt(src)
|
||||
new /obj/item/storage/backpack/satchel_sec(src)
|
||||
new /obj/item/radio/headset/headset_sec/alt(src)
|
||||
new /obj/item/clothing/suit/armor/vest/warden(src)
|
||||
new /obj/item/clothing/head/warden(src)
|
||||
new /obj/item/clothing/suit/armor/vest/warden/alt(src)
|
||||
@@ -153,13 +153,13 @@
|
||||
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
|
||||
new /obj/item/clothing/mask/gas/sechailer/warden(src)
|
||||
new /obj/item/taperoll/police(src)
|
||||
new /obj/item/weapon/storage/box/zipties(src)
|
||||
new /obj/item/weapon/storage/box/flashbangs(src)
|
||||
new /obj/item/weapon/reagent_containers/spray/pepper(src)
|
||||
new /obj/item/weapon/melee/baton/loaded(src)
|
||||
new /obj/item/weapon/gun/energy/gun/advtaser(src)
|
||||
new /obj/item/weapon/storage/belt/security/sec(src)
|
||||
new /obj/item/weapon/storage/box/holobadge(src)
|
||||
new /obj/item/storage/box/zipties(src)
|
||||
new /obj/item/storage/box/flashbangs(src)
|
||||
new /obj/item/reagent_containers/spray/pepper(src)
|
||||
new /obj/item/melee/baton/loaded(src)
|
||||
new /obj/item/gun/energy/gun/advtaser(src)
|
||||
new /obj/item/storage/belt/security/sec(src)
|
||||
new /obj/item/storage/box/holobadge(src)
|
||||
new /obj/item/clothing/gloves/color/black/krav_maga/sec(src)
|
||||
|
||||
|
||||
@@ -176,20 +176,20 @@
|
||||
/obj/structure/closet/secure_closet/security/New()
|
||||
..()
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/storage/backpack/security(src)
|
||||
new /obj/item/storage/backpack/security(src)
|
||||
else
|
||||
new /obj/item/weapon/storage/backpack/satchel_sec(src)
|
||||
new /obj/item/storage/backpack/satchel_sec(src)
|
||||
new /obj/item/clothing/suit/armor/vest/security(src)
|
||||
new /obj/item/device/radio/headset/headset_sec/alt(src)
|
||||
new /obj/item/radio/headset/headset_sec/alt(src)
|
||||
new /obj/item/clothing/head/soft/sec(src)
|
||||
new /obj/item/weapon/reagent_containers/spray/pepper(src)
|
||||
new /obj/item/device/flash(src)
|
||||
new /obj/item/weapon/grenade/flashbang(src)
|
||||
new /obj/item/weapon/storage/belt/security/sec(src)
|
||||
new /obj/item/reagent_containers/spray/pepper(src)
|
||||
new /obj/item/flash(src)
|
||||
new /obj/item/grenade/flashbang(src)
|
||||
new /obj/item/storage/belt/security/sec(src)
|
||||
new /obj/item/clothing/mask/gas/sechailer(src)
|
||||
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
|
||||
new /obj/item/clothing/head/helmet(src)
|
||||
new /obj/item/weapon/melee/baton/loaded(src)
|
||||
new /obj/item/melee/baton/loaded(src)
|
||||
new /obj/item/taperoll/police(src)
|
||||
|
||||
|
||||
@@ -206,20 +206,20 @@
|
||||
/obj/structure/closet/secure_closet/brigdoc/New()
|
||||
..()
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/storage/backpack/medic(src)
|
||||
new /obj/item/storage/backpack/medic(src)
|
||||
else
|
||||
new /obj/item/weapon/storage/backpack/satchel_med(src)
|
||||
new /obj/item/weapon/reagent_containers/spray/pepper(src)
|
||||
new /obj/item/device/flash(src)
|
||||
new /obj/item/weapon/storage/firstaid/regular(src)
|
||||
new /obj/item/weapon/storage/firstaid/fire(src)
|
||||
new /obj/item/weapon/storage/firstaid/adv(src)
|
||||
new /obj/item/weapon/storage/firstaid/o2(src)
|
||||
new /obj/item/weapon/storage/firstaid/toxin(src)
|
||||
new /obj/item/storage/backpack/satchel_med(src)
|
||||
new /obj/item/reagent_containers/spray/pepper(src)
|
||||
new /obj/item/flash(src)
|
||||
new /obj/item/storage/firstaid/regular(src)
|
||||
new /obj/item/storage/firstaid/fire(src)
|
||||
new /obj/item/storage/firstaid/adv(src)
|
||||
new /obj/item/storage/firstaid/o2(src)
|
||||
new /obj/item/storage/firstaid/toxin(src)
|
||||
new /obj/item/clothing/suit/storage/brigdoc(src)
|
||||
new /obj/item/clothing/under/rank/security/brigphys(src)
|
||||
new /obj/item/clothing/shoes/white(src)
|
||||
new /obj/item/device/radio/headset/headset_sec/alt(src)
|
||||
new /obj/item/radio/headset/headset_sec/alt(src)
|
||||
new /obj/item/clothing/shoes/sandal/white(src)
|
||||
|
||||
|
||||
@@ -235,14 +235,14 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/blueshield/New()
|
||||
..()
|
||||
new /obj/item/weapon/storage/briefcase(src)
|
||||
new /obj/item/weapon/storage/firstaid/adv(src)
|
||||
new /obj/item/weapon/pinpointer/crew(src)
|
||||
new /obj/item/weapon/storage/belt/security/sec(src)
|
||||
new /obj/item/weapon/grenade/flashbang(src)
|
||||
new /obj/item/device/flash(src)
|
||||
new /obj/item/weapon/restraints/handcuffs(src)
|
||||
new /obj/item/weapon/melee/baton/loaded(src)
|
||||
new /obj/item/storage/briefcase(src)
|
||||
new /obj/item/storage/firstaid/adv(src)
|
||||
new /obj/item/pinpointer/crew(src)
|
||||
new /obj/item/storage/belt/security/sec(src)
|
||||
new /obj/item/grenade/flashbang(src)
|
||||
new /obj/item/flash(src)
|
||||
new /obj/item/restraints/handcuffs(src)
|
||||
new /obj/item/melee/baton/loaded(src)
|
||||
new /obj/item/clothing/glasses/sunglasses(src)
|
||||
new /obj/item/clothing/glasses/hud/health/health_advanced
|
||||
new /obj/item/clothing/head/beret/centcom/officer(src)
|
||||
@@ -267,10 +267,10 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/ntrep/New()
|
||||
..()
|
||||
new /obj/item/weapon/book/manual/faxes(src)
|
||||
new /obj/item/weapon/storage/briefcase(src)
|
||||
new /obj/item/device/paicard(src)
|
||||
new /obj/item/device/flash(src)
|
||||
new /obj/item/book/manual/faxes(src)
|
||||
new /obj/item/storage/briefcase(src)
|
||||
new /obj/item/paicard(src)
|
||||
new /obj/item/flash(src)
|
||||
new /obj/item/clothing/glasses/sunglasses(src)
|
||||
new /obj/item/clothing/gloves/color/white(src)
|
||||
new /obj/item/clothing/shoes/centcom(src)
|
||||
@@ -279,8 +279,8 @@
|
||||
new /obj/item/clothing/under/lawyer/female(src)
|
||||
new /obj/item/clothing/head/ntrep(src)
|
||||
new /obj/item/clothing/shoes/sandal/fancy(src)
|
||||
new /obj/item/weapon/storage/box/tapes(src)
|
||||
new /obj/item/device/taperecorder(src)
|
||||
new /obj/item/storage/box/tapes(src)
|
||||
new /obj/item/taperecorder(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/security/cargo
|
||||
@@ -288,7 +288,7 @@
|
||||
/obj/structure/closet/secure_closet/security/cargo/New()
|
||||
..()
|
||||
new /obj/item/clothing/accessory/armband/cargo(src)
|
||||
new /obj/item/device/encryptionkey/headset_cargo(src)
|
||||
new /obj/item/encryptionkey/headset_cargo(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/security/engine
|
||||
@@ -296,7 +296,7 @@
|
||||
/obj/structure/closet/secure_closet/security/engine/New()
|
||||
..()
|
||||
new /obj/item/clothing/accessory/armband/engine(src)
|
||||
new /obj/item/device/encryptionkey/headset_eng(src)
|
||||
new /obj/item/encryptionkey/headset_eng(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/security/science
|
||||
@@ -304,7 +304,7 @@
|
||||
/obj/structure/closet/secure_closet/security/science/New()
|
||||
..()
|
||||
new /obj/item/clothing/accessory/armband/science(src)
|
||||
new /obj/item/device/encryptionkey/headset_sci(src)
|
||||
new /obj/item/encryptionkey/headset_sci(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/security/med
|
||||
@@ -312,7 +312,7 @@
|
||||
/obj/structure/closet/secure_closet/security/med/New()
|
||||
..()
|
||||
new /obj/item/clothing/accessory/armband/medgreen(src)
|
||||
new /obj/item/device/encryptionkey/headset_med(src)
|
||||
new /obj/item/encryptionkey/headset_med(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/detective
|
||||
@@ -336,21 +336,21 @@
|
||||
new /obj/item/clothing/gloves/color/black/forensics(src)
|
||||
new /obj/item/clothing/head/det_hat(src)
|
||||
new /obj/item/clothing/shoes/brown(src)
|
||||
new /obj/item/weapon/storage/box/evidence(src)
|
||||
new /obj/item/weapon/clipboard(src)
|
||||
new /obj/item/device/radio/headset/headset_sec/alt(src)
|
||||
new /obj/item/device/detective_scanner(src)
|
||||
new /obj/item/storage/box/evidence(src)
|
||||
new /obj/item/clipboard(src)
|
||||
new /obj/item/radio/headset/headset_sec/alt(src)
|
||||
new /obj/item/detective_scanner(src)
|
||||
new /obj/item/clothing/suit/armor/vest/det_suit(src)
|
||||
new /obj/item/ammo_box/c38(src)
|
||||
new /obj/item/ammo_box/c38(src)
|
||||
new /obj/item/weapon/gun/projectile/revolver/detective(src)
|
||||
new /obj/item/gun/projectile/revolver/detective(src)
|
||||
new /obj/item/taperoll/police(src)
|
||||
new /obj/item/clothing/accessory/holster/armpit(src)
|
||||
new /obj/item/clothing/glasses/sunglasses/yeah(src)
|
||||
new /obj/item/device/flashlight/seclite(src)
|
||||
new /obj/item/flashlight/seclite(src)
|
||||
new /obj/item/clothing/accessory/black(src)
|
||||
new /obj/item/device/taperecorder(src)
|
||||
new /obj/item/weapon/storage/box/tapes(src)
|
||||
new /obj/item/taperecorder(src)
|
||||
new /obj/item/storage/box/tapes(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/detective/update_icon()
|
||||
if(broken)
|
||||
@@ -371,8 +371,8 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/injection/New()
|
||||
..()
|
||||
new /obj/item/weapon/reagent_containers/ld50_syringe/lethal(src)
|
||||
new /obj/item/weapon/reagent_containers/ld50_syringe/lethal(src)
|
||||
new /obj/item/reagent_containers/ld50_syringe/lethal(src)
|
||||
new /obj/item/reagent_containers/ld50_syringe/lethal(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/brig
|
||||
@@ -385,8 +385,8 @@
|
||||
..()
|
||||
new /obj/item/clothing/under/color/orange/prison(src)
|
||||
new /obj/item/clothing/shoes/orange(src)
|
||||
new /obj/item/weapon/card/id/prisoner/random(src)
|
||||
new /obj/item/device/radio/headset(src)
|
||||
new /obj/item/card/id/prisoner/random(src)
|
||||
new /obj/item/radio/headset(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/courtroom
|
||||
@@ -396,13 +396,13 @@
|
||||
/obj/structure/closet/secure_closet/courtroom/New()
|
||||
..()
|
||||
new /obj/item/clothing/shoes/brown(src)
|
||||
new /obj/item/weapon/paper/Court (src)
|
||||
new /obj/item/weapon/paper/Court (src)
|
||||
new /obj/item/weapon/paper/Court (src)
|
||||
new /obj/item/weapon/pen (src)
|
||||
new /obj/item/paper/Court (src)
|
||||
new /obj/item/paper/Court (src)
|
||||
new /obj/item/paper/Court (src)
|
||||
new /obj/item/pen (src)
|
||||
new /obj/item/clothing/suit/judgerobe (src)
|
||||
new /obj/item/clothing/head/powdered_wig (src)
|
||||
new /obj/item/weapon/storage/briefcase(src)
|
||||
new /obj/item/storage/briefcase(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/wall
|
||||
|
||||
Reference in New Issue
Block a user