Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backporting non-main map changes from ScavStation. #4811

Merged
merged 9 commits into from
Jan 28, 2025
Merged

Backporting non-main map changes from ScavStation. #4811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3f538f9
Backporting the Bearcat remap from ScavStation.
MistakeNot4892 Jan 25, 2025
3f0dc6b
Backporting the Liberia remap from ScavStation.
MistakeNot4892 Jan 25, 2025
fb5bb63
Backporting the Unishi remap from ScavStation.
MistakeNot4892 Jan 25, 2025
e740aeb
Backporting the crashed pod remap from ScavStation.
MistakeNot4892 Jan 25, 2025
a20f7c3
Backporting remaining ruins tweaks from ScavStation.
MistakeNot4892 Jan 25, 2025
1605e7e
Backporting Exodus map adjustments from ScavStation.
MistakeNot4892 Jan 25, 2025
b8a7b7a
Cleaning up map ports for CI.
MistakeNot4892 Jan 25, 2025
67ea9f5
Removes extra security voidsuits from Bearcat.
MistakeNot4892 Jan 28, 2025
9253528
Nerfs the random hardsuit spawner for non-heist maps.
MistakeNot4892 Jan 28, 2025
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
11 changes: 11 additions & 0 deletions code/game/objects/random/subtypes/suits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@
icon_state = "generic"

/obj/random/hardsuit/spawn_choices()
var/static/list/spawnable_choices = list(
/obj/item/rig/industrial,
/obj/item/rig/eva,
/obj/item/rig/light
)
return spawnable_choices

/obj/random/hardsuit/heist
name = "Random Heist Hardsuit"

