Skip to content

Commit

Permalink
Ports Big Iron's Thirst mecanics in Hailmary code (#246)
Browse files Browse the repository at this point in the history
  • Loading branch information
DeltaDav authored Dec 10, 2024
1 parent 75c44c7 commit 472b3f3
Show file tree
Hide file tree
Showing 22 changed files with 359 additions and 42 deletions.
15 changes: 7 additions & 8 deletions _maps/map_files/Baltimore/baltimore_surface.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9037,22 +9037,16 @@
/area/f13/clinic)
"dlm" = (
/obj/structure/closet/crate/large{
pixel_y = 15;
pixel_y = 27;
pixel_x = 16;
layer = 4
},
/obj/structure/closet/crate/large{
pixel_y = -5
},
/obj/structure/closet/crate/large{
pixel_x = 10;
pixel_y = 11;
layer = 2
},
/obj/item/radio{
pixel_x = -3;
pixel_y = 4
},
/obj/machinery/water_purifier,
/turf/open/floor/wood_fancy/wood_fancy_light,
/area/f13/enclave)
"dlJ" = (
Expand Down Expand Up @@ -60193,6 +60187,10 @@
color = "#FFDDCC"
},
/obj/structure/table/wood,
/obj/item/radio{
pixel_x = -3;
pixel_y = 4
},
/turf/open/floor/wood_fancy/wood_fancy_light,
/area/f13/enclave)
"vmN" = (
Expand Down Expand Up @@ -65814,6 +65812,7 @@
name = "red light fixture";
dir = 1
},
/obj/machinery/water_purifier,
/turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull,
/area/f13/outpost)
"xkp" = (
Expand Down
68 changes: 55 additions & 13 deletions _maps/map_files/Baltimore/baltimore_underground.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1851,6 +1851,10 @@
/obj/structure/timeddoor/sixtyminute,
/turf/open/indestructible/ground/inside/subway,
/area/f13/tunnel/sub)
"cOk" = (
/obj/machinery/water_purifier,
/turf/open/floor/plating/rust,
/area/f13/tunnel)
"cOt" = (
/obj/structure/simple_door/metal/dirtystore,
/turf/open/floor/wood_wide,
Expand Down Expand Up @@ -5092,6 +5096,13 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/f13/tcoms)
"hIk" = (
/obj/structure/lattice/catwalk,
/obj/machinery/water_purifier,
/turf/open/indestructible/ground/outside/water/running{
sunlight_state = 0
},
/area/f13/tunnel)
"hIt" = (
/obj/structure/decoration/vent/rusty,
/obj/machinery/shower{
Expand Down Expand Up @@ -6083,8 +6094,7 @@
/turf/open/floor/plating/rust,
/area/f13/citycaves)
"iVi" = (
/obj/structure/rack/large/shelf,
/obj/item/tank/internals/air,
/obj/machinery/water_purifier,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
icon_state = "bluerustysolid"
},
Expand Down Expand Up @@ -10407,6 +10417,10 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/plasteel/f13/vault_floor/misc/vault1,
/area/f13/citycaves)
"oUP" = (
/obj/machinery/water_purifier,
/turf/open/floor/plating/rust,
/area/f13/citycaves)
"oUS" = (
/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{
icon_state = "bluerustyfull"
Expand Down Expand Up @@ -11372,6 +11386,10 @@
sunlight_state = 0
},
/area/f13/tunnel/sub)
"qlm" = (
/obj/machinery/water_purifier,
/turf/open/floor/plating/rust,
/area/f13/ruins)
"qlP" = (
/obj/effect/decal/cleanable/oil/slippery,
/turf/closed/wall/r_wall/rust,
Expand Down Expand Up @@ -11817,6 +11835,10 @@
/obj/structure/barricade/tentclothedge,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/citycaves)
"qQC" = (
/obj/effect/spawner/lootdrop/welder_tools,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/vault)
"qRa" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 8
Expand Down Expand Up @@ -12023,6 +12045,12 @@
},
/turf/closed/wall/r_wall/rust,
/area/f13/citycaves)
"rle" = (
/obj/effect/spawner/lootdrop/high_tools,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
icon_state = "bluerustysolid"
},
/area/f13/vault)
"rlf" = (
/obj/structure/destructible/tribal_torch/wall/lit,
/turf/open/floor/plasteel/cult,
Expand Down Expand Up @@ -12406,6 +12434,10 @@
icon_state = "cultdamage"
},
/area/f13/mountain_bunker)
"rNS" = (
/obj/machinery/water_purifier,
/turf/open/floor/plasteel/f13/vault_floor/misc/bar,
/area/f13/vault)
"rOj" = (
/obj/structure/target_stake,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
Expand Down Expand Up @@ -14748,6 +14780,10 @@
/obj/structure/timeddoor,
/turf/closed/wall/mineral/cult,
/area/f13/mountain_bunker)
"vdi" = (
/obj/effect/spawner/lootdrop/high_tools,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/vault)
"vdj" = (
/obj/structure/flora/tree/jungle{
pixel_y = -15;
Expand Down Expand Up @@ -14855,6 +14891,8 @@
/area/f13/bunker)
"vlR" = (
/obj/item/tank/internals/air,
/obj/structure/rack,
/obj/effect/spawner/lootdrop/tool_box,
/turf/open/floor/plasteel/f13/vault_floor/yellow/whiteyellowfull,
/area/f13/vault)
"vmL" = (
Expand Down Expand Up @@ -15911,6 +15949,10 @@
name = "underground ruins"
},
/area/f13/vault)
"wOW" = (
/obj/machinery/water_purifier,
/turf/open/floor/plasteel/f13/vault_floor/red/whiteredfull,
/area/f13/mountain_bunker)
"wPy" = (
/obj/effect/overlay/water{
layer = 20;
Expand Down Expand Up @@ -21875,7 +21917,7 @@ xrG
xrG
xrG
lro
sSs
qlm
sSs
wld
vRg
Expand Down Expand Up @@ -37674,7 +37716,7 @@ dhe
faw
wCP
iwr
wCP
cOk
wCP
iwr
faw
Expand Down Expand Up @@ -38193,7 +38235,7 @@ gou
faw
iwr
iwr
iwr
cOk
faw
faw
mkJ
Expand Down Expand Up @@ -39731,7 +39773,7 @@ gou
faw
dhe
dhe
faw
hIk
iwr
iwr
laI
Expand Down Expand Up @@ -40310,7 +40352,7 @@ aqg
ncs
ncs
ncs
ncs
vdi
ssh
ncs
ncs
Expand Down Expand Up @@ -40962,7 +41004,7 @@ bSQ
bSQ
bSQ
bSQ
bSQ
glb
vUa
ecC
dsE
Expand Down Expand Up @@ -41077,7 +41119,7 @@ wUA
fgg
drV
opt
opt
rle
gdL
opt
opt
Expand Down Expand Up @@ -41219,7 +41261,7 @@ pdh
tFJ
vQT
tFJ
tFJ
wOW
vUa
dsE
dsE
Expand Down Expand Up @@ -41336,7 +41378,7 @@ drV
opt
opt
lDQ
ncs
qQC
opt
lxq
ssh
Expand Down Expand Up @@ -45213,7 +45255,7 @@ mhd
ssh
xnt
bwZ
bwZ
rNS
ssh
ncs
opt
Expand Down Expand Up @@ -56663,7 +56705,7 @@ aRU
riG
ccs
riG
rJX
oUP
rJX
rJX
tzC
Expand Down
10 changes: 4 additions & 6 deletions _maps/map_files/Baltimore/baltimore_upperlevel.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -20457,6 +20457,8 @@
/area/f13/building)
"tjw" = (
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/structure/rack/shelf_metal,
/turf/open/floor/wood_wide/wood_wide_dark,
/area/f13/building/boat)
"tjy" = (
Expand Down Expand Up @@ -21062,12 +21064,7 @@
/turf/open/floor/wood_common,
/area/f13/wasteland/city)
"tIl" = (
/obj/structure/rack/large/shelf{
dir = 8;
layer = 5;
pixel_y = 5
},
/obj/item/stack/sheet/glass/fifty,
/obj/machinery/water_purifier,
/turf/open/floor/wood_wide/wood_wide_dark{
icon_state = "wide_dark-broken5"
},
Expand Down Expand Up @@ -22113,6 +22110,7 @@
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/water_purifier,
/turf/open/floor/f13{
icon_state = "floorrustysolid"
},
Expand Down
Loading

0 comments on commit 472b3f3

Please sign in to comment.