Skip to content

Commit

Permalink
clothing tweaks for mapping
Browse files Browse the repository at this point in the history
  • Loading branch information
MrCastmer committed Aug 8, 2024
1 parent 105e201 commit 0bbef59
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
req_access = list(ACCESS_PSYCH)
icon_state = "cabinet"

/* dripstation edit
/obj/structure/closet/secure_closet/psych/PopulateContents()
..()
new /obj/item/clothing/suit/straight_jacket(src)
Expand All @@ -210,3 +211,4 @@
new /obj/item/storage/pill_bottle/psicodine(src)
new /obj/item/assembly/flash(src)
new /obj/item/assembly/flash(src)
*/
7 changes: 7 additions & 0 deletions modular_dripstation/code/game/machinery/suit_storage_unit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@
magboots_type = /obj/item/clothing/shoes/magboots/security
department = "sec"

/obj/machinery/suit_storage_unit/warden
suit_type = /obj/item/clothing/suit/space/hardsuit/security/warden
mask_type = /obj/item/clothing/mask/gas/sechailer
tank_type = /obj/item/tank/internals/oxygen/red
magboots_type = /obj/item/clothing/shoes/magboots/security
department = "sec"

/obj/machinery/suit_storage_unit/hos
suit_type = /obj/item/clothing/suit/space/hardsuit/security/hos
mask_type = /obj/item/clothing/mask/gas/sechailer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,21 @@ GLOBAL_LIST_INIT(closet_cutting_types, typecacheof(list(
locked_state = "cabinet_locked"
unlocked_state = "cabinet_unlocked"

/obj/structure/closet/secure_closet/psych/PopulateContents()
..()
new /obj/item/clothing/under/rank/psych(src)
new /obj/item/clothing/under/rank/psych/skirt(src)
new /obj/item/clothing/under/rank/psych/turtleneck(src)
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/clothing/mask/muzzle(src)
new /obj/item/storage/pill_bottle/happiness(src)
new /obj/item/storage/pill_bottle/dice(src)
new /obj/item/storage/pill_bottle/happy(src)
new /obj/item/storage/pill_bottle/lsd(src)
new /obj/item/storage/pill_bottle/psicodine(src)
new /obj/item/assembly/flash(src)
new /obj/item/assembly/flash(src)

/obj/structure/closet/secure_closet/personal/cabinet
locked_state = "cabinet_locked"
unlocked_state = "cabinet_unlocked"
Expand Down Expand Up @@ -560,6 +575,24 @@ GLOBAL_LIST_INIT(closet_cutting_types, typecacheof(list(
new /obj/item/storage/lockbox/medal/eng(src)
new /obj/item/barrier_taperoll/engineering(src)

/obj/structure/closet/secure_closet/cargotech
name = "\improper cargotech's locker"
desc = "Crates. Pull them. Lockers. Push them."
icon = 'modular_dripstation/icons/obj/closet.dmi'
req_access = list(ACCESS_CARGO)
icon_state = "cargo"

/obj/structure/closet/secure_closet/cargo/PopulateContents()
..()
new /obj/item/clothing/under/rank/cargo/tech(src)
new /obj/item/clothing/under/rank/cargo/tech/skirt(src)
new /obj/item/clothing/shoes/workboots/cargo(src)
new /obj/item/storage/backpack/cargo(src)
new /obj/item/radio/headset/headset_cargo(src)
new /obj/item/export_scanner(src)
new /obj/item/stamp(src)
new /obj/item/stamp/denied(src)

/obj/structure/closet/l3closet/PopulateContents()
new /obj/item/storage/bag/bio(src)
new /obj/item/clothing/suit/bio_suit/general(src)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@
fitted = FEMALE_UNIFORM_TOP
mutantrace_variation = NONE

/obj/item/clothing/under/rank/medical/paramedic/emt/skirt/white
name = "em technician jumpskirt (White)"
icon_state = "emt_skirt_white"

/obj/item/clothing/under/rank/medical/paramedic/recovery
name = "emergency medical technician's recovery undersuit"
desc = "A verstile blue and white uniform honored to hard working recovery medics in hazardous environments. It has minor protection against biohazards."
Expand Down
2 changes: 1 addition & 1 deletion modular_dripstation/code/modules/clothing/toggles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
name = "paramedic jacket"
icon_state = "paramedic_jacket"

/obj/item/clothing/suit/toggle/emt_vest/jacket/paramedic
/obj/item/clothing/suit/toggle/emt_vest/jacket/highvis
name = "em tech jacket"
desc = "A high vision jacket used in the recovery of bodies."
icon_state = "highvis"
Expand Down

0 comments on commit 0bbef59

Please sign in to comment.