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

Commit 6994f4a

Browse files
authored
adds a hopdrobe (#22778)
1 parent e3631eb commit 6994f4a

File tree

10 files changed

+104
-88
lines changed

10 files changed

+104
-88
lines changed

_maps/map_files/DonutStation/DonutStation.dmm

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25504,6 +25504,18 @@
2550425504
/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office,
2550525505
/turf/open/floor/plasteel/grimy,
2550625506
/area/chapel/office)
25507+
"kJc" = (
25508+
/obj/machinery/airalarm{
25509+
dir = 8;
25510+
pixel_x = 24
25511+
},
25512+
/obj/machinery/camera{
25513+
c_tag = "Bridge - Head of Personnel's Office";
25514+
dir = 8
25515+
},
25516+
/obj/machinery/vending/wardrobe/hop_wardrobe,
25517+
/turf/open/floor/wood,
25518+
/area/crew_quarters/heads/hop)
2550725519
"kJg" = (
2550825520
/obj/effect/spawner/structure/window/reinforced/shutter,
2550925521
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -45172,18 +45184,6 @@
4517245184
},
4517345185
/turf/open/floor/plasteel,
4517445186
/area/storage/primary)
45175-
"sTl" = (
45176-
/obj/machinery/vending/cart,
45177-
/obj/machinery/airalarm{
45178-
dir = 8;
45179-
pixel_x = 24
45180-
},
45181-
/obj/machinery/camera{
45182-
c_tag = "Bridge - Head of Personnel's Office";
45183-
dir = 8
45184-
},
45185-
/turf/open/floor/wood,
45186-
/area/crew_quarters/heads/hop)
4518745187
"sTU" = (
4518845188
/obj/structure/grille/broken,
4518945189
/turf/open/floor/plating,
@@ -104750,7 +104750,7 @@ siL
104750104750
ouG
104751104751
ouG
104752104752
hbi
104753-
sTl
104753+
kJc
104754104754
mqb
104755104755
mTZ
104756104756
sIT

_maps/map_files/GaxStation/GaxStation.dmm

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2131,6 +2131,16 @@
21312131
/obj/effect/turf_decal/trimline/green/filled/corner/lower,
21322132
/turf/open/floor/plasteel,
21332133
/area/hallway/primary/central)
2134+
"bah" = (
2135+
/obj/structure/cable{
2136+
icon_state = "4-8"
2137+
},
2138+
/obj/structure/cable{
2139+
icon_state = "1-4"
2140+
},
2141+
/obj/machinery/vending/wardrobe/hop_wardrobe,
2142+
/turf/open/floor/carpet/blue,
2143+
/area/crew_quarters/heads/hop)
21342144
"bal" = (
21352145
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
21362146
dir = 4
@@ -41827,16 +41837,6 @@
4182741837
/obj/structure/disposalpipe/segment,
4182841838
/turf/open/floor/plasteel/dark,
4182941839
/area/science/xenobiology)
41830-
"ulW" = (
41831-
/obj/machinery/vending/cart,
41832-
/obj/structure/cable{
41833-
icon_state = "4-8"
41834-
},
41835-
/obj/structure/cable{
41836-
icon_state = "1-4"
41837-
},
41838-
/turf/open/floor/carpet/blue,
41839-
/area/crew_quarters/heads/hop)
4184041840
"umn" = (
4184141841
/obj/machinery/door/airlock/engineering{
4184241842
name = "AI Ship Access"
@@ -95359,7 +95359,7 @@ baa
9535995359
xdL
9536095360
cov
9536195361
gCk
95362-
ulW
95362+
bah
9536395363
pdq
9536495364
omw
9536595365
viA

_maps/map_files/IceMeta/IceMeta.dmm

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31487,6 +31487,13 @@
3148731487
},
3148831488
/turf/open/floor/plasteel,
3148931489
/area/security/main)
31490+
"jkl" = (
31491+
/obj/item/radio/intercom{
31492+
pixel_y = 21
31493+
},
31494+
/obj/machinery/vending/wardrobe/hop_wardrobe,
31495+
/turf/open/floor/wood,
31496+
/area/crew_quarters/heads/hop)
3149031497
"jky" = (
3149131498
/obj/machinery/button/flasher{
3149231499
id = "holdingflash";
@@ -74715,13 +74722,6 @@
7471574722
},
7471674723
/turf/open/floor/plasteel,
7471774724
/area/quartermaster/storage)
74718-
"vue" = (
74719-
/obj/machinery/vending/cart,
74720-
/obj/item/radio/intercom{
74721-
pixel_y = 21
74722-
},
74723-
/turf/open/floor/wood,
74724-
/area/crew_quarters/heads/hop)
7472574725
"vuj" = (
7472674726
/obj/machinery/mecha_part_fabricator,
7472774727
/obj/item/radio/intercom{
@@ -240818,7 +240818,7 @@ jfG
240818240818
byf
240819240819
hMv
240820240820
sYq
240821-
vue
240821+
jkl
240822240822
bjT
240823240823
nMh
240824240824
biJ

_maps/map_files/ManateeStation/ManateeStation.dmm

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@
6868
/turf/closed/wall,
6969
/area/quartermaster/qm)
7070
"aaD" = (
71-
/obj/machinery/airalarm/directional/south,
71+
/obj/machinery/airalarm/directional/south{
72+
pixel_y = -24
73+
},
7274
/obj/structure/table,
7375
/obj/item/reagent_containers/glass/bottle/ethanol{
7476
pixel_x = -5;
@@ -28788,7 +28790,9 @@
2878828790
/area/bridge/meeting_room)
2878928791
"ihh" = (
2879028792
/obj/structure/table/glass,
28791-
/obj/machinery/airalarm/directional/south,
28793+
/obj/machinery/airalarm/directional/south{
28794+
pixel_y = -24
28795+
},
2879228796
/obj/item/storage/firstaid/fire{
2879328797
pixel_x = 3;
2879428798
pixel_y = 3
@@ -37495,6 +37499,16 @@
3749537499
},
3749637500
/turf/open/floor/plating,
3749737501
/area/maintenance/port/fore)
37502+
"kQV" = (
37503+
/obj/machinery/light{
37504+
dir = 4
37505+
},
37506+
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
37507+
dir = 4
37508+
},
37509+
/obj/machinery/vending/wardrobe/hop_wardrobe,
37510+
/turf/open/floor/plasteel,
37511+
/area/crew_quarters/heads/hop)
3749837512
"kQW" = (
3749937513
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
3750037514
/obj/structure/disposalpipe/segment{
@@ -44801,7 +44815,9 @@
4480144815
/turf/open/floor/plating/asteroid,
4480244816
/area/space/nearstation)
4480344817
"ndK" = (
44804-
/obj/machinery/airalarm/directional/west,
44818+
/obj/machinery/airalarm/directional/west{
44819+
pixel_x = -24
44820+
},
4480544821
/obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
4480644822
dir = 8
4480744823
},
@@ -52476,7 +52492,9 @@
5247652492
/obj/effect/turf_decal/trimline/blue/filled/line/lower{
5247752493
dir = 8
5247852494
},
52479-
/obj/machinery/airalarm/directional/west,
52495+
/obj/machinery/airalarm/directional/west{
52496+
pixel_x = -24
52497+
},
5248052498
/turf/open/floor/plasteel/white,
5248152499
/area/medical/sleeper)
5248252500
"puV" = (
@@ -61643,16 +61661,6 @@
6164361661
},
6164461662
/turf/open/floor/plasteel,
6164561663
/area/engine/atmos/distro)
61646-
"sgg" = (
61647-
/obj/machinery/light{
61648-
dir = 4
61649-
},
61650-
/obj/machinery/vending/cart,
61651-
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
61652-
dir = 4
61653-
},
61654-
/turf/open/floor/plasteel,
61655-
/area/crew_quarters/heads/hop)
6165661664
"sgi" = (
6165761665
/obj/machinery/icecream_vat,
6165861666
/obj/machinery/light/small{
@@ -62175,7 +62183,9 @@
6217562183
/turf/open/floor/plasteel/white,
6217662184
/area/medical/medbay/aft)
6217762185
"sps" = (
62178-
/obj/machinery/airalarm/directional/west,
62186+
/obj/machinery/airalarm/directional/west{
62187+
pixel_x = -24
62188+
},
6217962189
/obj/effect/turf_decal/trimline/blue/filled/line/lower{
6218062190
dir = 8
6218162191
},
@@ -102759,7 +102769,7 @@ ecY
102759102769
iWW
102760102770
vlg
102761102771
ink
102762-
sgg
102772+
kQV
102763102773
tNJ
102764102774
epA
102765102775
uEH

_maps/map_files/MiniStation/MiniStation.dmm

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6146,13 +6146,6 @@
61466146
},
61476147
/turf/open/floor/plasteel,
61486148
/area/hallway/secondary/exit)
6149-
"aLX" = (
6150-
/obj/effect/turf_decal/siding/wood/corner/thin{
6151-
dir = 4
6152-
},
6153-
/obj/machinery/vending/cart,
6154-
/turf/open/floor/wood,
6155-
/area/crew_quarters/heads/hop)
61566149
"aLY" = (
61576150
/obj/machinery/atmospherics/pipe/simple/green/visible,
61586151
/obj/machinery/light{
@@ -40125,6 +40118,13 @@
4012540118
/obj/machinery/portable_atmospherics/canister/plasma,
4012640119
/turf/open/floor/plating,
4012740120
/area/engine/engineering)
40121+
"ugX" = (
40122+
/obj/effect/turf_decal/siding/wood/corner/thin{
40123+
dir = 4
40124+
},
40125+
/obj/machinery/vending/wardrobe/hop_wardrobe,
40126+
/turf/open/floor/wood,
40127+
/area/crew_quarters/heads/hop)
4012840128
"uhn" = (
4012940129
/obj/structure/table,
4013040130
/obj/item/toy/cards/deck{
@@ -128871,7 +128871,7 @@ uku
128871128871
aGB
128872128872
aSo
128873128873
aIo
128874-
aLX
128874+
ugX
128875128875
asD
128876128876
vXN
128877128877
bkw

_maps/map_files/YogStation/YogStation.dmm

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31284,6 +31284,16 @@
3128431284
},
3128531285
/turf/open/floor/plating,
3128631286
/area/maintenance/fore/secondary)
31287+
"iin" = (
31288+
/obj/structure/cable{
31289+
icon_state = "4-8"
31290+
},
31291+
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
31292+
dir = 8
31293+
},
31294+
/obj/machinery/vending/wardrobe/hop_wardrobe,
31295+
/turf/open/floor/plasteel,
31296+
/area/crew_quarters/heads/hop)
3128731297
"iix" = (
3128831298
/obj/structure/disposalpipe/segment,
3128931299
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -33676,16 +33686,6 @@
3367633686
},
3367733687
/turf/open/floor/plating,
3367833688
/area/maintenance/port/aft)
33679-
"iXa" = (
33680-
/obj/machinery/vending/cart,
33681-
/obj/structure/cable{
33682-
icon_state = "4-8"
33683-
},
33684-
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
33685-
dir = 8
33686-
},
33687-
/turf/open/floor/plasteel,
33688-
/area/crew_quarters/heads/hop)
3368933689
"iXg" = (
3369033690
/obj/effect/turf_decal/trimline/secred/filled/line/lower{
3369133691
dir = 1
@@ -101983,7 +101983,7 @@ dEb
101983101983
dPP
101984101984
bYm
101985101985
ptS
101986-
iXa
101986+
iin
101987101987
qhG
101988101988
evI
101989101989
vTR

code/game/objects/items/storage/backpack.dm

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -694,25 +694,6 @@
694694
STR.max_combined_w_class = 60
695695
STR.set_holdable(list(/obj/item/clothing))
696696

697-
/obj/item/storage/backpack/duffelbag/clothing/hop
698-
name = "Head of Personnels clothing duffelbag"
699-
desc = "A large duffel bag filled with clothing."
700-
701-
/obj/item/storage/backpack/duffelbag/clothing/hop/PopulateContents()
702-
new /obj/item/clothing/under/rank/command/head_of_personnel(src)
703-
new /obj/item/clothing/under/rank/command/head_of_personnel/skirt(src)
704-
new /obj/item/clothing/under/rank/command/head_of_personnel/turtleneck(src)
705-
new /obj/item/clothing/under/rank/command/head_of_personnel/skirt/turtleneck(src)
706-
new /obj/item/clothing/head/hopcap(src)
707-
new /obj/item/clothing/head/beret/hop(src)
708-
new /obj/item/clothing/shoes/sneakers/brown(src)
709-
new /obj/item/clothing/shoes/xeno_wraps/command(src)
710-
new /obj/item/clothing/suit/armor/vest/rurmcoat(src)
711-
new /obj/item/clothing/suit/armor/vest/sovietcoat(src)
712-
new /obj/item/clothing/suit/armor/vest/hop_formal(src)
713-
new /obj/item/clothing/under/yogs/hopcasual(src)
714-
new /obj/item/clothing/suit/hooded/wintercoat/hop(src)
715-
716697
/obj/item/storage/backpack/duffelbag/clothing/rd
717698
name = "Research Directors clothing duffelbag"
718699
desc = "A large duffel bag filled with clothing."

code/game/objects/structures/crates_lockers/closets/secure/security.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
new /obj/item/storage/photo_album/HoP(src)
4343
new /obj/item/clipboard/yog/paperwork/hop(src)
4444
new /obj/item/gun/energy/e_gun/mini(src) //hop doesn't get a proper gun
45-
new /obj/item/storage/backpack/duffelbag/clothing/hop(src)
45+
new /obj/item/storage/box/PDAs(src)
4646

4747
/obj/structure/closet/secure_closet/hos
4848
name = "\proper head of security's locker"

code/modules/vending/wardrobes.dm

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
/obj/item/clothing/under/rank/cargo/tech = 3,
190190
/obj/item/clothing/under/rank/cargo/tech/skirt = 3,
191191
/obj/item/clothing/under/rank/cargo/tech/turtleneck = 3,
192-
/obj/item/clothing/under/rank/cargo/tech/skirt/turtleneck = 3,
192+
/obj/item/clothing/under/rank/cargo/tech/skirt/turtleneck = 3,
193193
/obj/item/clothing/shoes/sneakers/black = 3,
194194
/obj/item/clothing/shoes/xeno_wraps/cargo = 3,
195195
/obj/item/clothing/shoes/xeno_wraps/cargo/cleated = 1,
@@ -525,3 +525,28 @@
525525
payment_department = ACCOUNT_MED
526526
/obj/item/vending_refill/wardrobe/viro_wardrobe
527527
machine_name = "ViroDrobe"
528+
529+
/obj/machinery/vending/wardrobe/hop_wardrobe
530+
name = "HopDrobe"
531+
desc = "A machine that will dispense clothing meant for the head of personnel."
532+
icon_state = "hopdrobe"
533+
product_ads = "Get your Ian approved clothing here!"
534+
vend_reply = "Thank you for using the HopDrobe!"
535+
products = list(/obj/item/clothing/under/rank/command/head_of_personnel = 2,
536+
/obj/item/clothing/under/rank/command/head_of_personnel/skirt = 2,
537+
/obj/item/clothing/under/rank/command/head_of_personnel/turtleneck = 2,
538+
/obj/item/clothing/under/rank/command/head_of_personnel/skirt/turtleneck = 2,
539+
/obj/item/clothing/head/hopcap = 2,
540+
/obj/item/clothing/head/beret/hop = 2,
541+
/obj/item/clothing/shoes/sneakers/brown = 2,
542+
/obj/item/clothing/shoes/xeno_wraps/command = 2,
543+
/obj/item/clothing/suit/armor/vest/rurmcoat = 1,
544+
/obj/item/clothing/suit/armor/vest/sovietcoat = 1,
545+
/obj/item/clothing/suit/armor/vest/hop_formal = 1,
546+
/obj/item/clothing/under/yogs/hopcasual = 2,
547+
/obj/item/clothing/suit/hooded/wintercoat/hop = 2)
548+
refill_canister = /obj/item/vending_refill/wardrobe/hop_wardrobe
549+
payment_department = ACCOUNT_SRV
550+
551+
/obj/item/vending_refill/wardrobe/hop_wardrobe
552+
machine_name = "HopDrobe"

icons/obj/vending.dmi

2.05 KB
Binary file not shown.

0 commit comments

Comments
 (0)