mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Make code beautiful v2.0 (#41021)
cl refactor: For every object that creates 3+, replaced with a for(var/i in x to y) and sometimes combined into a list /cl [why]: I did something like this in the past. It removes multiple lines in favor of a simple For and sometimes have some lists
This commit is contained in:
SouDescolado
committed by
yogstation13-bot
yogstation13-bot
parent
e3de8c98a7
commit
8f04da6f52
@@ -1531,3 +1531,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
|
||||
for(var/i in L)
|
||||
if(condition.Invoke(i))
|
||||
. |= i
|
||||
/proc/generate_items_inside(list/items_list,var/where_to)
|
||||
for(var/each_item in items_list)
|
||||
for(var/i in 1 to items_list[each_item])
|
||||
new each_item(where_to)
|
||||
|
||||
@@ -437,34 +437,20 @@
|
||||
))
|
||||
|
||||
/obj/item/storage/belt/grenade/full/PopulateContents()
|
||||
new /obj/item/grenade/flashbang(src)
|
||||
new /obj/item/grenade/smokebomb(src)
|
||||
new /obj/item/grenade/smokebomb(src)
|
||||
new /obj/item/grenade/smokebomb(src)
|
||||
new /obj/item/grenade/smokebomb(src)
|
||||
new /obj/item/grenade/empgrenade(src)
|
||||
new /obj/item/grenade/empgrenade(src)
|
||||
new /obj/item/grenade/syndieminibomb/concussion/frag(src)
|
||||
new /obj/item/grenade/syndieminibomb/concussion/frag(src)
|
||||
new /obj/item/grenade/syndieminibomb/concussion/frag(src)
|
||||
new /obj/item/grenade/syndieminibomb/concussion/frag(src)
|
||||
new /obj/item/grenade/syndieminibomb/concussion/frag(src)
|
||||
new /obj/item/grenade/syndieminibomb/concussion/frag(src)
|
||||
new /obj/item/grenade/syndieminibomb/concussion/frag(src)
|
||||
new /obj/item/grenade/syndieminibomb/concussion/frag(src)
|
||||
new /obj/item/grenade/syndieminibomb/concussion/frag(src)
|
||||
new /obj/item/grenade/syndieminibomb/concussion/frag(src)
|
||||
new /obj/item/grenade/gluon(src)
|
||||
new /obj/item/grenade/gluon(src)
|
||||
new /obj/item/grenade/gluon(src)
|
||||
new /obj/item/grenade/gluon(src)
|
||||
new /obj/item/grenade/chem_grenade/incendiary(src)
|
||||
new /obj/item/grenade/chem_grenade/incendiary(src)
|
||||
new /obj/item/grenade/chem_grenade/facid(src)
|
||||
new /obj/item/grenade/syndieminibomb(src)
|
||||
new /obj/item/grenade/syndieminibomb(src)
|
||||
new /obj/item/screwdriver(src)
|
||||
new /obj/item/multitool(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/grenade/flashbang = 1,
|
||||
/obj/item/grenade/smokebomb = 4,
|
||||
/obj/item/grenade/empgrenade = 1,
|
||||
/obj/item/grenade/empgrenade = 1,
|
||||
/obj/item/grenade/syndieminibomb/concussion/frag = 10,
|
||||
/obj/item/grenade/gluon = 4,
|
||||
/obj/item/grenade/chem_grenade/incendiary = 2,
|
||||
/obj/item/grenade/chem_grenade/facid = 1,
|
||||
/obj/item/grenade/syndieminibomb = 2,
|
||||
/obj/item/screwdriver = 1,
|
||||
/obj/item/multitool = 1)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
|
||||
/obj/item/storage/belt/wands
|
||||
name = "wand belt"
|
||||
@@ -551,9 +537,10 @@
|
||||
))
|
||||
|
||||
/obj/item/storage/belt/holster/full/PopulateContents()
|
||||
new /obj/item/gun/ballistic/revolver/detective(src)
|
||||
new /obj/item/ammo_box/c38(src)
|
||||
new /obj/item/ammo_box/c38(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/gun/ballistic/revolver/detective = 1,
|
||||
/obj/item/ammo_box/c38 = 2)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/item/storage/belt/fannypack
|
||||
name = "fannypack"
|
||||
|
||||
@@ -218,10 +218,10 @@
|
||||
desc = "This box contains injectors, it seems."
|
||||
|
||||
/obj/item/storage/box/injectors/PopulateContents()
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/dnainjector/h2m(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/dnainjector/m2h(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/dnainjector/h2m = 3,
|
||||
/obj/item/dnainjector/m2h = 3)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/item/storage/box/flashbangs
|
||||
name = "box of flashbangs (WARNING)"
|
||||
@@ -286,11 +286,12 @@
|
||||
illustration = "implant"
|
||||
|
||||
/obj/item/storage/box/trackimp/PopulateContents()
|
||||
for(var/i in 1 to 4)
|
||||
new /obj/item/implantcase/tracking(src)
|
||||
new /obj/item/implanter(src)
|
||||
new /obj/item/implantpad(src)
|
||||
new /obj/item/locator(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/implantcase/tracking = 4,
|
||||
/obj/item/implanter = 1,
|
||||
/obj/item/implantpad = 1,
|
||||
/obj/item/locator = 1)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/item/storage/box/minertracker
|
||||
name = "boxed tracking implant kit"
|
||||
@@ -298,11 +299,12 @@
|
||||
illustration = "implant"
|
||||
|
||||
/obj/item/storage/box/minertracker/PopulateContents()
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/implantcase/tracking(src)
|
||||
new /obj/item/implanter(src)
|
||||
new /obj/item/implantpad(src)
|
||||
new /obj/item/locator(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/implantcase/tracking = 3,
|
||||
/obj/item/implanter = 1,
|
||||
/obj/item/implantpad = 1,
|
||||
/obj/item/locator = 1)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/item/storage/box/chemimp
|
||||
name = "boxed chemical implant kit"
|
||||
@@ -310,10 +312,11 @@
|
||||
illustration = "implant"
|
||||
|
||||
/obj/item/storage/box/chemimp/PopulateContents()
|
||||
for(var/i in 1 to 5)
|
||||
new /obj/item/implantcase/chem(src)
|
||||
new /obj/item/implanter(src)
|
||||
new /obj/item/implantpad(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/implantcase/chem = 5,
|
||||
/obj/item/implanter = 1,
|
||||
/obj/item/implantpad = 1)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/item/storage/box/exileimp
|
||||
name = "boxed exile implant kit"
|
||||
@@ -321,9 +324,10 @@
|
||||
illustration = "implant"
|
||||
|
||||
/obj/item/storage/box/exileimp/PopulateContents()
|
||||
for(var/i in 1 to 5)
|
||||
new /obj/item/implantcase/exile(src)
|
||||
new /obj/item/implanter(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/implantcase/exile = 5,
|
||||
/obj/item/implanter = 1)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/item/storage/box/bodybags
|
||||
name = "body bags"
|
||||
@@ -436,10 +440,8 @@
|
||||
illustration = "pda"
|
||||
|
||||
/obj/item/storage/box/PDAs/PopulateContents()
|
||||
new /obj/item/pda(src)
|
||||
new /obj/item/pda(src)
|
||||
new /obj/item/pda(src)
|
||||
new /obj/item/pda(src)
|
||||
for(var/i in 1 to 4)
|
||||
new /obj/item/pda(src)
|
||||
new /obj/item/cartridge/head(src)
|
||||
|
||||
var/newcart = pick( /obj/item/cartridge/engineering,
|
||||
@@ -987,7 +989,6 @@
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/reagent_containers/pill/patch/silver_sulf(src)
|
||||
|
||||
|
||||
/obj/item/storage/box/fountainpens
|
||||
name = "box of fountain pens"
|
||||
|
||||
@@ -1009,21 +1010,13 @@
|
||||
desc = "Contains a variety of basic stock parts."
|
||||
|
||||
/obj/item/storage/box/stockparts/basic/PopulateContents()
|
||||
new /obj/item/stock_parts/capacitor(src)
|
||||
new /obj/item/stock_parts/capacitor(src)
|
||||
new /obj/item/stock_parts/capacitor(src)
|
||||
new /obj/item/stock_parts/scanning_module(src)
|
||||
new /obj/item/stock_parts/scanning_module(src)
|
||||
new /obj/item/stock_parts/scanning_module(src)
|
||||
new /obj/item/stock_parts/manipulator(src)
|
||||
new /obj/item/stock_parts/manipulator(src)
|
||||
new /obj/item/stock_parts/manipulator(src)
|
||||
new /obj/item/stock_parts/micro_laser(src)
|
||||
new /obj/item/stock_parts/micro_laser(src)
|
||||
new /obj/item/stock_parts/micro_laser(src)
|
||||
new /obj/item/stock_parts/matter_bin(src)
|
||||
new /obj/item/stock_parts/matter_bin(src)
|
||||
new /obj/item/stock_parts/matter_bin(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/stock_parts/capacitor = 3,
|
||||
/obj/item/stock_parts/scanning_module = 3,
|
||||
/obj/item/stock_parts/manipulator = 3,
|
||||
/obj/item/stock_parts/micro_laser = 3,
|
||||
/obj/item/stock_parts/matter_bin = 3)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/item/storage/box/stockparts/deluxe
|
||||
name = "box of deluxe stock parts"
|
||||
@@ -1031,18 +1024,10 @@
|
||||
icon_state = "syndiebox"
|
||||
|
||||
/obj/item/storage/box/stockparts/deluxe/PopulateContents()
|
||||
new /obj/item/stock_parts/capacitor/quadratic(src)
|
||||
new /obj/item/stock_parts/capacitor/quadratic(src)
|
||||
new /obj/item/stock_parts/capacitor/quadratic(src)
|
||||
new /obj/item/stock_parts/scanning_module/triphasic(src)
|
||||
new /obj/item/stock_parts/scanning_module/triphasic(src)
|
||||
new /obj/item/stock_parts/scanning_module/triphasic(src)
|
||||
new /obj/item/stock_parts/manipulator/femto(src)
|
||||
new /obj/item/stock_parts/manipulator/femto(src)
|
||||
new /obj/item/stock_parts/manipulator/femto(src)
|
||||
new /obj/item/stock_parts/micro_laser/quadultra(src)
|
||||
new /obj/item/stock_parts/micro_laser/quadultra(src)
|
||||
new /obj/item/stock_parts/micro_laser/quadultra(src)
|
||||
new /obj/item/stock_parts/matter_bin/bluespace(src)
|
||||
new /obj/item/stock_parts/matter_bin/bluespace(src)
|
||||
new /obj/item/stock_parts/matter_bin/bluespace(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/stock_parts/capacitor/quadratic = 3,
|
||||
/obj/item/stock_parts/scanning_module/triphasic = 3,
|
||||
/obj/item/stock_parts/manipulator/femto = 3,
|
||||
/obj/item/stock_parts/micro_laser/quadultra = 3,
|
||||
/obj/item/stock_parts/matter_bin/bluespace = 3)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
/obj/item/storage/firstaid/regular/PopulateContents()
|
||||
if(empty)
|
||||
return
|
||||
new /obj/item/stack/medical/gauze(src)
|
||||
new /obj/item/stack/medical/bruise_pack(src)
|
||||
new /obj/item/stack/medical/bruise_pack(src)
|
||||
new /obj/item/stack/medical/ointment(src)
|
||||
new /obj/item/stack/medical/ointment(src)
|
||||
new /obj/item/reagent_containers/hypospray/medipen(src)
|
||||
new /obj/item/healthanalyzer(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/stack/medical/gauze = 1,
|
||||
/obj/item/stack/medical/bruise_pack = 2,
|
||||
/obj/item/stack/medical/ointment = 2,
|
||||
/obj/item/reagent_containers/hypospray/medipen = 1,
|
||||
/obj/item/healthanalyzer = 1)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/item/storage/firstaid/ancient
|
||||
icon_state = "firstaid"
|
||||
@@ -44,13 +44,11 @@
|
||||
/obj/item/storage/firstaid/ancient/PopulateContents()
|
||||
if(empty)
|
||||
return
|
||||
new /obj/item/stack/medical/gauze(src)
|
||||
new /obj/item/stack/medical/bruise_pack(src)
|
||||
new /obj/item/stack/medical/bruise_pack(src)
|
||||
new /obj/item/stack/medical/bruise_pack(src)
|
||||
new /obj/item/stack/medical/ointment(src)
|
||||
new /obj/item/stack/medical/ointment(src)
|
||||
new /obj/item/stack/medical/ointment(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/stack/medical/gauze = 1,
|
||||
/obj/item/stack/medical/bruise_pack = 3,
|
||||
/obj/item/stack/medical/ointment= 3)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/item/storage/firstaid/fire
|
||||
name = "burn treatment kit"
|
||||
@@ -69,12 +67,12 @@
|
||||
/obj/item/storage/firstaid/fire/PopulateContents()
|
||||
if(empty)
|
||||
return
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/reagent_containers/pill/patch/silver_sulf(src)
|
||||
new /obj/item/reagent_containers/pill/oxandrolone(src)
|
||||
new /obj/item/reagent_containers/pill/oxandrolone(src)
|
||||
new /obj/item/reagent_containers/hypospray/medipen(src)
|
||||
new /obj/item/healthanalyzer(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/reagent_containers/pill/patch/silver_sulf = 3,
|
||||
/obj/item/reagent_containers/pill/oxandrolone = 2,
|
||||
/obj/item/reagent_containers/hypospray/medipen = 1,
|
||||
/obj/item/healthanalyzer = 1)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/item/storage/firstaid/toxin
|
||||
name = "toxin treatment kit"
|
||||
@@ -93,11 +91,11 @@
|
||||
/obj/item/storage/firstaid/toxin/PopulateContents()
|
||||
if(empty)
|
||||
return
|
||||
for(var/i in 1 to 4)
|
||||
new /obj/item/reagent_containers/syringe/charcoal(src)
|
||||
for(var/i in 1 to 2)
|
||||
new /obj/item/storage/pill_bottle/charcoal(src)
|
||||
new /obj/item/healthanalyzer(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/reagent_containers/syringe/charcoal = 4,
|
||||
/obj/item/storage/pill_bottle/charcoal = 2,
|
||||
/obj/item/healthanalyzer = 1)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/item/storage/firstaid/o2
|
||||
name = "oxygen deprivation treatment kit"
|
||||
@@ -112,11 +110,11 @@
|
||||
/obj/item/storage/firstaid/o2/PopulateContents()
|
||||
if(empty)
|
||||
return
|
||||
for(var/i in 1 to 4)
|
||||
new /obj/item/reagent_containers/pill/salbutamol(src)
|
||||
new /obj/item/reagent_containers/hypospray/medipen(src)
|
||||
new /obj/item/reagent_containers/hypospray/medipen(src)
|
||||
new /obj/item/healthanalyzer(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/reagent_containers/pill/salbutamol = 4,
|
||||
/obj/item/reagent_containers/hypospray/medipen = 2,
|
||||
/obj/item/healthanalyzer = 1)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/item/storage/firstaid/brute
|
||||
name = "brute trauma treatment kit"
|
||||
@@ -131,11 +129,11 @@
|
||||
/obj/item/storage/firstaid/brute/PopulateContents()
|
||||
if(empty)
|
||||
return
|
||||
for(var/i in 1 to 4)
|
||||
new /obj/item/reagent_containers/pill/patch/styptic(src)
|
||||
new /obj/item/stack/medical/gauze(src)
|
||||
new /obj/item/stack/medical/gauze(src)
|
||||
new /obj/item/healthanalyzer(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/reagent_containers/pill/patch/styptic = 4,
|
||||
/obj/item/stack/medical/gauze = 2,
|
||||
/obj/item/healthanalyzer = 1)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/item/storage/firstaid/tactical
|
||||
name = "combat medical kit"
|
||||
|
||||
@@ -120,12 +120,8 @@
|
||||
if("ninja") // 33 tc worth
|
||||
new /obj/item/katana(src) // Unique , hard to tell how much tc this is worth. 8 tc?
|
||||
new /obj/item/implanter/adrenalin(src) // 8 tc
|
||||
new /obj/item/throwing_star(src) // ~5 tc for all 6
|
||||
new /obj/item/throwing_star(src)
|
||||
new /obj/item/throwing_star(src)
|
||||
new /obj/item/throwing_star(src)
|
||||
new /obj/item/throwing_star(src)
|
||||
new /obj/item/throwing_star(src)
|
||||
for(var/i in 1 to 6)
|
||||
new /obj/item/throwing_star(src) // ~5 tc for all 6
|
||||
new /obj/item/storage/belt/chameleon(src) // Unique but worth at least 2 tc
|
||||
new /obj/item/card/id/syndicate(src) // 2 tc
|
||||
new /obj/item/chameleon(src) // 7 tc
|
||||
@@ -207,11 +203,8 @@
|
||||
name = "boxed EMP kit"
|
||||
|
||||
/obj/item/storage/box/syndie_kit/emp/PopulateContents()
|
||||
new /obj/item/grenade/empgrenade(src)
|
||||
new /obj/item/grenade/empgrenade(src)
|
||||
new /obj/item/grenade/empgrenade(src)
|
||||
new /obj/item/grenade/empgrenade(src)
|
||||
new /obj/item/grenade/empgrenade(src)
|
||||
for(var/i in 1 to 5)
|
||||
new /obj/item/grenade/empgrenade(src)
|
||||
new /obj/item/implanter/emp(src)
|
||||
|
||||
/obj/item/storage/box/syndie_kit/chemical
|
||||
@@ -284,11 +277,8 @@
|
||||
//5*(2*4) = 5*8 = 45, 45 damage if you hit one person with all 5 stars.
|
||||
//Not counting the damage it will do while embedded (2*4 = 8, at 15% chance)
|
||||
/obj/item/storage/box/syndie_kit/throwing_weapons/PopulateContents()
|
||||
new /obj/item/throwing_star(src)
|
||||
new /obj/item/throwing_star(src)
|
||||
new /obj/item/throwing_star(src)
|
||||
new /obj/item/throwing_star(src)
|
||||
new /obj/item/throwing_star(src)
|
||||
for(var/i in 1 to 5)
|
||||
new /obj/item/throwing_star(src)
|
||||
new /obj/item/restraints/legcuffs/bola/tactical(src)
|
||||
new /obj/item/restraints/legcuffs/bola/tactical(src)
|
||||
|
||||
|
||||
@@ -7,28 +7,22 @@
|
||||
|
||||
/obj/structure/closet/gmcloset/PopulateContents()
|
||||
..()
|
||||
new /obj/item/clothing/head/that(src)
|
||||
new /obj/item/radio/headset/headset_srv(src)
|
||||
new /obj/item/radio/headset/headset_srv(src)
|
||||
new /obj/item/clothing/head/that(src)
|
||||
new /obj/item/clothing/under/sl_suit(src)
|
||||
new /obj/item/clothing/under/sl_suit(src)
|
||||
new /obj/item/clothing/under/rank/bartender(src)
|
||||
new /obj/item/clothing/under/rank/bartender(src)
|
||||
new /obj/item/clothing/accessory/waistcoat(src)
|
||||
new /obj/item/clothing/accessory/waistcoat(src)
|
||||
new /obj/item/clothing/head/soft/black(src)
|
||||
new /obj/item/clothing/head/soft/black(src)
|
||||
new /obj/item/clothing/shoes/sneakers/black(src)
|
||||
new /obj/item/clothing/shoes/sneakers/black(src)
|
||||
new /obj/item/reagent_containers/glass/rag(src)
|
||||
new /obj/item/reagent_containers/glass/rag(src)
|
||||
new /obj/item/storage/box/beanbag(src)
|
||||
new /obj/item/clothing/suit/armor/vest/alt(src)
|
||||
new /obj/item/circuitboard/machine/dish_drive(src)
|
||||
new /obj/item/clothing/glasses/sunglasses/reagent(src)
|
||||
new /obj/item/clothing/neck/petcollar(src)
|
||||
new /obj/item/storage/belt/bandolier(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/clothing/head/that = 2,
|
||||
/obj/item/radio/headset/headset_srv = 2,
|
||||
/obj/item/clothing/under/sl_suit = 2,
|
||||
/obj/item/clothing/under/rank/bartender = 2,
|
||||
/obj/item/clothing/accessory/waistcoat = 2,
|
||||
/obj/item/clothing/head/soft/black = 2,
|
||||
/obj/item/clothing/shoes/sneakers/black = 2,
|
||||
/obj/item/reagent_containers/glass/rag = 2,
|
||||
/obj/item/storage/box/beanbag = 1,
|
||||
/obj/item/clothing/suit/armor/vest/alt = 1,
|
||||
/obj/item/circuitboard/machine/dish_drive = 1,
|
||||
/obj/item/clothing/glasses/sunglasses/reagent = 1,
|
||||
/obj/item/clothing/neck/petcollar = 1,
|
||||
/obj/item/storage/belt/bandolier = 1)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/structure/closet/chefcloset
|
||||
name = "\proper chef's closet"
|
||||
@@ -37,23 +31,19 @@
|
||||
|
||||
/obj/structure/closet/chefcloset/PopulateContents()
|
||||
..()
|
||||
new /obj/item/clothing/under/waiter(src)
|
||||
new /obj/item/clothing/under/waiter(src)
|
||||
new /obj/item/radio/headset/headset_srv(src)
|
||||
new /obj/item/radio/headset/headset_srv(src)
|
||||
new /obj/item/clothing/accessory/waistcoat(src)
|
||||
new /obj/item/clothing/accessory/waistcoat(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/suit/apron/chef(src)
|
||||
new /obj/item/clothing/head/soft/mime(src)
|
||||
new /obj/item/clothing/head/soft/mime(src)
|
||||
new /obj/item/storage/box/mousetraps(src)
|
||||
new /obj/item/storage/box/mousetraps(src)
|
||||
new /obj/item/circuitboard/machine/dish_drive(src)
|
||||
new /obj/item/clothing/suit/toggle/chef(src)
|
||||
new /obj/item/clothing/under/rank/chef(src)
|
||||
new /obj/item/clothing/head/chefhat(src)
|
||||
new /obj/item/reagent_containers/glass/rag(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/clothing/under/waiter = 2,
|
||||
/obj/item/radio/headset/headset_srv = 2,
|
||||
/obj/item/clothing/accessory/waistcoat = 2,
|
||||
/obj/item/clothing/suit/apron/chef = 3,
|
||||
/obj/item/clothing/head/soft/mime = 2,
|
||||
/obj/item/storage/box/mousetraps = 2,
|
||||
/obj/item/circuitboard/machine/dish_drive = 1,
|
||||
/obj/item/clothing/suit/toggle/chef = 1,
|
||||
/obj/item/clothing/under/rank/chef = 1,
|
||||
/obj/item/clothing/head/chefhat = 1,
|
||||
/obj/item/reagent_containers/glass/rag = 1)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/structure/closet/jcloset
|
||||
name = "custodial closet"
|
||||
@@ -124,57 +114,48 @@
|
||||
icon_door = "red"
|
||||
|
||||
/obj/structure/closet/wardrobe/red/PopulateContents()
|
||||
new /obj/item/clothing/suit/hooded/wintercoat/security(src)
|
||||
new /obj/item/storage/backpack/security(src)
|
||||
new /obj/item/storage/backpack/satchel/sec(src)
|
||||
new /obj/item/storage/backpack/duffelbag/sec(src)
|
||||
new /obj/item/storage/backpack/duffelbag/sec(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/under/rank/security(src)
|
||||
for(var/i in 1 to 2)
|
||||
new /obj/item/clothing/under/rank/security/skirt(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/shoes/jackboots(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/head/beret/sec(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/head/soft/sec(src)
|
||||
new /obj/item/clothing/mask/bandana/red(src)
|
||||
new /obj/item/clothing/mask/bandana/red(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/clothing/suit/hooded/wintercoat/security = 1,
|
||||
/obj/item/storage/backpack/security = 1,
|
||||
/obj/item/storage/backpack/satchel/sec = 1,
|
||||
/obj/item/storage/backpack/duffelbag/sec = 2,
|
||||
/obj/item/clothing/under/rank/security = 3,
|
||||
/obj/item/clothing/under/rank/security/skirt = 2,
|
||||
/obj/item/clothing/shoes/jackboots = 3,
|
||||
/obj/item/clothing/head/beret/sec = 3,
|
||||
/obj/item/clothing/head/soft/sec = 3,
|
||||
/obj/item/clothing/mask/bandana/red = 2)
|
||||
generate_items_inside(items_inside,src)
|
||||
return
|
||||
|
||||
|
||||
/obj/structure/closet/wardrobe/cargotech
|
||||
name = "cargo wardrobe"
|
||||
icon_door = "orange"
|
||||
|
||||
/obj/structure/closet/wardrobe/cargotech/PopulateContents()
|
||||
new /obj/item/clothing/suit/hooded/wintercoat/cargo(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/under/rank/cargotech(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/shoes/sneakers/black(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/gloves/fingerless(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/head/soft(src)
|
||||
new /obj/item/radio/headset/headset_cargo(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/clothing/suit/hooded/wintercoat/cargo = 1,
|
||||
/obj/item/clothing/under/rank/cargotech = 3,
|
||||
/obj/item/clothing/shoes/sneakers/black = 3,
|
||||
/obj/item/clothing/gloves/fingerless = 3,
|
||||
/obj/item/clothing/head/soft = 3,
|
||||
/obj/item/radio/headset/headset_cargo = 1)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/structure/closet/wardrobe/atmospherics_yellow
|
||||
name = "atmospherics wardrobe"
|
||||
icon_door = "atmos_wardrobe"
|
||||
|
||||
/obj/structure/closet/wardrobe/atmospherics_yellow/PopulateContents()
|
||||
new /obj/item/clothing/accessory/pocketprotector(src)
|
||||
new /obj/item/storage/backpack/duffelbag/engineering(src)
|
||||
new /obj/item/storage/backpack/satchel/eng(src)
|
||||
new /obj/item/storage/backpack/industrial(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/under/rank/atmospheric_technician(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/shoes/sneakers/black(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/clothing/accessory/pocketprotector = 1,
|
||||
/obj/item/storage/backpack/duffelbag/engineering = 1,
|
||||
/obj/item/storage/backpack/satchel/eng = 1,
|
||||
/obj/item/storage/backpack/industrial = 1,
|
||||
/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3,
|
||||
/obj/item/clothing/under/rank/atmospheric_technician = 3,
|
||||
/obj/item/clothing/shoes/sneakers/black = 3)
|
||||
generate_items_inside(items_inside,src)
|
||||
return
|
||||
|
||||
/obj/structure/closet/wardrobe/engineering_yellow
|
||||
@@ -182,45 +163,40 @@
|
||||
icon_door = "yellow"
|
||||
|
||||
/obj/structure/closet/wardrobe/engineering_yellow/PopulateContents()
|
||||
new /obj/item/clothing/accessory/pocketprotector(src)
|
||||
new /obj/item/storage/backpack/duffelbag/engineering(src)
|
||||
new /obj/item/storage/backpack/industrial(src)
|
||||
new /obj/item/storage/backpack/satchel/eng(src)
|
||||
new /obj/item/clothing/suit/hooded/wintercoat/engineering(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/under/rank/engineer(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/suit/hazardvest(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/shoes/workboots(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/head/hardhat(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/clothing/accessory/pocketprotector = 1,
|
||||
/obj/item/storage/backpack/duffelbag/engineering = 1,
|
||||
/obj/item/storage/backpack/industrial = 1,
|
||||
/obj/item/storage/backpack/satchel/eng = 1,
|
||||
/obj/item/clothing/suit/hooded/wintercoat/engineering = 1,
|
||||
/obj/item/clothing/under/rank/engineer = 3,
|
||||
/obj/item/clothing/suit/hazardvest = 3,
|
||||
/obj/item/clothing/shoes/workboots = 3,
|
||||
/obj/item/clothing/head/hardhat = 3)
|
||||
generate_items_inside(items_inside,src)
|
||||
return
|
||||
|
||||
/obj/structure/closet/wardrobe/white/medical
|
||||
name = "medical doctor's wardrobe"
|
||||
|
||||
/obj/structure/closet/wardrobe/white/medical/PopulateContents()
|
||||
new /obj/item/clothing/accessory/pocketprotector(src)
|
||||
new /obj/item/storage/backpack/duffelbag/med(src)
|
||||
new /obj/item/storage/backpack/medic(src)
|
||||
new /obj/item/storage/backpack/satchel/med(src)
|
||||
new /obj/item/clothing/suit/hooded/wintercoat/medical(src)
|
||||
new /obj/item/clothing/under/rank/nursesuit(src)
|
||||
new /obj/item/clothing/head/nursehat(src)
|
||||
new /obj/item/clothing/under/rank/medical/blue(src)
|
||||
new /obj/item/clothing/under/rank/medical/green(src)
|
||||
new /obj/item/clothing/under/rank/medical/purple(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/under/rank/medical(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/suit/toggle/labcoat(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/suit/toggle/labcoat/emt(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/shoes/sneakers/white(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/head/soft/emt(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/clothing/accessory/pocketprotector = 1,
|
||||
/obj/item/storage/backpack/duffelbag/med = 1,
|
||||
/obj/item/storage/backpack/medic = 1,
|
||||
/obj/item/storage/backpack/satchel/med = 1,
|
||||
/obj/item/clothing/suit/hooded/wintercoat/medical = 1,
|
||||
/obj/item/clothing/under/rank/nursesuit = 1,
|
||||
/obj/item/clothing/head/nursehat = 1,
|
||||
/obj/item/clothing/under/rank/medical/blue = 1,
|
||||
/obj/item/clothing/under/rank/medical/green = 1,
|
||||
/obj/item/clothing/under/rank/medical/purple = 1,
|
||||
/obj/item/clothing/under/rank/medical = 3,
|
||||
/obj/item/clothing/suit/toggle/labcoat = 3,
|
||||
/obj/item/clothing/suit/toggle/labcoat/emt = 3,
|
||||
/obj/item/clothing/shoes/sneakers/white = 3,
|
||||
/obj/item/clothing/head/soft/emt = 3)
|
||||
generate_items_inside(items_inside,src)
|
||||
return
|
||||
|
||||
/obj/structure/closet/wardrobe/robotics_black
|
||||
@@ -228,18 +204,14 @@
|
||||
icon_door = "black"
|
||||
|
||||
/obj/structure/closet/wardrobe/robotics_black/PopulateContents()
|
||||
new /obj/item/clothing/glasses/hud/diagnostic(src)
|
||||
new /obj/item/clothing/glasses/hud/diagnostic(src)
|
||||
new /obj/item/clothing/under/rank/roboticist(src)
|
||||
new /obj/item/clothing/under/rank/roboticist(src)
|
||||
new /obj/item/clothing/suit/toggle/labcoat(src)
|
||||
new /obj/item/clothing/suit/toggle/labcoat(src)
|
||||
new /obj/item/clothing/shoes/sneakers/black(src)
|
||||
new /obj/item/clothing/shoes/sneakers/black(src)
|
||||
new /obj/item/clothing/gloves/fingerless(src)
|
||||
new /obj/item/clothing/gloves/fingerless(src)
|
||||
new /obj/item/clothing/head/soft/black(src)
|
||||
new /obj/item/clothing/head/soft/black(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/clothing/glasses/hud/diagnostic = 2,
|
||||
/obj/item/clothing/under/rank/roboticist = 2,
|
||||
/obj/item/clothing/suit/toggle/labcoat = 2,
|
||||
/obj/item/clothing/shoes/sneakers/black = 2,
|
||||
/obj/item/clothing/gloves/fingerless = 2,
|
||||
/obj/item/clothing/head/soft/black = 2)
|
||||
generate_items_inside(items_inside,src)
|
||||
if(prob(40))
|
||||
new /obj/item/clothing/mask/bandana/skull(src)
|
||||
if(prob(40))
|
||||
@@ -252,18 +224,14 @@
|
||||
icon_door = "white"
|
||||
|
||||
/obj/structure/closet/wardrobe/chemistry_white/PopulateContents()
|
||||
new /obj/item/clothing/under/rank/chemist(src)
|
||||
new /obj/item/clothing/under/rank/chemist(src)
|
||||
new /obj/item/clothing/shoes/sneakers/white(src)
|
||||
new /obj/item/clothing/shoes/sneakers/white(src)
|
||||
new /obj/item/clothing/suit/toggle/labcoat/chemist(src)
|
||||
new /obj/item/clothing/suit/toggle/labcoat/chemist(src)
|
||||
new /obj/item/storage/backpack/chemistry(src)
|
||||
new /obj/item/storage/backpack/chemistry(src)
|
||||
new /obj/item/storage/backpack/satchel/chem(src)
|
||||
new /obj/item/storage/backpack/satchel/chem(src)
|
||||
new /obj/item/storage/bag/chemistry(src)
|
||||
new /obj/item/storage/bag/chemistry(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/clothing/under/rank/chemist = 2,
|
||||
/obj/item/clothing/shoes/sneakers/white = 2,
|
||||
/obj/item/clothing/suit/toggle/labcoat/chemist = 2,
|
||||
/obj/item/storage/backpack/chemistry = 2,
|
||||
/obj/item/storage/backpack/satchel/chem = 2,
|
||||
/obj/item/storage/bag/chemistry = 2)
|
||||
generate_items_inside(items_inside,src)
|
||||
return
|
||||
|
||||
|
||||
@@ -272,16 +240,13 @@
|
||||
icon_door = "white"
|
||||
|
||||
/obj/structure/closet/wardrobe/genetics_white/PopulateContents()
|
||||
new /obj/item/clothing/under/rank/geneticist(src)
|
||||
new /obj/item/clothing/under/rank/geneticist(src)
|
||||
new /obj/item/clothing/shoes/sneakers/white(src)
|
||||
new /obj/item/clothing/shoes/sneakers/white(src)
|
||||
new /obj/item/clothing/suit/toggle/labcoat/genetics(src)
|
||||
new /obj/item/clothing/suit/toggle/labcoat/genetics(src)
|
||||
new /obj/item/storage/backpack/genetics(src)
|
||||
new /obj/item/storage/backpack/genetics(src)
|
||||
new /obj/item/storage/backpack/satchel/gen(src)
|
||||
new /obj/item/storage/backpack/satchel/gen(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/clothing/under/rank/geneticist = 2,
|
||||
/obj/item/clothing/shoes/sneakers/white = 2,
|
||||
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
|
||||
/obj/item/storage/backpack/genetics = 2,
|
||||
/obj/item/storage/backpack/satchel/gen = 2)
|
||||
generate_items_inside(items_inside,src)
|
||||
return
|
||||
|
||||
|
||||
@@ -290,18 +255,14 @@
|
||||
icon_door = "white"
|
||||
|
||||
/obj/structure/closet/wardrobe/virology_white/PopulateContents()
|
||||
new /obj/item/clothing/under/rank/virologist(src)
|
||||
new /obj/item/clothing/under/rank/virologist(src)
|
||||
new /obj/item/clothing/shoes/sneakers/white(src)
|
||||
new /obj/item/clothing/shoes/sneakers/white(src)
|
||||
new /obj/item/clothing/suit/toggle/labcoat/virologist(src)
|
||||
new /obj/item/clothing/suit/toggle/labcoat/virologist(src)
|
||||
new /obj/item/clothing/mask/surgical(src)
|
||||
new /obj/item/clothing/mask/surgical(src)
|
||||
new /obj/item/storage/backpack/virology(src)
|
||||
new /obj/item/storage/backpack/virology(src)
|
||||
new /obj/item/storage/backpack/satchel/vir(src)
|
||||
new /obj/item/storage/backpack/satchel/vir(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/clothing/under/rank/virologist = 2,
|
||||
/obj/item/clothing/shoes/sneakers/white = 2,
|
||||
/obj/item/clothing/suit/toggle/labcoat/virologist = 2,
|
||||
/obj/item/clothing/mask/surgical = 2,
|
||||
/obj/item/storage/backpack/virology = 2,
|
||||
/obj/item/storage/backpack/satchel/vir = 2)
|
||||
generate_items_inside(items_inside,src)
|
||||
return
|
||||
|
||||
/obj/structure/closet/wardrobe/science_white
|
||||
@@ -309,22 +270,17 @@
|
||||
icon_door = "white"
|
||||
|
||||
/obj/structure/closet/wardrobe/science_white/PopulateContents()
|
||||
new /obj/item/clothing/accessory/pocketprotector(src)
|
||||
new /obj/item/storage/backpack/science(src)
|
||||
new /obj/item/storage/backpack/science(src)
|
||||
new /obj/item/storage/backpack/satchel/tox(src)
|
||||
new /obj/item/storage/backpack/satchel/tox(src)
|
||||
new /obj/item/clothing/suit/hooded/wintercoat/science(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/under/rank/scientist(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/suit/toggle/labcoat/science(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/shoes/sneakers/white(src)
|
||||
new /obj/item/radio/headset/headset_sci(src)
|
||||
new /obj/item/radio/headset/headset_sci(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/mask/gas(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/clothing/accessory/pocketprotector = 1,
|
||||
/obj/item/storage/backpack/science = 2,
|
||||
/obj/item/storage/backpack/satchel/tox = 2,
|
||||
/obj/item/clothing/suit/hooded/wintercoat/science = 1,
|
||||
/obj/item/clothing/under/rank/scientist = 3,
|
||||
/obj/item/clothing/suit/toggle/labcoat/science = 3,
|
||||
/obj/item/clothing/shoes/sneakers/white = 3,
|
||||
/obj/item/radio/headset/headset_sci = 2,
|
||||
/obj/item/clothing/mask/gas = 3)
|
||||
generate_items_inside(items_inside,src)
|
||||
return
|
||||
|
||||
/obj/structure/closet/wardrobe/botanist
|
||||
@@ -332,20 +288,15 @@
|
||||
icon_door = "green"
|
||||
|
||||
/obj/structure/closet/wardrobe/botanist/PopulateContents()
|
||||
new /obj/item/storage/backpack/botany(src)
|
||||
new /obj/item/storage/backpack/botany(src)
|
||||
new /obj/item/storage/backpack/satchel/hyd(src)
|
||||
new /obj/item/storage/backpack/satchel/hyd(src)
|
||||
new /obj/item/clothing/suit/hooded/wintercoat/hydro(src)
|
||||
new /obj/item/clothing/suit/apron(src)
|
||||
new /obj/item/clothing/suit/apron(src)
|
||||
new /obj/item/clothing/suit/apron/overalls(src)
|
||||
new /obj/item/clothing/suit/apron/overalls(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/under/rank/hydroponics(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/clothing/mask/bandana(src)
|
||||
|
||||
var/static/items_inside = list(
|
||||
/obj/item/storage/backpack/botany = 2,
|
||||
/obj/item/storage/backpack/satchel/hyd = 2,
|
||||
/obj/item/clothing/suit/hooded/wintercoat/hydro = 1,
|
||||
/obj/item/clothing/suit/apron = 2,
|
||||
/obj/item/clothing/suit/apron/overalls = 2,
|
||||
/obj/item/clothing/under/rank/hydroponics = 3,
|
||||
/obj/item/clothing/mask/bandana = 3)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/structure/closet/wardrobe/curator
|
||||
name = "treasure hunting wardrobe"
|
||||
|
||||
@@ -39,16 +39,13 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/engineering_electrical/PopulateContents()
|
||||
..()
|
||||
new /obj/item/clothing/gloves/color/yellow(src)
|
||||
new /obj/item/clothing/gloves/color/yellow(src)
|
||||
new /obj/item/inducer(src)
|
||||
new /obj/item/inducer(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/storage/toolbox/electrical(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/electronics/apc(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/multitool(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/clothing/gloves/color/yellow = 2,
|
||||
/obj/item/inducer = 2,
|
||||
/obj/item/storage/toolbox/electrical = 3,
|
||||
/obj/item/electronics/apc = 3,
|
||||
/obj/item/multitool = 3)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/structure/closet/secure_closet/engineering_welding
|
||||
name = "welding supplies locker"
|
||||
|
||||
@@ -6,20 +6,17 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/medical1/PopulateContents()
|
||||
..()
|
||||
new /obj/item/reagent_containers/glass/beaker(src)
|
||||
new /obj/item/reagent_containers/glass/beaker(src)
|
||||
new /obj/item/reagent_containers/dropper(src)
|
||||
new /obj/item/reagent_containers/dropper(src)
|
||||
new /obj/item/storage/belt/medical(src)
|
||||
new /obj/item/storage/box/syringes(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/toxin(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/morphine(src)
|
||||
new /obj/item/reagent_containers/glass/bottle/morphine(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/reagent_containers/glass/bottle/epinephrine(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/reagent_containers/glass/bottle/charcoal(src)
|
||||
new /obj/item/storage/box/rxglasses(src)
|
||||
var/static/items_inside = list(
|
||||
/obj/item/reagent_containers/glass/beaker = 2,
|
||||
/obj/item/reagent_containers/dropper = 2,
|
||||
/obj/item/storage/belt/medical = 1,
|
||||
/obj/item/storage/box/syringes = 1,
|
||||
/obj/item/reagent_containers/glass/bottle/toxin = 1,
|
||||
/obj/item/reagent_containers/glass/bottle/morphine = 2,
|
||||
/obj/item/reagent_containers/glass/bottle/epinephrine= 3,
|
||||
/obj/item/reagent_containers/glass/bottle/charcoal = 3,
|
||||
/obj/item/storage/box/rxglasses = 1)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
/obj/structure/closet/secure_closet/medical2
|
||||
name = "anesthetic closet"
|
||||
@@ -98,4 +95,4 @@
|
||||
new /obj/item/storage/box/pillbottles(src)
|
||||
new /obj/item/storage/box/pillbottles(src)
|
||||
new /obj/item/storage/box/medsprays(src)
|
||||
new /obj/item/storage/box/medsprays(src)
|
||||
new /obj/item/storage/box/medsprays(src)
|
||||
|
||||
Reference in New Issue
Block a user