Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

de-modularise crate_lockers #7207

Merged
Amelia0010 merged 1 commit into from
Dec 3, 2019
Merged

de-modularise crate_lockers #7207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/game/objects/structures/crates_lockers/closets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
var/delivery_icon = "deliverycloset" //which icon to use when packagewrapped. null to be unwrappable.
var/anchorable = TRUE
var/icon_welded = "welded"
var/notreallyacloset = FALSE // It is genuinely a closet


/obj/structure/closet/Initialize(mapload)
Expand Down
0 ...rates_lockers/closets/bluespace_locker.dm → ...rates_lockers/closets/bluespace_locker.dm
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions code/game/objects/structures/crates_lockers/closets/bodybag.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
material_drop = /obj/item/stack/sheet/cloth
delivery_icon = null //unwrappable
anchorable = FALSE
notreallyacloset = TRUE
var/foldedbag_path = /obj/item/bodybag
var/obj/item/bodybag/foldedbag_instance = null
var/tagged = 0 // so closet code knows to put the tag overlay back
Expand Down
16 changes: 16 additions & 0 deletions code/game/objects/structures/crates_lockers/closets/job_closets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,3 +309,19 @@
new /obj/item/clothing/shoes/workboots/mining(src)
new /obj/item/storage/backpack/satchel/explorer(src)

/obj/structure/closet/wardrobe/tcomms
name = "signal tech wardrobe"
icon = 'yogstation/icons/obj/closet.dmi'
icon_state = "sigtech"
icon_door = "sigtech"

