cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 05:57:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix dynamic lighting in secret clown HQ (#24181)

Browse Source 
* Make clown HQ require power

* Added APC to area

* Superfluous spacing removed.

* There is only one thing worse than a DMM conflict

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
This commit is contained in:
Adrer
2024-03-18 17:56:40 +00:00
committed by GitHub
co-authored by adrermail@gmail.com <adrermail@gmail.com> S34N
parent e4b0ca0c6b
commit 864520f688
3 changed files with 108 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/cerestation/cerestation.dmm
+103 -3
View File
@@ -1962,6 +1962,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/structure/cable/orange{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/service/clown/secret)
"amt" = (
@@ -2842,6 +2847,15 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
"arG" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/orange{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plating,
/area/station/service/clown/secret)
"arO" = (
/obj/effect/decal/remains/human,
/obj/effect/landmark/spawner/xeno,
@@ -7833,6 +7847,11 @@
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable/orange{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -21278,6 +21297,17 @@
icon_state = "redcorner"
},
/area/station/hallway/secondary/entry/west)
"ckp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/orange{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
/area/station/service/clown/secret)
"ckr" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -40005,6 +40035,11 @@
"fOt" = (
/obj/structure/bed,
/obj/item/bedsheet/clown,
/obj/structure/cable/orange{
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc/directional/north,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -40469,6 +40504,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
/obj/structure/cable/orange{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -43677,6 +43717,16 @@
icon_state = "red"
},
/area/station/security/storage)
"hco" = (
/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
/area/station/service/clown/secret)
"hcp" = (
/obj/structure/chair/comfy{
dir = 8
@@ -48550,6 +48600,11 @@
/area/station/science/robotics)
"iHG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -53239,6 +53294,11 @@
name = "Secret Clown HQ"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/station/service/clown/secret)
"kes" = (
@@ -57574,6 +57634,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/station/service/clown/secret)
"lvT" = (
@@ -58397,6 +58462,11 @@
/area/station/hallway/spacebridge/scidock)
"lHG" = (
/mob/living/carbon/human/monkey/teeny,
/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -64102,6 +64172,11 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_often,
/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -75942,6 +76017,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -78393,6 +78473,11 @@
"slQ" = (
/obj/effect/landmark/spawner/nukedisc_respawn,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/station/service/clown/secret)
"slX" = (
@@ -82374,6 +82459,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/service/clown/secret)
"tBp" = (
@@ -87564,6 +87654,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/structure/cable/orange{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/service/clown/secret)
"viJ" = (
@@ -90869,6 +90964,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/structure/cable/orange{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -108543,7 +108643,7 @@ vtY
vtY
bWr
fOt
cHL
arG
mhA
xud
bWr
@@ -109057,7 +109157,7 @@ vtY
vtY
cRq
gmy
mhA
hco
mhA
eAi
bWr
@@ -109571,7 +109671,7 @@ cbc
viE
iHG
kel
iHG
ckp
mDV
cRq
bWr
_maps/map_files/generic/centcomm.dmm
+5 -5
View File
@@ -6832,7 +6832,7 @@
/area/admin)
"xf" = (
/obj/machinery/computer/security{
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
},
/turf/simulated/floor/plasteel,
/area/admin)
@@ -9066,7 +9066,7 @@
"Gs" = (
/obj/machinery/computer/security{
dir = 4;
network = list("SS13","Telecomms","Research Outpost","Mining Outpost")
network = list("SS13","Telecomms","Research Outpost","Mining Outpost")
},
/obj/structure/sign/poster/official/nanotrasen_logo{
pixel_x = -32
@@ -10166,7 +10166,7 @@
"Kd" = (
/obj/machinery/computer/security{
dir = 1;
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
},
/turf/simulated/floor/plasteel/dark,
/area/centcom/control)
@@ -10441,7 +10441,7 @@
"Lb" = (
/obj/machinery/computer/security{
dir = 1;
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
},
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
@@ -14252,7 +14252,7 @@
"Yu" = (
/obj/machinery/computer/security{
dir = 1;
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
},
/turf/simulated/floor/wood,
/area/centcom/control)
code/game/area/ss13_areas/service_areas.dm
-1
View File
@@ -41,7 +41,6 @@
/area/station/service/clown/secret
name = "\improper Top Secret Clown HQ"
requires_power = FALSE
/area/station/service/mime
name = "\improper Mime's Office"