/obj/random/hardsuit/heist/spawn_choices()
var/static/list/spawnable_choices = list(
/obj/item/rig/industrial,
/obj/item/rig/eva,
Expand Down
15 changes: 12 additions & 3 deletions maps/away/bearcat/bearcat-1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,7 @@
"bX" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/item/frame/light/small,
/obj/machinery/portable_atmospherics/canister/hydrogen,
/turf/floor/usedup,
/area/ship/scrap/broken2)
"bY" = (
Expand All @@ -908,6 +909,7 @@
/obj/machinery/power/apc/derelict{
dir = 1
},
/obj/structure/closet/crate/uranium,
/turf/floor/usedup,
/area/ship/scrap/broken2)
"bZ" = (
Expand Down Expand Up @@ -1624,6 +1626,8 @@
/obj/item/clothing/glasses/welding,
/obj/item/stack/cable_coil,
/obj/item/stack/cable_coil,
/obj/item/stack/material/sheet/mapped/steel/fifty,
/obj/item/stack/material/sheet/mapped/steel/fifty,
/turf/floor/tiled/usedup,
/area/ship/scrap/broken1)
"dy" = (
Expand Down Expand Up @@ -1977,9 +1981,7 @@
/turf/floor/usedup,
/area/ship/scrap/maintenance/storage)
"ej" = (
/obj/structure/rack,
/obj/item/tank/jetpack/oxygen,
/obj/item/clothing/mask/breath,
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/floor/usedup,
/area/ship/scrap/maintenance/eva)
"ek" = (
Expand All @@ -1991,6 +1993,8 @@
/obj/structure/rack,
/obj/item/tank/jetpack/oxygen,
/obj/item/clothing/mask/breath,
/obj/item/tank/jetpack/oxygen,
/obj/item/clothing/mask/breath,
/turf/floor/usedup,
/area/ship/scrap/maintenance/eva)
"el" = (
Expand Down Expand Up @@ -2393,6 +2397,9 @@
/obj/item/stack/material/pane/mapped/glass/fifty,
/obj/item/stack/material/pane/mapped/rglass/fifty,
/obj/item/stack/material/sheet/reinforced/mapped/fiberglass/fifty,
/obj/item/stack/material/sheet/mapped/steel/fifty,
/obj/item/stack/material/sheet/mapped/steel/fifty,
/obj/item/stack/material/sheet/reinforced/mapped/plasteel/fifty,
/turf/floor/tiled/usedup,
/area/ship/scrap/maintenance/storage)
"eT" = (
Expand All @@ -2417,6 +2424,7 @@
"eW" = (
/obj/machinery/suit_cycler,
/obj/machinery/light/small,
/obj/item/clothing/shoes/magboots,
/turf/floor/tiled/usedup,
/area/ship/scrap/maintenance/eva)
"eX" = (
Expand All @@ -2426,6 +2434,7 @@
pixel_x = 24;
req_access = newlist()
},
/obj/item/clothing/shoes/magboots,
/turf/floor/tiled/usedup,
/area/ship/scrap/maintenance/eva)
"eY" = (
Expand Down
101 changes: 35 additions & 66 deletions maps/away/bearcat/bearcat-2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@
/area/ship/scrap/comms)
"as" = (
/obj/machinery/door/blast/regular{
id_tag = "sensor"
id_tag = "sensor";
dir = 4
},
/turf/floor/usedup,
/area/ship/scrap/comms)
Expand Down Expand Up @@ -490,6 +491,7 @@
/obj/item/chems/drinks/glass2/coffeecup/one,
/obj/item/tank/oxygen,
/obj/item/clothing/mask/breath/emergency,
/obj/item/flashlight,
/turf/floor/laminate,
/area/ship/scrap/command/captain)
"bd" = (
Expand Down Expand Up @@ -1175,6 +1177,7 @@
},
/obj/item/plate/tray,
/obj/item/circular_saw,
/obj/item/flashlight/lamp,
/turf/floor/tiled/usedup,
/area/ship/scrap/crew/saloon)
"cz" = (
Expand Down Expand Up @@ -1202,16 +1205,9 @@
/turf/floor/tiled/usedup,
/area/ship/scrap/crew/cryo)
"cE" = (
/obj/structure/window/reinforced/tinted{
dir = 4;
icon_state = "twindow"
},
/obj/structure/hygiene/shower{
dir = 4
},
/obj/structure/window/reinforced/tinted{
dir = 1
},
/obj/item/soap,
/obj/structure/curtain/open/shower,
/obj/effect/floor_decal/corner/white/diagonal,
Expand All @@ -1223,17 +1219,6 @@
icon_state = "bulb1"
},
/obj/structure/hygiene/toilet,
/obj/structure/window/reinforced/tinted{
dir = 1
},
/obj/structure/window/reinforced/tinted{
dir = 4;
icon_state = "twindow"
},
/obj/structure/window/reinforced/tinted{
dir = 8;
icon_state = "twindow"
},
/obj/effect/decal/cleanable/dirt/visible,
/obj/effect/floor_decal/corner/white/diagonal,
/turf/floor/tiled/usedup,
Expand Down Expand Up @@ -1532,11 +1517,6 @@
/obj/structure/hygiene/shower{
dir = 4
},
/obj/structure/window/reinforced/tinted{
dir = 4;
icon_state = "twindow"
},
/obj/structure/window/reinforced/tinted,
/obj/structure/curtain/open/shower,
/obj/effect/floor_decal/corner/white/diagonal,
/turf/floor/tiled/usedup,
Expand All @@ -1545,15 +1525,6 @@
/obj/structure/hygiene/toilet{
dir = 1
},
/obj/structure/window/reinforced/tinted,
/obj/structure/window/reinforced/tinted{
dir = 4;
icon_state = "twindow"
},
/obj/structure/window/reinforced/tinted{
dir = 8;
icon_state = "twindow"
},
/obj/effect/decal/cleanable/dirt/visible,
/obj/effect/floor_decal/corner/white/diagonal,
/turf/floor/tiled/usedup,
Expand All @@ -1562,15 +1533,6 @@
/obj/structure/hygiene/toilet{
dir = 1
},
/obj/structure/window/reinforced/tinted{
dir = 8;
icon_state = "twindow"
},
/obj/structure/window/reinforced/tinted{
dir = 4;
icon_state = "twindow"
},
/obj/structure/window/reinforced/tinted,
/obj/effect/decal/cleanable/dirt/visible,
/obj/structure/cable,
/obj/machinery/power/apc/derelict{
Expand Down Expand Up @@ -2459,6 +2421,7 @@
/obj/item/stack/tape_roll/duct_tape,
/obj/item/retractor,
/obj/item/scalpel,
/obj/item/tank/oxygen,
/turf/floor/tiled/white,
/area/ship/scrap/crew/medbay)
"eP" = (
Expand Down Expand Up @@ -4701,6 +4664,7 @@
/obj/structure/window/reinforced{
current_health = 1e+007
},
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/floor/reinforced/airless,
/area/ship/scrap/maintenance/atmos)
"je" = (
Expand Down Expand Up @@ -5034,21 +4998,6 @@
/obj/structure/hygiene/sink{
pixel_y = 18
},
/obj/structure/window/reinforced/tinted{
dir = 8;
icon_state = "twindow"
},
/obj/structure/window/reinforced/tinted{
dir = 4;
icon_state = "twindow"
},
/obj/structure/window/reinforced/tinted{
dir = 1
},
/obj/structure/window/reinforced/tinted{
dir = 8;
icon_state = "twindow"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
level = 2
},
Expand Down Expand Up @@ -5121,6 +5070,7 @@
"uM" = (
/obj/item/stack/material/sheet/mapped/steel,
/obj/structure/lattice,
/obj/machinery/portable_atmospherics/canister/nitrogen,
/turf/space,
/area/ship/scrap/maintenance/atmos)
"vs" = (
Expand All @@ -5145,6 +5095,10 @@
/obj/effect/paint/brown,
/turf/wall/r_wall,
/area/space)
"zq" = (
/obj/item/stack/material/rods,
/turf/space,
/area/ship/scrap/maintenance/atmos)
"zT" = (
/obj/effect/floor_decal/corner/blue/diagonal{
dir = 4
Expand Down Expand Up @@ -5197,9 +5151,12 @@
/turf/wall/r_wall,
/area/ship/scrap/crew/kitchen)
"Hd" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/turf/space,
/area/space)
/obj/item/stack/material/sheet/mapped/steel,
/obj/machinery/atmospherics/unary/tank/nitrogen{
dir = 1
},
/turf/floor/plating/airless,
/area/ship/scrap/maintenance/atmos)
"HQ" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/floor/reinforced/airless,
Expand Down Expand Up @@ -5251,6 +5208,12 @@
},
/turf/floor/tiled/usedup,
/area/ship/scrap/maintenance/engineering)
"KW" = (
/obj/item/shard,
/obj/structure/lattice,
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/space,
/area/ship/scrap/maintenance/atmos)
"Lp" = (
/turf/floor/reinforced/airless,
/area/space)
Expand Down Expand Up @@ -5290,6 +5253,12 @@
},
/turf/floor/usedup,
/area/ship/scrap/hidden)
"Nc" = (
/obj/machinery/network/router{
initial_network_id = "bearnet"
},
/turf/floor/bluegrid/airless,
/area/ship/scrap/comms)
"Od" = (
/obj/effect/floor_decal/corner/blue,
/obj/effect/floor_decal/corner/yellow{
Expand Down Expand Up @@ -11296,14 +11265,14 @@ wp
gY
hx
hx
ie
Hd
iQ
hw
zq
iP
Eq
id
KW
Yl
Hd
aa
aa
aa
aa
Expand Down Expand Up @@ -11547,7 +11516,7 @@ IG
Mm
hN
hx
hM
hw
aa
aa
aa
Expand Down Expand Up @@ -11994,7 +11963,7 @@ xU
Yv
Yv
ar
Ix
Nc
aO
aX
Yv
Expand Down
1 change: 1 addition & 0 deletions maps/away/bearcat/bearcat_access.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ var/global/const/access_bearcat_captain = "ACCESS_BEARCAT_CAPTAIN" //999

/obj/machinery/vending/tool/bearcat
req_access = list(access_bearcat)

Loading