Skip to content

Commit

Permalink
Syndicate Research Base Mega Fix Pack (#27369)
Browse files Browse the repository at this point in the history
* Even the Syndicate needs light

* Fixes Claw Game and added more lights

* Let's try this again

* UpdatePath hook deployed - Thanks Warriorstar

* I have zero idea how this happened

* Fixed an issue with APC being in the wrong Area

* Reverts Delta mapchange

* Let's try this again

* Had to manually change the mapfile in the end...
  • Loading branch information
SchrodingersWolf authored Jan 21, 2025
1 parent 1edc6a7 commit 52a9163
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 17 deletions.
95 changes: 83 additions & 12 deletions _maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1955,6 +1955,9 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
/obj/structure/cable/green{
icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -2419,6 +2422,9 @@
},
/turf/simulated/floor/engine,
/area/ruin/unpowered/syndicate_space_base/toxtest)
"nV" = (
/turf/simulated/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_space_base/inner)
"nW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
Expand Down Expand Up @@ -2813,11 +2819,18 @@
},
/area/ruin/unpowered/syndicate_space_base/genetics)
"qf" = (
/obj/machinery/economy/arcade/claw,
/turf/simulated/floor/plasteel{
icon_state = "dark"
/obj/structure/cable/green,
/obj/machinery/power/apc/syndicate/directional/east,
/obj/machinery/light/small{
dir = 8
},
/area/ruin/unpowered/syndicate_space_base/arrivals)
/obj/item/toy/plushie/lizardplushie{
name = "Forks-the-Outlet"
},
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
/area/ruin/unpowered/syndicate_space_base/cave)
"qj" = (
/obj/machinery/light,
/obj/machinery/camera{
Expand Down Expand Up @@ -2946,6 +2959,10 @@
icon_state = "yellow"
},
/area/ruin/unpowered/syndicate_space_base/atmos)
"rd" = (
/obj/structure/sign/electricshock,
/turf/simulated/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_space_base/main)
"rg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
Expand Down Expand Up @@ -3198,6 +3215,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/structure/cable/green{
icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -3442,6 +3462,9 @@
codes_txt = "patrol;next_patrol=SBW6";
location = "SBW5"
},
/obj/structure/cable/green{
icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -4042,6 +4065,12 @@
icon_state = "dark"
},
/area/ruin/unpowered/syndicate_space_base/toxlaunch)
"xM" = (
/obj/machinery/economy/arcade/claw/syndi,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/ruin/unpowered/syndicate_space_base/arrivals)
"xO" = (
/obj/machinery/alarm/syndicate/directional/north,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -4102,6 +4131,20 @@
icon_state = "dark"
},
/area/ruin/unpowered/syndicate_space_base/arrivals)
"ye" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/ruin/unpowered/syndicate_space_base/arrivals)
"yf" = (
/obj/effect/turf_decal/caution{
dir = 8
Expand Down Expand Up @@ -5295,6 +5338,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/structure/cable/green{
icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -7163,6 +7209,18 @@
icon_state = "darkpurple"
},
/area/ruin/unpowered/syndicate_space_base/chemistry)
"RM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/light,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/ruin/unpowered/syndicate_space_base/arrivals)
"RN" = (
/obj/machinery/reagentgrinder,
/obj/item/stack/sheet/mineral/plasma{
Expand Down Expand Up @@ -7214,6 +7272,16 @@
},
/turf/simulated/floor/wood,
/area/ruin/unpowered/syndicate_space_base/arrivals)
"RW" = (
/obj/machinery/door/airlock/hatch/syndicate,
/obj/machinery/door/firedoor,
/obj/structure/cable/green{
icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/ruin/unpowered/syndicate_space_base/main)
"RX" = (
/turf/simulated/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_space_base/main)
Expand Down Expand Up @@ -7593,6 +7661,9 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
/obj/structure/cable/green{
icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -9416,12 +9487,12 @@ xn
xn
xn
xn
My
ye
ma
nZ
kk
ZI
My
RM
xn
xn
xn
Expand Down Expand Up @@ -9996,7 +10067,7 @@ xn
xn
xn
xn
qf
xM
xQ
xQ
My
Expand Down Expand Up @@ -10069,7 +10140,7 @@ kE
kE
kE
xn
qf
xM
xQ
vR
nW
Expand Down Expand Up @@ -11995,8 +12066,8 @@ wA
PL
sV
TK
RX
kE
RW
qf
kE
kE
kE
Expand Down Expand Up @@ -12068,8 +12139,8 @@ hO
PL
am
am
RX
kE
rd
nV
kE
kE
kE
Expand Down
10 changes: 5 additions & 5 deletions _maps/map_files/stations/deltastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -67358,10 +67358,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/testrange)
"kol" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/maintenance/port)
"kot" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
Expand Down Expand Up @@ -76483,6 +76479,10 @@
},
/turf/simulated/floor/plating,
/area/station/security/armory/secure)
"pvo" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/maintenance/port)
"pvv" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/reinforced/normal,
Expand Down Expand Up @@ -127280,7 +127280,7 @@ tik
xjh
mQi
rLQ
kol
pvo
drn
dhG
fBk
Expand Down
4 changes: 4 additions & 0 deletions code/modules/arcade/claw_game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,7 @@ GLOBAL_VAR(claw_game_html)
close_game()
if(prize_won == "1")
win()

/obj/machinery/economy/arcade/claw/syndi
desc = "No longer one of the most infuriating ways to win a toy, thanks to the hacking device granting infinite credits."
freeplay = TRUE

0 comments on commit 52a9163

Please sign in to comment.