cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Southern Sun Map fixes! 1.4 (#9046)

Browse Source
This commit is contained in:
Kassc
2024-09-26 22:30:18 -04:00
committed by GitHub
parent ff072f024f
commit bdcbfc3b5f
3 changed files with 673 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
maps/southern_sun/southern_cross-1.dmm
View File

@@ -1074,15 +1074,6 @@
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/SouthernCrossV2/Commons/Central_1_Deck_Hall) /area/SouthernCrossV2/Commons/Central_1_Deck_Hall)
"afY" = ( "afY" = (
/obj/effect/catwalk_plated/techmaint,
/obj/machinery/porta_turret/crescent{
check_down = 0;
check_access = 0;
req_one_access = list(19);
desc = "A light weight energy turret design to be non-lethal, a deterrence against rowdy crew and deadly targets";
name = "Disabler turret";
faction = "nanotrasen"
},
/obj/structure/cable/green{ /obj/structure/cable/green{
d1 = 4; d1 = 4;
d2 = 8; d2 = 8;
@@ -1097,8 +1088,8 @@
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
dir = 4 dir = 4
}, },
/turf/simulated/floor/plating, /turf/simulated/floor/tiled,
/area/SouthernCrossV2/Security/Transit_Turrets) /area/SouthernCrossV2/Commons/Central_1_Deck_Hall)
"aga" = ( "aga" = (
/obj/machinery/door/firedoor/glass, /obj/machinery/door/firedoor/glass,
/obj/effect/floor_decal/industrial/hatch/blue, /obj/effect/floor_decal/industrial/hatch/blue,
@@ -1205,12 +1196,12 @@
"agy" = ( "agy" = (
/obj/machinery/turretid/lethal{ /obj/machinery/turretid/lethal{
ailock = 1; ailock = 1;
check_synth = 1;
control_area = "\improper GravGen Room"; control_area = "\improper GravGen Room";
desc = "A firewall prevents AIs from interacting with this device."; desc = "A firewall prevents AIs from interacting with this device.";
name = "GravityGen lethal turret control"; name = "GravityGen lethal turret control";
pixel_y = 29; pixel_y = 29;
req_access = null; req_access = list(17,11,24);
check_records = 0;
req_one_access = list(17,11,24) req_one_access = list(17,11,24)
}, },
/obj/structure/cable/green{ /obj/structure/cable/green{
@@ -6124,17 +6115,16 @@
/turf/simulated/floor/tiled/white, /turf/simulated/floor/tiled/white,
/area/SouthernCrossV2/Science/Xenobiology_Lab) /area/SouthernCrossV2/Science/Xenobiology_Lab)
"aMv" = ( "aMv" = (
/obj/effect/catwalk_plated/techmaint, /obj/structure/cable/green{
/obj/machinery/porta_turret/crescent{ d1 = 1;
check_down = 0; d2 = 2;
check_access = 0; icon_state = "1-2"
req_one_access = list(19);
desc = "A light weight energy turret design to be non-lethal, a deterrence against rowdy crew and deadly targets";
name = "Disabler turret";
faction = "nanotrasen"
}, },
/turf/simulated/floor/plating, /obj/machinery/atmospherics/pipe/simple/hidden/supply,
/area/SouthernCrossV2/Security/Transit_Turrets) /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/tiled,
/area/SouthernCrossV2/Harbor/Dock2)
"aMD" = ( "aMD" = (
/obj/item/device/radio/intercom{ /obj/item/device/radio/intercom{
dir = 8; dir = 8;
@@ -11498,10 +11488,6 @@
pixel_y = 9; pixel_y = 9;
pixel_x = -7 pixel_x = -7
}, },
/obj/item/device/t_scanner/advanced{
pixel_y = 4;
pixel_x = 1
},
/obj/item/clothing/mask/gas{ /obj/item/clothing/mask/gas{
pixel_y = -5; pixel_y = -5;
pixel_x = 6 pixel_x = 6
@@ -11531,6 +11517,10 @@
/obj/effect/floor_decal/corner/orange/border{ /obj/effect/floor_decal/corner/orange/border{
dir = 4 dir = 4
}, },
/obj/item/device/t_scanner{
pixel_y = 5;
pixel_x = 2
},
/turf/simulated/floor/tiled/dark, /turf/simulated/floor/tiled/dark,
/area/SouthernCrossV2/Harbor/Fueling_Storage) /area/SouthernCrossV2/Harbor/Fueling_Storage)
"clF" = ( "clF" = (
@@ -29204,17 +29194,10 @@
/turf/simulated/floor/airless, /turf/simulated/floor/airless,
/area/shuttle/escape_pod8/station) /area/shuttle/escape_pod8/station)
"icV" = ( "icV" = (
/obj/machinery/porta_turret/crescent{ /obj/random/trash,
check_down = 0; /obj/random/junk,
check_access = 0;
req_one_access = list(19);
desc = "A light weight energy turret design to be non-lethal, a deterrence against rowdy crew and deadly targets";
name = "Disabler turret";
faction = "nanotrasen"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/SouthernCrossV2/Security/Transit_Turrets) /area/SouthernCrossV2/Maints/Deck1_AftStar1_Corridor1)
"idc" = ( "idc" = (
/obj/machinery/computer/security/telescreen/entertainment{ /obj/machinery/computer/security/telescreen/entertainment{
pixel_y = 28; pixel_y = 28;
@@ -38558,17 +38541,8 @@
d2 = 2; d2 = 2;
icon_state = "1-2" icon_state = "1-2"
}, },
/obj/machinery/porta_turret/crescent{ /turf/simulated/floor/tiled,
check_down = 0; /area/SouthernCrossV2/Security/Exploration_Sling_Shuttle)
check_access = 0;
req_one_access = list(19);
desc = "A light weight energy turret design to be non-lethal, a deterrence against rowdy crew and deadly targets";
name = "Disabler turret";
faction = "nanotrasen"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/SouthernCrossV2/Security/Transit_Turrets)
"lBJ" = ( "lBJ" = (
/obj/structure/railing/grey, /obj/structure/railing/grey,
/obj/random/junk, /obj/random/junk,
@@ -44199,7 +44173,7 @@
control_area = "\improper Telecomms Foyer"; control_area = "\improper Telecomms Foyer";
name = "Telecomms Teleporter turret control"; name = "Telecomms Teleporter turret control";
pixel_x = 28; pixel_x = 28;
req_access = null; req_access = list(17,11,24);
req_one_access = list(17,11,24) req_one_access = list(17,11,24)
}, },
/obj/machinery/camera/network/security{ /obj/machinery/camera/network/security{
@@ -50488,21 +50462,6 @@
/obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/brflowers,
/turf/simulated/floor/grass2, /turf/simulated/floor/grass2,
/area/SouthernCrossV2/Commons/Port_1Deck_Atrium) /area/SouthernCrossV2/Commons/Port_1Deck_Atrium)
"pzH" = (
/obj/effect/catwalk_plated/techmaint,
/obj/machinery/porta_turret/crescent{
check_down = 0;
check_access = 0;
req_one_access = list(19);
desc = "A light weight energy turret design to be non-lethal, a deterrence against rowdy crew and deadly targets";
name = "Disabler turret";
faction = "nanotrasen"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/SouthernCrossV2/Security/Transit_Turrets)
"pzK" = ( "pzK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -50839,6 +50798,7 @@
/area/SouthernCrossV2/Maints/ab_StripBar) /area/SouthernCrossV2/Maints/ab_StripBar)
"pFA" = ( "pFA" = (
/obj/structure/loot_pile/maint/technical, /obj/structure/loot_pile/maint/technical,
/obj/random/trash,
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/SouthernCrossV2/Maints/Deck1_AftStar1_Corridor1) /area/SouthernCrossV2/Maints/Deck1_AftStar1_Corridor1)
"pFH" = ( "pFH" = (
@@ -52403,17 +52363,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/porta_turret/crescent{ /turf/simulated/floor/tiled,
check_down = 0; /area/SouthernCrossV2/Harbor/Dock3)
check_access = 0;
req_one_access = list(19);
desc = "A light weight energy turret design to be non-lethal, a deterrence against rowdy crew and deadly targets";
name = "Disabler turret";
faction = "nanotrasen"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/SouthernCrossV2/Security/Transit_Turrets)
"qfl" = ( "qfl" = (
/obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only,
/obj/effect/floor_decal/industrial/arrows/yellow, /obj/effect/floor_decal/industrial/arrows/yellow,
@@ -59653,17 +59604,8 @@
d2 = 4; d2 = 4;
icon_state = "2-4" icon_state = "2-4"
}, },
/obj/effect/catwalk_plated/techmaint, /turf/simulated/floor/tiled,
/obj/machinery/porta_turret/crescent{ /area/SouthernCrossV2/Harbor/Dock5)
check_down = 0;
check_access = 0;
req_one_access = list(19);
desc = "A light weight energy turret design to be non-lethal, a deterrence against rowdy crew and deadly targets";
name = "Disabler turret";
faction = "nanotrasen"
},
/turf/simulated/floor/plating,
/area/SouthernCrossV2/Security/Transit_Turrets)
"sHO" = ( "sHO" = (
/obj/structure/disposalpipe/trunk, /obj/structure/disposalpipe/trunk,
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
@@ -60576,31 +60518,10 @@
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/SouthernCrossV2/Harbor/Dock5) /area/SouthernCrossV2/Harbor/Dock5)
"sZu" = ( "sZu" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{ /obj/random/trash_pile,
dir = 4 /obj/random/trash,
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/catwalk_plated/techmaint,
/obj/machinery/porta_turret/crescent{
check_down = 0;
check_access = 0;
req_one_access = list(19);
desc = "A light weight energy turret design to be non-lethal, a deterrence against rowdy crew and deadly targets";
name = "Disabler turret";
faction = "nanotrasen"
},
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/SouthernCrossV2/Security/Transit_Turrets) /area/SouthernCrossV2/Maints/Deck1_AftStar1_Corridor1)
"sZx" = ( "sZx" = (
/obj/machinery/alarm{ /obj/machinery/alarm{
pixel_y = 22 pixel_y = 22
@@ -66671,10 +66592,10 @@
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/SouthernCrossV2/Maints/Deck1_Security_StarCorridor1) /area/SouthernCrossV2/Maints/Deck1_Security_StarCorridor1)
"vig" = ( "vig" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/supply{
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5 dir = 5
}, },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/catwalk_plated/techmaint, /obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/SouthernCrossV2/Maints/Distro_Harbor) /area/SouthernCrossV2/Maints/Distro_Harbor)
@@ -67684,10 +67605,6 @@
pixel_y = 9; pixel_y = 9;
pixel_x = -7 pixel_x = -7
}, },
/obj/item/device/t_scanner/advanced{
pixel_y = 4;
pixel_x = 1
},
/obj/item/clothing/mask/gas{ /obj/item/clothing/mask/gas{
pixel_y = -5; pixel_y = -5;
pixel_x = 6 pixel_x = 6
@@ -67708,6 +67625,10 @@
pixel_y = 14; pixel_y = 14;
pixel_x = 6 pixel_x = 6
}, },
/obj/item/device/t_scanner{
pixel_y = 5;
pixel_x = 2
},
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/SouthernCrossV2/Maints/Distro_Harbor) /area/SouthernCrossV2/Maints/Distro_Harbor)
"vxY" = ( "vxY" = (
@@ -74310,7 +74231,7 @@
}, },
/area/SouthernCrossV2/Science/Observation_Hall) /area/SouthernCrossV2/Science/Observation_Hall)
"xTt" = ( "xTt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ /obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10 dir = 10
}, },
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
@@ -91763,7 +91684,7 @@ dFh
pfi pfi
bCu bCu
trr trr
pzH fxn
trr trr
fxn fxn
oZp oZp
@@ -92862,7 +92783,7 @@ cfp
tXo tXo
eJf eJf
tZf tZf
icV azD
gkN gkN
azD azD
jEl jEl
@@ -96734,7 +96655,7 @@ vGQ
dDr dDr
akk akk
vDr vDr
qfh aMv
lQq lQq
act act
aaa aaa
@@ -103184,7 +103105,7 @@ hbs
dZJ dZJ
kOh kOh
aMb aMb
aMv aMb
aMb aMb
aMb aMb
qoL qoL
@@ -103595,7 +103516,7 @@ fMw
fHV fHV
mwb mwb
nIQ nIQ
icV xVH
qsy qsy
eZh eZh
lok lok
@@ -103832,7 +103753,7 @@ bhd
tqg tqg
mFe mFe
aQY aQY
aMv aQY
aQY aQY
qSB qSB
tpj tpj
@@ -105220,7 +105141,7 @@ uHz
qyi qyi
dYv dYv
aTh aTh
sZu aVg
frW frW
xes xes
rnA rnA
@@ -107312,7 +107233,7 @@ pTA
iEc iEc
aNe aNe
qOv qOv
aMv qOv
qOv qOv
qOv qOv
qgY qgY
@@ -115258,11 +115179,11 @@ wHn
ayY ayY
azQ azQ
oIK oIK
pgz icV
oIK icV
dem dem
oIK dem
oIK icV
pgz pgz
mkY mkY
oIK oIK
@@ -115515,10 +115436,10 @@ xQV
tBL tBL
dqQ dqQ
mkY mkY
oIK sZu
oIK sZu
pFA pFA
pgz icV
kNJ kNJ
fXm fXm
hNA hNA
@@ -117630,7 +117551,7 @@ wOk
aVp aVp
nME nME
wPB wPB
icV eKQ
gAk gAk
eKQ eKQ
bCX bCX
@@ -118595,7 +118516,7 @@ lKt
kSY kSY
kZc kZc
wya wya
pzH kZc
fTv fTv
kZc kZc
lAG lAG

457
maps/southern_sun/southern_cross-2.dmm
View File

File diff suppressed because it is too large Load Diff

663
maps/southern_sun/southern_cross-3.dmm
View File

File diff suppressed because it is too large Load Diff