/obj/structure/closet/wardrobe/tcomms/PopulateContents()
..()
contents = list()
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/tcomms(src)
new /obj/item/clothing/under/yogs/rank/signal_tech(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/under/yogs/rank/signal_tech/skirt(src)
1 change: 1 addition & 0 deletions code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@
new /obj/item/circuitboard/machine/techfab/department/cargo(src)
new /obj/item/storage/photo_album/QM(src)
new /obj/item/circuitboard/machine/ore_silo(src)
new /obj/item/card/id/departmental_budget/car(src)
6 changes: 6 additions & 0 deletions code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
new /obj/item/extinguisher/advanced(src)
new /obj/item/storage/photo_album/CE(src)
new /obj/item/energy_harvester(src)
new /obj/item/clipboard/yog/paperwork/ce(src)
new /obj/item/card/id/departmental_budget/eng(src)
new /obj/item/clothing/under/yogs/ceturtleneck(src)
new /obj/item/clothing/under/yogs/cecasual(src)
new /obj/item/clothing/head/beret/ce(src)
new /obj/item/poster/firstsingularity(src)

/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies locker"
Expand Down
75 changes: 75 additions & 0 deletions code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,78 @@
new /obj/item/wallframe/defib_mount(src)
new /obj/item/circuitboard/machine/techfab/department/medical(src)
new /obj/item/storage/photo_album/CMO(src)
new /obj/item/clipboard/yog/paperwork/cmo(src)
new /obj/item/card/id/departmental_budget/med(src)
new /obj/item/clothing/head/beret/cmo(src)

/obj/structure/closet/secure_closet/paramedic
name = "paramedical closet"
desc = "It's a secure storage unit for paramedical supplies."
icon = 'yogstation/icons/obj/closet.dmi'
icon_state = "paramed"
req_access = list(ACCESS_PARAMEDIC)

/obj/structure/closet/secure_closet/paramedic/PopulateContents()
..()
if(prob(50))
new /obj/item/storage/backpack/medic(src)
else
new /obj/item/storage/backpack/satchel/med(src)
new /obj/item/storage/firstaid/regular(src)
new /obj/item/clothing/shoes/sneakers/white(src)
switch(pick("blue", "green", "purple"))
if ("blue")
new /obj/item/clothing/under/rank/medical/blue(src)
if ("green")
new /obj/item/clothing/under/rank/medical/green(src)
if ("purple")
new /obj/item/clothing/under/rank/medical/purple(src)
switch(pick("blue", "green", "purple"))
if ("blue")
new /obj/item/clothing/under/rank/medical/blue(src)
if ("green")
new /obj/item/clothing/under/rank/medical/green(src)
if ("purple")
new /obj/item/clothing/under/rank/medical/purple(src)
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/suit/toggle/labcoat/emt(src)
new /obj/item/clothing/head/soft/emt(src)
new /obj/item/defibrillator/loaded(src)
new /obj/item/clothing/suit/toggle/labcoat/pmedic_jacket(src)
new /obj/item/radio/headset/headset_med(src)
new /obj/item/storage/belt/medical(src)

/obj/structure/closet/secure_closet/mmedical
name = "mining medic's locker"
req_access = list(ACCESS_MEDICAL)
icon = 'yogstation/icons/obj/closet.dmi'
icon_state = "medic"

/obj/structure/closet/secure_closet/mmedical/PopulateContents()
..()
new /obj/item/reagent_containers/hypospray/mixi(src)
new /obj/item/reagent_containers/hypospray/derm(src)
if(prob(50))
new /obj/item/storage/backpack/medic(src)
else
new /obj/item/storage/backpack/satchel/med(src)
new /obj/item/defibrillator/loaded(src)
new /obj/item/clothing/suit/toggle/labcoat/emt/explorer(src)
new /obj/item/clothing/under/yogs/rank/miner/medic(src)
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/cartridge/medical(src)
new /obj/item/radio/headset/headset_cargo(src)
new /obj/item/storage/firstaid/toxin(src)
new /obj/item/clothing/mask/gas/explorer(src)
new /obj/item/storage/belt/medical(src)
new /obj/item/pickaxe(src)
new /obj/item/sensor_device(src)
new /obj/item/storage/box/bodybags(src)
new /obj/item/extinguisher/mini(src)
new /obj/item/clothing/glasses/hud/health(src)
var/obj/item/key/K = new(src)
K.name = "ATV key"
K.desc = "It's a small grey key. Don't let those goddamn ashwalkers get it."

/obj/structure/closet/secure_closet/animal
name = "animal control"
Expand All @@ -98,6 +170,9 @@
new /obj/item/storage/box/pillbottles(src)
new /obj/item/storage/box/medsprays(src)
new /obj/item/storage/box/medsprays(src)
new /obj/item/reagent_containers/glass/bottle/facid(src)
new /obj/item/reagent_containers/glass/bottle/capsaicin(src)
new /obj/item/reagent_containers/glass/bottle/mutagen(src)

/obj/structure/closet/secure_closet/chemical/heisenberg //contains one of each beaker, syringe etc.
name = "advanced chemical closet"
Expand Down
3 changes: 3 additions & 0 deletions code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@
new /obj/item/door_remote/research_director(src)
new /obj/item/circuitboard/machine/techfab/department/science(src)
new /obj/item/storage/photo_album/RD(src)
new /obj/item/clipboard/yog/paperwork/rd(src)
new /obj/item/card/id/departmental_budget/sci(src)
new /obj/item/clothing/under/yogs/rdema(src)
35 changes: 34 additions & 1 deletion code/game/objects/structures/crates_lockers/closets/secure/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
new /obj/item/radio/headset/heads/captain(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/storage/belt/sabre(src)
// new /obj/item/gun/energy/e_gun(src) - yogs
new /obj/item/door_remote/captain(src)
new /obj/item/card/id/captains_spare(src)
new /obj/item/storage/photo_album/Captain(src)
new /obj/item/clipboard/yog/paperwork/captain(src)
new /obj/item/card/id/departmental_budget/civ(src)
new /obj/item/radio/security(src)

/obj/structure/closet/secure_closet/hop
name = "\proper head of personnel's locker"
Expand Down Expand Up @@ -45,6 +47,12 @@
new /obj/item/door_remote/civillian(src)
new /obj/item/circuitboard/machine/techfab/department/service(src)
new /obj/item/storage/photo_album/HoP(src)
new /obj/item/clipboard/yog/paperwork/hop(src)
new /obj/item/card/id/departmental_budget/srv(src)
new /obj/item/gun/energy/e_gun/mini(src) //hop doesn't get a proper gun
new /obj/item/clothing/suit/armor/vest/rurmcoat(src)
new /obj/item/clothing/suit/armor/vest/sovietcoat(src)
new /obj/item/clothing/under/yogs/hopcasual(src)

/obj/structure/closet/secure_closet/hos
name = "\proper head of security's locker"
Expand Down Expand Up @@ -80,6 +88,14 @@
new /obj/item/pinpointer/nuke(src)
new /obj/item/circuitboard/machine/techfab/department/security(src)
new /obj/item/storage/photo_album/HoS(src)
new /obj/item/clipboard/yog/paperwork/hos(src)
new /obj/item/clothing/under/yogs/lieutgeneral(src)
new /obj/item/clothing/under/yogs/dictatorhos(src)
new /obj/item/clothing/suit/armor/hos/germancoat(src)
new /obj/item/clothing/under/yogs/hoslatenight(src)
new /obj/item/clothing/under/yogs/hoscasual(src)
new /obj/item/clothing/suit/armor/vest/hosjacket(src)
new /obj/item/radio/security(src)

/obj/structure/closet/secure_closet/warden
name = "\proper warden's locker"
Expand Down Expand Up @@ -107,6 +123,13 @@
new /obj/item/door_remote/head_of_security(src)
new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src)
new /obj/item/clothing/shoes/jackboots/warden(src)
new /obj/item/clipboard/yog/paperwork/warden(src)
new /obj/item/card/id/departmental_budget/sec(src)
new /obj/item/clothing/under/yogs/ocelot(src)
new /obj/item/clothing/under/yogs/krofficer(src)
new /obj/item/clothing/head/beret/corpwarden(src)
new /obj/item/clothing/suit/armor/vest/wardenjacket(src)
new /obj/item/radio/security(src)

/obj/structure/closet/secure_closet/security
name = "security officer's locker"
Expand All @@ -121,6 +144,8 @@
new /obj/item/radio/headset/headset_sec/alt(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/flashlight/seclite(src)
new /obj/item/radio/security(src)
new /obj/item/clipboard/yog/paperwork/security(src)

/obj/structure/closet/secure_closet/security/sec

Expand Down Expand Up @@ -187,6 +212,14 @@
new /obj/item/storage/belt/holster/full(src)
new /obj/item/pinpointer/crew(src)
new /obj/item/twohanded/binoculars(src)
new /obj/item/clothing/under/yogs/forensictech(src)
new /obj/item/clothing/under/yogs/bluedetective(src)
new /obj/item/clothing/under/yogs/golddetective(src)
new /obj/item/clothing/under/yogs/greydetective(src)
new /obj/item/clothing/under/yogs/blackdetective(src)
new /obj/item/clothing/suit/yogs/golddetective(src)
new /obj/item/clothing/suit/yogs/detectivecoat(src)
new /obj/item/clothing/suit/yogs/bluedetective(src)

/obj/structure/closet/secure_closet/injection
name = "lethal injections"
Expand Down
6 changes: 1 addition & 5 deletions .../crates_lockers/closets/secure/service.dm → .../crates_lockers/closets/secure/service.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,4 @@
/obj/item/clothing/neck/petcollar = 1,
/obj/item/storage/belt/bandolier = 1,
/obj/item/gun/ballistic/shotgun/doublebarrel = 1) //now in closet rather than on a table
generate_items_inside(items_inside,src)

/obj/structure/closet/secure_closet/quartermaster/PopulateContents()
..()
new /obj/item/card/id/departmental_budget/car(src)
generate_items_inside(items_inside,src)
93 changes: 91 additions & 2 deletions code/game/objects/structures/crates_lockers/crates.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,5 +279,94 @@
new /obj/item/gun/magic/rune/resizement_rune(src)
new /obj/item/gun/magic/rune/heal_rune(src)



/obj/structure/closet/crate/sphere
desc = "An Advanced Crate that defies all known cargo standards."
name = "Advanced Crate"
icon = 'yogstation/icons/obj/crates.dmi'
icon_state = "round"

/obj/structure/closet/crate/critter/exoticgoats
name = "goat crate"
desc = "Contains a completly random goat from Goat Tech Industries that may or may not break the laws of science!"

/obj/structure/closet/crate/critter/exoticgoats/Initialize()
var/loot = rand(1,39) //39 different goats!
switch(loot)
if(1)
new /mob/living/simple_animal/hostile/retaliate/goat(loc)
if(2)
new /mob/living/simple_animal/hostile/retaliate/goat/clown(loc)
if(3)
new /mob/living/simple_animal/hostile/retaliate/goat/ras(loc)
if(4)
new /mob/living/simple_animal/hostile/retaliate/goat/blue(loc)
if(5)
new /mob/living/simple_animal/hostile/retaliate/goat/chocolate(loc)
if(6)
new /mob/living/simple_animal/hostile/retaliate/goat/christmas(loc)
if(7)
new /mob/living/simple_animal/hostile/retaliate/goat/confetti(loc)
if(8)
new /mob/living/simple_animal/hostile/retaliate/goat/cottoncandy(loc)
if(9)
new /mob/living/simple_animal/hostile/retaliate/goat/glowing(loc)
if(10)
new /mob/living/simple_animal/hostile/retaliate/goat/goatgoat(loc)
if(11)
new /mob/living/simple_animal/hostile/retaliate/goat/horror(loc)
if(12)
new /mob/living/simple_animal/hostile/retaliate/goat/inverted(loc)
if(13)
new /mob/living/simple_animal/hostile/retaliate/goat/memory(loc)
if(14)
new /mob/living/simple_animal/hostile/retaliate/goat/mirrored(loc)
if(15)
new /mob/living/simple_animal/hostile/retaliate/goat/paper(loc)
if(16)
new /mob/living/simple_animal/hostile/retaliate/goat/pixel(loc)
if(17)
new /mob/living/simple_animal/hostile/retaliate/goat/radioactive(loc)
if(18)
new /mob/living/simple_animal/hostile/retaliate/goat/rainbow(loc)
if(19)
new /mob/living/simple_animal/hostile/retaliate/goat/cute(loc)
if(20)
new /mob/living/simple_animal/hostile/retaliate/goat/star(loc)
if(21)
new /mob/living/simple_animal/hostile/retaliate/goat/twisted(loc)
if(22)
new /mob/living/simple_animal/hostile/retaliate/goat/huge(loc)
if(23)
new /mob/living/simple_animal/hostile/retaliate/goat/tiny(loc)
if(24)
new /mob/living/simple_animal/hostile/retaliate/goat/ghost(loc)
if(25)
new /mob/living/simple_animal/hostile/retaliate/goat/brick(loc)
if(26)
new /mob/living/simple_animal/hostile/retaliate/goat/watercolor(loc)
if(27)
new /mob/living/simple_animal/hostile/retaliate/goat/brown(loc)
if(28)
new /mob/living/simple_animal/hostile/retaliate/goat/panda(loc)
if(29)
new /mob/living/simple_animal/hostile/retaliate/goat/black(loc)
if(30)
new /mob/living/simple_animal/hostile/retaliate/goat/green(loc)
if(31)
new /mob/living/simple_animal/hostile/retaliate/goat/orange(loc)
if(32)
new /mob/living/simple_animal/hostile/retaliate/goat/purple(loc)
if(33)
new /mob/living/simple_animal/hostile/retaliate/goat/red(loc)
if(34)
new /mob/living/simple_animal/hostile/retaliate/goat/yellow(loc)
if(35)
new /mob/living/simple_animal/hostile/retaliate/goat/legitgoat(loc)
if(36)
new /mob/living/simple_animal/hostile/retaliate/goat/skiddo(loc)
if(37)
new /mob/living/simple_animal/hostile/retaliate/goat/gogoat(loc)
if(38)
new /mob/living/simple_animal/hostile/retaliate/goat/sanic(loc)
if(39)
new /mob/living/simple_animal/hostile/retaliate/goat/plunger(loc)
11 changes: 2 additions & 9 deletions yogstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,6 +1087,7 @@
#include "code\game\objects\structures\beds_chairs\sofa.dm"
#include "code\game\objects\structures\crates_lockers\closets.dm"
#include "code\game\objects\structures\crates_lockers\crates.dm"
#include "code\game\objects\structures\crates_lockers\closets\bluespace_locker.dm"
#include "code\game\objects\structures\crates_lockers\closets\bodybag.dm"
#include "code\game\objects\structures\crates_lockers\closets\cardboardbox.dm"
#include "code\game\objects\structures\crates_lockers\closets\fitness.dm"
Expand All @@ -1108,6 +1109,7 @@
#include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\security.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\service.dm"
#include "code\game\objects\structures\crates_lockers\crates\bins.dm"
#include "code\game\objects\structures\crates_lockers\crates\critter.dm"
#include "code\game\objects\structures\crates_lockers\crates\large.dm"
Expand Down Expand Up @@ -3055,15 +3057,6 @@
#include "yogstation\code\game\objects\structures\bar_stuff\bar_stuff.dm"
#include "yogstation\code\game\objects\structures\beds_chairs\chair.dm"
#include "yogstation\code\game\objects\structures\beds_chairs\electric_bed.dm"
#include "yogstation\code\game\objects\structures\crates_lockers\closet.dm"
#include "yogstation\code\game\objects\structures\crates_lockers\crates.dm"
#include "yogstation\code\game\objects\structures\crates_lockers\closets\bluespace_locker.dm"
#include "yogstation\code\game\objects\structures\crates_lockers\closets\bodybag.dm"
#include "yogstation\code\game\objects\structures\crates_lockers\closets\job_closets.dm"
#include "yogstation\code\game\objects\structures\crates_lockers\closets\secure\command.dm"
#include "yogstation\code\game\objects\structures\crates_lockers\closets\secure\medical.dm"
#include "yogstation\code\game\objects\structures\crates_lockers\closets\secure\security.dm"
#include "yogstation\code\game\objects\structures\crates_lockers\closets\secure\service.dm"
#include "yogstation\code\game\objects\structures\signs\signs_plaques.dm"
#include "yogstation\code\game\turfs\simulated\ballpit.dm"
#include "yogstation\code\game\turfs\simulated\minerals.dm"
Expand Down
2 changes: 0 additions & 2 deletions yogstation/code/game/objects/structures/crates_lockers/closet.dm
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions yogstation/code/game/objects/structures/crates_lockers/closets/bodybag.dm
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions yogstation/code/game/objects/structures/crates_lockers/closets/job_closets.dm
View file
Open in desktop

This file was deleted.

Loading