Skip to content

Commit

Permalink
adds a hopdrobe (#22778)
Browse files Browse the repository at this point in the history
  • Loading branch information
ktlwjec0 authored Nov 10, 2024
1 parent e3631eb commit 6994f4a
Show file tree
Hide file tree
Showing 10 changed files with 104 additions and 88 deletions.
26 changes: 13 additions & 13 deletions _maps/map_files/DonutStation/DonutStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -25504,6 +25504,18 @@
/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office,
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"kJc" = (
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
},
/obj/machinery/camera{
c_tag = "Bridge - Head of Personnel's Office";
dir = 8
},
/obj/machinery/vending/wardrobe/hop_wardrobe,
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"kJg" = (
/obj/effect/spawner/structure/window/reinforced/shutter,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
Expand Down Expand Up @@ -45172,18 +45184,6 @@
},
/turf/open/floor/plasteel,
/area/storage/primary)
"sTl" = (
/obj/machinery/vending/cart,
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
},
/obj/machinery/camera{
c_tag = "Bridge - Head of Personnel's Office";
dir = 8
},
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"sTU" = (
/obj/structure/grille/broken,
/turf/open/floor/plating,
Expand Down Expand Up @@ -104750,7 +104750,7 @@ siL
ouG
ouG
hbi
sTl
kJc
mqb
mTZ
sIT
Expand Down
22 changes: 11 additions & 11 deletions _maps/map_files/GaxStation/GaxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2131,6 +2131,16 @@
/obj/effect/turf_decal/trimline/green/filled/corner/lower,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bah" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "1-4"
},
/obj/machinery/vending/wardrobe/hop_wardrobe,
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/hop)
"bal" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
Expand Down Expand Up @@ -41827,16 +41837,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"ulW" = (
/obj/machinery/vending/cart,
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "1-4"
},
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/hop)
"umn" = (
/obj/machinery/door/airlock/engineering{
name = "AI Ship Access"
Expand Down Expand Up @@ -95359,7 +95359,7 @@ baa
xdL
cov
gCk
ulW
bah
pdq
omw
viA
Expand Down
16 changes: 8 additions & 8 deletions _maps/map_files/IceMeta/IceMeta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -31487,6 +31487,13 @@
},
/turf/open/floor/plasteel,
/area/security/main)
"jkl" = (
/obj/item/radio/intercom{
pixel_y = 21
},
/obj/machinery/vending/wardrobe/hop_wardrobe,
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"jky" = (
/obj/machinery/button/flasher{
id = "holdingflash";
Expand Down Expand Up @@ -74715,13 +74722,6 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"vue" = (
/obj/machinery/vending/cart,
/obj/item/radio/intercom{
pixel_y = 21
},
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"vuj" = (
/obj/machinery/mecha_part_fabricator,
/obj/item/radio/intercom{
Expand Down Expand Up @@ -240818,7 +240818,7 @@ jfG
byf
hMv
sYq
vue
jkl
bjT
nMh
biJ
Expand Down
42 changes: 26 additions & 16 deletions _maps/map_files/ManateeStation/ManateeStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@
/turf/closed/wall,
/area/quartermaster/qm)
"aaD" = (
/obj/machinery/airalarm/directional/south,
/obj/machinery/airalarm/directional/south{
pixel_y = -24
},
/obj/structure/table,
/obj/item/reagent_containers/glass/bottle/ethanol{
pixel_x = -5;
Expand Down Expand Up @@ -28788,7 +28790,9 @@
/area/bridge/meeting_room)
"ihh" = (
/obj/structure/table/glass,
/obj/machinery/airalarm/directional/south,
/obj/machinery/airalarm/directional/south{
pixel_y = -24
},
/obj/item/storage/firstaid/fire{
pixel_x = 3;
pixel_y = 3
Expand Down Expand Up @@ -37495,6 +37499,16 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
"kQV" = (
/obj/machinery/light{
dir = 4
},
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
dir = 4
},
/obj/machinery/vending/wardrobe/hop_wardrobe,
/turf/open/floor/plasteel,
/area/crew_quarters/heads/hop)
"kQW" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -44801,7 +44815,9 @@
/turf/open/floor/plating/asteroid,
/area/space/nearstation)
"ndK" = (
/obj/machinery/airalarm/directional/west,
/obj/machinery/airalarm/directional/west{
pixel_x = -24
},
/obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
dir = 8
},
Expand Down Expand Up @@ -52476,7 +52492,9 @@
/obj/effect/turf_decal/trimline/blue/filled/line/lower{
dir = 8
},
/obj/machinery/airalarm/directional/west,
/obj/machinery/airalarm/directional/west{
pixel_x = -24
},
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"puV" = (
Expand Down Expand Up @@ -61643,16 +61661,6 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos/distro)
"sgg" = (
/obj/machinery/light{
dir = 4
},
/obj/machinery/vending/cart,
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/heads/hop)
"sgi" = (
/obj/machinery/icecream_vat,
/obj/machinery/light/small{
Expand Down Expand Up @@ -62175,7 +62183,9 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/aft)
"sps" = (
/obj/machinery/airalarm/directional/west,
/obj/machinery/airalarm/directional/west{
pixel_x = -24
},
/obj/effect/turf_decal/trimline/blue/filled/line/lower{
dir = 8
},
Expand Down Expand Up @@ -102759,7 +102769,7 @@ ecY
iWW
vlg
ink
sgg
kQV
tNJ
epA
uEH
Expand Down
16 changes: 8 additions & 8 deletions _maps/map_files/MiniStation/MiniStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6146,13 +6146,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"aLX" = (
/obj/effect/turf_decal/siding/wood/corner/thin{
dir = 4
},
/obj/machinery/vending/cart,
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"aLY" = (
/obj/machinery/atmospherics/pipe/simple/green/visible,
/obj/machinery/light{
Expand Down Expand Up @@ -40125,6 +40118,13 @@
/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/plating,
/area/engine/engineering)
"ugX" = (
/obj/effect/turf_decal/siding/wood/corner/thin{
dir = 4
},
/obj/machinery/vending/wardrobe/hop_wardrobe,
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"uhn" = (
/obj/structure/table,
/obj/item/toy/cards/deck{
Expand Down Expand Up @@ -128871,7 +128871,7 @@ uku
aGB
aSo
aIo
aLX
ugX
asD
vXN
bkw
Expand Down
22 changes: 11 additions & 11 deletions _maps/map_files/YogStation/YogStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -31284,6 +31284,16 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"iin" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
dir = 8
},
/obj/machinery/vending/wardrobe/hop_wardrobe,
/turf/open/floor/plasteel,
/area/crew_quarters/heads/hop)
"iix" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
Expand Down Expand Up @@ -33676,16 +33686,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
"iXa" = (
/obj/machinery/vending/cart,
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/heads/hop)
"iXg" = (
/obj/effect/turf_decal/trimline/secred/filled/line/lower{
dir = 1
Expand Down Expand Up @@ -101983,7 +101983,7 @@ dEb
dPP
bYm
ptS
iXa
iin
qhG
evI
vTR
Expand Down
19 changes: 0 additions & 19 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -694,25 +694,6 @@
STR.max_combined_w_class = 60
STR.set_holdable(list(/obj/item/clothing))

/obj/item/storage/backpack/duffelbag/clothing/hop
name = "Head of Personnels clothing duffelbag"
desc = "A large duffel bag filled with clothing."

/obj/item/storage/backpack/duffelbag/clothing/hop/PopulateContents()
new /obj/item/clothing/under/rank/command/head_of_personnel(src)
new /obj/item/clothing/under/rank/command/head_of_personnel/skirt(src)
new /obj/item/clothing/under/rank/command/head_of_personnel/turtleneck(src)
new /obj/item/clothing/under/rank/command/head_of_personnel/skirt/turtleneck(src)
new /obj/item/clothing/head/hopcap(src)
new /obj/item/clothing/head/beret/hop(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/clothing/shoes/xeno_wraps/command(src)
new /obj/item/clothing/suit/armor/vest/rurmcoat(src)
new /obj/item/clothing/suit/armor/vest/sovietcoat(src)
new /obj/item/clothing/suit/armor/vest/hop_formal(src)
new /obj/item/clothing/under/yogs/hopcasual(src)
new /obj/item/clothing/suit/hooded/wintercoat/hop(src)

/obj/item/storage/backpack/duffelbag/clothing/rd
name = "Research Directors clothing duffelbag"
desc = "A large duffel bag filled with clothing."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
new /obj/item/storage/photo_album/HoP(src)
new /obj/item/clipboard/yog/paperwork/hop(src)
new /obj/item/gun/energy/e_gun/mini(src) //hop doesn't get a proper gun
new /obj/item/storage/backpack/duffelbag/clothing/hop(src)
new /obj/item/storage/box/PDAs(src)

/obj/structure/closet/secure_closet/hos
name = "\proper head of security's locker"
Expand Down
27 changes: 26 additions & 1 deletion code/modules/vending/wardrobes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
/obj/item/clothing/under/rank/cargo/tech = 3,
/obj/item/clothing/under/rank/cargo/tech/skirt = 3,
/obj/item/clothing/under/rank/cargo/tech/turtleneck = 3,
/obj/item/clothing/under/rank/cargo/tech/skirt/turtleneck = 3,
/obj/item/clothing/under/rank/cargo/tech/skirt/turtleneck = 3,
/obj/item/clothing/shoes/sneakers/black = 3,
/obj/item/clothing/shoes/xeno_wraps/cargo = 3,
/obj/item/clothing/shoes/xeno_wraps/cargo/cleated = 1,
Expand Down Expand Up @@ -525,3 +525,28 @@
payment_department = ACCOUNT_MED
/obj/item/vending_refill/wardrobe/viro_wardrobe
machine_name = "ViroDrobe"

/obj/machinery/vending/wardrobe/hop_wardrobe
name = "HopDrobe"
desc = "A machine that will dispense clothing meant for the head of personnel."
icon_state = "hopdrobe"
product_ads = "Get your Ian approved clothing here!"
vend_reply = "Thank you for using the HopDrobe!"
products = list(/obj/item/clothing/under/rank/command/head_of_personnel = 2,
/obj/item/clothing/under/rank/command/head_of_personnel/skirt = 2,
/obj/item/clothing/under/rank/command/head_of_personnel/turtleneck = 2,
/obj/item/clothing/under/rank/command/head_of_personnel/skirt/turtleneck = 2,
/obj/item/clothing/head/hopcap = 2,
/obj/item/clothing/head/beret/hop = 2,
/obj/item/clothing/shoes/sneakers/brown = 2,
/obj/item/clothing/shoes/xeno_wraps/command = 2,
/obj/item/clothing/suit/armor/vest/rurmcoat = 1,
/obj/item/clothing/suit/armor/vest/sovietcoat = 1,
/obj/item/clothing/suit/armor/vest/hop_formal = 1,
/obj/item/clothing/under/yogs/hopcasual = 2,
/obj/item/clothing/suit/hooded/wintercoat/hop = 2)
refill_canister = /obj/item/vending_refill/wardrobe/hop_wardrobe
payment_department = ACCOUNT_SRV

/obj/item/vending_refill/wardrobe/hop_wardrobe
machine_name = "HopDrobe"
Binary file modified icons/obj/vending.dmi
Binary file not shown.

0 comments on commit 6994f4a

Please sign in to comment.