shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mapping tweaks

Browse Source 
- moving over our CC level / maps
- moving over our levels
- all the other maps are moved to a seperate folder
- better comfy chairs
- brought back solar defence crates
This commit is contained in:
evilew
2024-11-22 01:58:57 +01:00
parent af3f43cd8f
commit 438dcff051
14 changed files with 183020 additions and 170304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/game/lore_papers.dm
+7
View File
@@ -555,3 +555,10 @@
/obj/item/paper/fluff/chocoslime_research
name = "Stained Research Papers"
info = "<b>AUDIO LOG OF CHOCOLATE SLIME REPORT NO.3</b>. Despite possessing no obvious combat capabilities, the chocolate slime can feed itself to its victim, possibly rupturing its st-- mmhfph- grhm... ...(AUDIO LOG END)."
//gs13 - solar defence crate
/obj/item/paper/guides/jobs/engi/solar_defence
name = "Info on Satellite Defence"
info = "<h1>Welcome</h1><p>With this crate, you will be able to protect the station's solar arrays from constant barrages of space sand. The set-up is simple. Drag around all the satellites in front of solar panel arrays, preferably in direction open to space (the best spot is near the solar tracker and outside of the grilles), as that is where the space sand will come from. It's advised to set down just 1 satellite for each solar array. Once you set the satellite down, you can activate it by flicking on the switch. The crate also provides you with an OPTIONAL computer board to keep track of your defence satellites. Voila!</p>"
GainStation13/code/game/objects/structures/crate.dm
+13
View File
@@ -0,0 +1,13 @@
//gs13 - solar defence crate
/obj/structure/closet/crate/solarpanel_defence
name = "solar system defence crate"
icon_state = "engi_e_crate"
/obj/structure/closet/crate/solarpanel_defence/PopulateContents()
..()
new /obj/machinery/satellite/meteor_shield(src)
new /obj/machinery/satellite/meteor_shield(src)
new /obj/machinery/satellite/meteor_shield(src)
new /obj/machinery/satellite/meteor_shield(src)
new /obj/item/paper/guides/jobs/engi/solar_defence(src)
new /obj/item/circuitboard/computer/sat_control(src)
GainStation13/code/structures/chair.dm
-3
View File
@@ -55,6 +55,3 @@
desc = "Some nice metal shelves."
icon = 'hyperstation/icons/obj/objects.dmi'
icon_state = "shelf"
/obj/structure/chair/comfy/blue
color = rgb(50, 64, 255)
_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm
+235 -121
View File
@@ -1,11 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"ad" = (
/obj/structure/table,
/obj/effect/turf_decal/loading_area{
dir = 8;
icon_state = "drain";
name = "drain"
},
/obj/item/ashtray{
name = "candle holder"
},
@@ -15,6 +10,11 @@
/obj/effect/turf_decal/tile/bar{
dir = 4
},
/obj/effect/turf_decal/loading_area{
dir = 8;
icon_state = "drain";
name = "drain"
},
/turf/open/floor/plasteel/checker,
/area/mine/living_quarters)
"al" = (
@@ -104,10 +104,11 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/structure/fans/tiny,
/obj/machinery/door/airlock{
dir = 4;
name = "Labor Camp External Access"
},
/obj/structure/fans/tiny,
/turf/open/floor/plasteel/dark,
/area/mine/laborcamp)
"ba" = (
@@ -134,17 +135,17 @@
/area/mine/eva)
"bn" = (
/obj/structure/chair,
/obj/effect/turf_decal/loading_area{
dir = 8;
icon_state = "drain";
name = "drain"
},
/obj/effect/turf_decal/tile/bar{
dir = 8
},
/obj/effect/turf_decal/tile/bar{
dir = 4
},
/obj/effect/turf_decal/loading_area{
dir = 8;
icon_state = "drain";
name = "drain"
},
/turf/open/floor/plasteel/checker,
/area/mine/living_quarters)
"bs" = (
@@ -203,6 +204,10 @@
/obj/machinery/airalarm{
pixel_y = 23
},
/obj/effect/turf_decal/loading_area{
dir = 8;
icon_state = "steel_decals"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"bO" = (
@@ -337,20 +342,10 @@
/obj/item/ashtray{
name = "candle holder"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"cZ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 8
},
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
/obj/machinery/light,
/obj/effect/turf_decal/loading_area{
icon_state = "drain";
name = "drain"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
@@ -358,17 +353,17 @@
/obj/structure/chair{
dir = 1
},
/obj/effect/turf_decal/loading_area{
dir = 8;
icon_state = "drain";
name = "drain"
},
/obj/effect/turf_decal/tile/bar{
dir = 8
},
/obj/effect/turf_decal/tile/bar{
dir = 4
},
/obj/effect/turf_decal/loading_area{
dir = 8;
icon_state = "drain";
name = "drain"
},
/turf/open/floor/plasteel/checker,
/area/mine/living_quarters)
"dk" = (
@@ -789,6 +784,10 @@
dir = 8;
pixel_y = 3
},
/obj/effect/turf_decal/loading_area{
icon_state = "drain";
name = "drain"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"hy" = (
@@ -900,6 +899,11 @@
},
/obj/effect/turf_decal/tile/purple,
/obj/machinery/vending/mealdor,
/obj/effect/turf_decal/loading_area{
icon_state = "drain";
name = "drain";
dir = 1
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"iv" = (
@@ -1229,15 +1233,12 @@
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"lI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/loading_area{
dir = 2;
icon_state = "drain";
name = "drain"
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/decal/medium_gato,
/turf/open/floor/plasteel,
/area/mine/living_quarters)
/area/mine/laborcamp)
"lQ" = (
/obj/machinery/power/terminal{
dir = 1
@@ -1374,6 +1375,10 @@
/obj/item/kirbyplants{
icon_state = "plant-10"
},
/obj/effect/turf_decal/loading_area{
icon_state = "drain";
name = "drain"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"mR" = (
@@ -1457,6 +1462,11 @@
dir = 1
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/turf_decal/loading_area{
icon_state = "drain";
name = "drain";
dir = 1
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"nJ" = (
@@ -1630,6 +1640,9 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/obj/machinery/light/small{
dir = 8
},
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"pu" = (
@@ -1704,6 +1717,10 @@
/obj/effect/turf_decal/tile/bar{
dir = 8
},
/obj/effect/turf_decal/loading_area{
dir = 4;
icon_state = "steel_decals"
},
/turf/open/floor/plasteel/dark/side{
dir = 8
},
@@ -2012,6 +2029,18 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/loading_area{
dir = 8;
icon_state = "steel_decals"
},
/obj/effect/turf_decal/loading_area{
dir = 9;
icon_state = "steel_decals10"
},
/obj/effect/turf_decal/loading_area{
dir = 6;
icon_state = "steel_decals10"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"sR" = (
@@ -2064,6 +2093,10 @@
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/obj/effect/turf_decal/loading_area{
dir = 2;
icon_state = "steel_decals"
},
/turf/open/floor/plasteel/dark/side{
dir = 1
},
@@ -2098,6 +2131,10 @@
/obj/item/kirbyplants{
icon_state = "plant-10"
},
/obj/effect/turf_decal/loading_area{
icon_state = "drain";
name = "drain"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"tE" = (
@@ -2385,9 +2422,6 @@
/turf/open/floor/plasteel/checker,
/area/mine/living_quarters)
"wE" = (
/obj/machinery/light/small{
dir = 4
},
/obj/structure/rack/shelf,
/obj/item/mop,
/obj/item/reagent_containers/glass/bucket,
@@ -2457,16 +2491,16 @@
/turf/open/floor/plasteel/dark,
/area/mine/laborcamp/security)
"xq" = (
/obj/machinery/door/airlock/external{
glass = 1;
name = "Mining External Airlock";
opacity = 0;
req_access_txt = "54"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/external{
glass = 1;
name = "Mining External Airlock";
opacity = 0;
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/mine/eva)
"xs" = (
@@ -2524,6 +2558,10 @@
pixel_x = 1;
pixel_y = 23
},
/obj/effect/turf_decal/loading_area{
dir = 4;
icon_state = "steel_decals"
},
/turf/open/floor/plasteel/dark/side{
dir = 8
},
@@ -2821,6 +2859,14 @@
/obj/machinery/airalarm{
pixel_y = 24
},
/obj/machinery/light{
dir = 1
},
/obj/effect/turf_decal/loading_area{
icon_state = "drain";
name = "drain";
dir = 1
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"Ao" = (
@@ -2972,16 +3018,17 @@
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"BD" = (
/obj/machinery/door/airlock/maintenance{
name = "Mining Station Maintenance";
req_access_txt = "48"
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/door/airlock/maintenance{
name = "Mining Station Maintenance";
req_access_txt = "48";
dir = 8
},
/turf/open/floor/plating,
/area/mine/laborcamp/security)
"BH" = (
@@ -3086,6 +3133,18 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/loading_area{
dir = 4;
icon_state = "steel_decals"
},
/obj/effect/turf_decal/loading_area{
dir = 5;
icon_state = "steel_decals10"
},
/obj/effect/turf_decal/loading_area{
dir = 10;
icon_state = "steel_decals10"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"CB" = (
@@ -3138,21 +3197,13 @@
},
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"CV" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/obj/effect/turf_decal/loading_area{
dir = 1;
icon_state = "drain";
name = "drain"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"Dc" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/external/glass{
dir = 4
},
/turf/open/floor/plating,
/area/mine/living_quarters)
"Dd" = (
@@ -3542,6 +3593,11 @@
icon_state = "drain";
name = "drain"
},
/obj/effect/turf_decal/loading_area{
dir = 4;
icon_state = "drain";
name = "drain"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"HO" = (
@@ -3781,6 +3837,11 @@
dir = 1
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1,
/obj/effect/turf_decal/loading_area{
icon_state = "drain";
name = "drain";
dir = 1
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"JJ" = (
@@ -3903,6 +3964,10 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/loading_area{
dir = 8;
icon_state = "steel_decals"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"KP" = (
@@ -3927,9 +3992,9 @@
/obj/machinery/door/airlock/external{
glass = 1;
name = "Mining Shuttle Airlock";
opacity = 0
opacity = 0;
dir = 8
},
/obj/structure/fans/tiny,
/turf/open/floor/plasteel/dark,
/area/mine/production)
"KS" = (
@@ -3944,12 +4009,6 @@
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"KU" = (
/obj/machinery/door/airlock/external{
glass = 1;
name = "Mining External Airlock";
opacity = 0;
req_access_txt = "54"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
@@ -3960,6 +4019,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 8
},
/obj/machinery/door/airlock/external{
glass = 1;
name = "Mining External Airlock";
opacity = 0;
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/mine/eva)
"KV" = (
@@ -4300,6 +4365,10 @@
/obj/structure/chair{
dir = 4
},
/obj/effect/turf_decal/loading_area{
icon_state = "drain";
name = "drain"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"NB" = (
@@ -4406,6 +4475,10 @@
/obj/effect/turf_decal/tile/bar{
dir = 8
},
/obj/effect/turf_decal/loading_area{
dir = 4;
icon_state = "steel_decals"
},
/turf/open/floor/plasteel/dark/side{
dir = 8
},
@@ -4782,6 +4855,11 @@
dir = 8
},
/obj/machinery/vending/gato,
/obj/effect/turf_decal/loading_area{
icon_state = "drain";
name = "drain";
dir = 1
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"Sg" = (
@@ -4903,18 +4981,22 @@
/obj/structure/table,
/obj/item/trash/plate,
/obj/item/kitchen/fork,
/obj/machinery/light/small{
dir = 8
},
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"Tm" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/external{
glass = 1;
name = "Mining Shuttle Airlock";
opacity = 0
opacity = 0;
dir = 4
},
/obj/structure/fans/tiny,
/turf/open/floor/plasteel/dark,
/area/mine/production)
"Tn" = (
@@ -5069,6 +5151,9 @@
},
/obj/structure/table,
/obj/item/storage/box/donkpockets,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/checker,
/area/mine/living_quarters)
"UD" = (
@@ -5084,6 +5169,9 @@
icon_state = "drain";
name = "drain"
},
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"UI" = (
@@ -5139,7 +5227,8 @@
/obj/machinery/door/airlock/external{
glass = 1;
name = "Mining External Airlock";
opacity = 0
opacity = 0;
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/mine/living_quarters)
@@ -5181,12 +5270,25 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 8
},
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/loading_area{
dir = 5;
icon_state = "steel_decals10"
},
/obj/effect/turf_decal/loading_area{
dir = 9;
icon_state = "steel_decals10"
},
/obj/effect/turf_decal/loading_area{
dir = 10;
icon_state = "steel_decals10"
},
/obj/effect/turf_decal/loading_area{
dir = 6;
icon_state = "steel_decals10"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"Vh" = (
@@ -5198,11 +5300,6 @@
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"Vj" = (
/obj/machinery/door/airlock/external{
glass = 1;
name = "Mining External Airlock";
opacity = 0
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
@@ -5213,6 +5310,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 8
},
/obj/machinery/door/airlock/external{
glass = 1;
name = "Mining External Airlock";
opacity = 0;
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/mine/living_quarters)
"Vo" = (
@@ -5398,6 +5501,11 @@
icon_state = "drain";
name = "drain"
},
/obj/effect/turf_decal/loading_area{
dir = 4;
icon_state = "drain";
name = "drain"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"Xm" = (
@@ -5657,11 +5765,13 @@
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"YP" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/external/glass{
dir = 4
},
/turf/open/floor/plating,
/area/mine/living_quarters)
"YV" = (
@@ -5673,6 +5783,10 @@
icon_state = "drain";
name = "drain"
},
/obj/effect/turf_decal/loading_area{
dir = 8;
icon_state = "steel_decals"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"Zp" = (
@@ -6366,7 +6480,7 @@ VT
VT
VT
VT
VT
Lm
VT
VT
VT
@@ -6414,6 +6528,7 @@ VT
VT
VT
VT
Lm
VT
VT
VT
@@ -6424,10 +6539,9 @@ VT
VT
VT
VT
VT
VT
VT
VT
Lm
Lm
Lm
VT
VT
VT
@@ -6469,6 +6583,8 @@ VT
VT
VT
VT
Lm
Lm
VT
VT
VT
@@ -6480,10 +6596,8 @@ VT
VT
VT
VT
VT
VT
VT
VT
Lm
Lm
VT
VT
VT
@@ -6525,9 +6639,9 @@ VT
VT
VT
VT
VT
VT
VT
Lm
Lm
Lm
VT
VT
VT
@@ -6581,7 +6695,7 @@ VT
VT
VT
VT
VT
Lm
VT
VT
VT
@@ -7021,7 +7135,7 @@ fO
ow
iv
Cl
Cl
lI
gn
vo
ly
@@ -7170,7 +7284,7 @@ my
my
VT
VT
VT
Lm
VT
VT
VT
@@ -7227,7 +7341,7 @@ my
my
VT
VT
VT
Lm
VT
VT
VT
@@ -7283,7 +7397,7 @@ my
my
VT
VT
VT
Lm
VT
VT
VT
@@ -7781,9 +7895,9 @@ rU
lX
jJ
et
CV
iG
uj
lI
Dr
Un
Dd
IY
@@ -7792,6 +7906,7 @@ VN
VN
VN
VN
JP
my
VT
VT
@@ -7806,7 +7921,6 @@ VT
VT
VT
VT
VT
"}
(37,1,1) = {"
JY
@@ -7849,6 +7963,8 @@ KV
JP
JP
JP
JP
JP
my
VT
VT
@@ -7862,8 +7978,6 @@ VT
VT
VT
VT
VT
VT
"}
(38,1,1) = {"
JY
@@ -7905,8 +8019,8 @@ VN
VN
JP
JP
my
my
JP
JP
VT
VT
VT
@@ -7963,7 +8077,7 @@ JP
JP
JP
my
VT
my
VT
VT
VT
@@ -8002,11 +8116,11 @@ JY
my
VT
VT
VT
VT
my
JP
JP
JP
JP
KV
JH
cr
@@ -8060,7 +8174,7 @@ my
VT
VT
VT
VT
my
my
JP
JP
@@ -8075,6 +8189,7 @@ fU
JP
JP
JP
JP
my
VT
VT
@@ -8091,7 +8206,6 @@ VT
VT
VT
VT
VT
"}
(42,1,1) = {"
JY
@@ -8131,6 +8245,9 @@ KV
JP
JP
JP
JP
JP
JP
my
my
VT
@@ -8146,9 +8263,6 @@ VT
VT
VT
VT
VT
VT
VT
"}
(43,1,1) = {"
JY
@@ -8189,9 +8303,9 @@ JP
JP
my
my
VT
VT
VT
JP
my
my
VT
VT
VT
@@ -8231,10 +8345,10 @@ VT
VT
VT
VT
VT
my
JP
JP
JP
VN
VN
VN
@@ -8248,7 +8362,7 @@ my
VT
VT
VT
VT
my
VT
VT
VT
@@ -8352,11 +8466,13 @@ JP
JP
JP
KV
cZ
Vf
KV
JP
JP
JP
JP
JP
my
VT
VT
@@ -8375,8 +8491,6 @@ VT
VT
VT
VT
VT
VT
"}
(47,1,1) = {"
VT
_maps/map backups/gs_maps/generic/CentCom.dmm
+4 -4
View File
@@ -309,7 +309,7 @@
"cbt" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/centcom/control)
"ccn" = (/obj/machinery/computer/shuttle,/turf/open/floor/engine/cult,/area/wizard_station)
"ccq" = (/obj/machinery/conveyor/inverted{dir = 9; id = "fatfacility_cargo_left"},/turf/open/floor/mineral/calorite,/area/fatlab)
"ccS" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/armor/hos/trenchcoat,/obj/item/clothing/suit/armor/hos/trenchcoat,/obj/item/clothing/shoes/jackboots/tall,/obj/item/clothing/gloves/combat,/obj/item/clothing/neck/cloak/centcom,/obj/item/clothing/shoes/combat/swat,/obj/item/clothing/mask/chameleon,/obj/machinery/light/small{dir = 1},/obj/item/clothing/accessory/medal/gato_badge/employee,/obj/item/clothing/head/HoS/beret/gato,/obj/item/clothing/head/HoS/gato,/obj/item/clothing/suit/space/hardsuit/ert/alert/gato,/obj/item/clothing/suit/armor/vest/capcarapace/gato,/obj/item/clothing/suit/armor/vest/capcarapace/paradepurple,/obj/item/clothing/suit/armor/vest/capcarapace/paradeblack,/obj/item/clothing/under/centcomdress,/obj/item/clothing/under/centcomdressvk,/turf/open/floor/plasteel/dark/side{dir = 9},/area/centcom/ferry)
"ccS" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/armor/hos/trenchcoat,/obj/item/clothing/suit/armor/hos/trenchcoat,/obj/item/clothing/shoes/jackboots/tall,/obj/item/clothing/gloves/combat,/obj/item/clothing/shoes/combat/swat,/obj/item/clothing/mask/chameleon,/obj/machinery/light/small{dir = 1},/obj/item/clothing/accessory/medal/gato_badge/employee,/obj/item/clothing/head/HoS/beret/gato,/obj/item/clothing/head/HoS/gato,/obj/item/clothing/suit/space/hardsuit/ert/alert/gato,/obj/item/clothing/suit/armor/vest/capcarapace/gato,/obj/item/clothing/suit/armor/vest/capcarapace/paradepurple,/obj/item/clothing/suit/armor/vest/capcarapace/paradeblack,/obj/item/clothing/under/centcomdress,/obj/item/clothing/under/centcomdressvk,/turf/open/floor/plasteel/dark/side{dir = 9},/area/centcom/ferry)
"cdu" = (/obj/structure/table/wood{layer = 3.3},/obj/item/kirbyplants{icon_state = "plant-05"; pixel_y = 4},/turf/open/floor/holofloor{dir = 9; icon_state = "wood"},/area/holodeck/rec_center/lounge)
"cdA" = (/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/centcom/control)
"cdF" = (/obj/structure/bed,/turf/open/floor/mineral/titanium/blue,/area/centcom/evac)
@@ -862,7 +862,7 @@
"gqf" = (/obj/machinery/door/airlock/centcom{name = "Briefing Room"; opacity = 1; req_access_txt = "101"},/obj/effect/turf_decal/stripes/line{dir = 2},/turf/open/floor/plasteel,/area/centcom/ferry)
"gql" = (/obj/structure/showcase{desc = "A strange machine supposedly from another world. The Wizard Federation has been meddling with it for years."; icon = 'icons/obj/machines/telecomms.dmi'; icon_state = "processor"; name = "byond random number generator"},/turf/open/floor/engine/cult,/area/wizard_station)
"gqX" = (/obj/structure/closet/crate,/obj/item/reagent_containers/food/snacks/sushie_pro,/obj/item/reagent_containers/food/snacks/sushie_pro,/obj/item/reagent_containers/food/snacks/sushie_pro,/obj/item/reagent_containers/food/snacks/taco,/obj/item/reagent_containers/food/snacks/taco,/obj/item/reagent_containers/food/snacks/taco,/turf/open/floor/plasteel/freezer,/area/fatlab)
"grd" = (/obj/structure/flora/crystal/medium/growth{icon_state = "crystalgrowth3"; pixel_x = -24; pixel_y = -1},/obj/structure/window/reinforced{dir = 4},/turf/open/indestructible/layenia/crystal/garden,/area/centcom/ferry)
"grd" = (/obj/structure/flora/crystal/medium/growth{icon_state = "crystalgrowth3"; pixel_x = -24; pixel_y = -1},/obj/structure/window/reinforced{dir = 4},/area/centcom/ferry)
"grn" = (/obj/structure/table/wood,/obj/item/storage/box/drinkingglasses,/obj/item/reagent_containers/food/drinks/bottle/whiskey{pixel_y = 5},/obj/machinery/light,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/tdome/tdomeadmin)
"gry" = (/obj/effect/turf_decal/tile/green{dir = 4},/obj/effect/turf_decal/tile/green,/turf/open/floor/holofloor,/area/holodeck/rec_center/firingrange)
"grV" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel/dark,/area/awaymission/jungleresort)
@@ -1033,7 +1033,7 @@
"hGb" = (/obj/effect/turf_decal/stripes/line,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/ctf)
"hHg" = (/obj/structure/table,/obj/item/reagent_containers/food/snacks/burger/superbite{pixel_y = 8; pixel_x = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/dark,/area/fatlab)
"hHr" = (/obj/structure/extinguisher_cabinet{pixel_x = 26},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/centcom/ferry)
"hHO" = (/obj/docking_port/stationary{dir = 4; dwidth = 2; height = 7; id = "pod_away"; name = "recovery ship"; width = 5},/turf/open/floor/plating,/area/centcom/control)
"hHO" = (/obj/docking_port/stationary{dir = 4; dwidth = 2; height = 7; id = "pod1_away"; name = "recovery ship"; width = 5},/turf/open/floor/plating,/area/centcom/control)
"hIe" = (/obj/structure/table,/obj/machinery/computer/station_alert{dir = 8},/obj/structure/window{dir = 1},/turf/open/floor/carpet/gato,/area/centcom/ferry)
"hIt" = (/obj/effect/turf_decal/stripes/line{dir = 6},/turf/open/floor/plasteel,/area/tdome/tdomeadmin)
"hIA" = (/obj/item/kirbyplants{icon_state = "plant-21"},/turf/open/floor/plasteel,/area/centcom/ferry)
@@ -2079,7 +2079,7 @@
"oNh" = (/obj/structure/table/wood,/obj/item/clipboard{pixel_x = -14},/obj/item/pen/red{pixel_x = -14},/obj/item/folder/yellow{pixel_x = -5},/turf/open/floor/plasteel/grimy,/area/centcom/ferry)
"oNw" = (/obj/machinery/door/poddoor{density = 1; id = "XCCQMLoaddoor"; name = "Supply Dock Loading Door"},/obj/machinery/conveyor{dir = 8; id = "XCCQMLoad"},/obj/effect/turf_decal/stripes/end{dir = 8},/turf/open/floor/plasteel,/area/centcom/supply)
"oNG" = (/obj/machinery/autolathe,/turf/open/floor/wood,/area/centcom/holding)
"oNJ" = (/obj/structure/flora/crystal/medium/growth{icon_state = "crystalgrowth2"; pixel_x = -23; pixel_y = -1},/obj/structure/window/reinforced{dir = 4},/turf/open/indestructible/layenia/crystal/garden,/area/centcom/ferry)
"oNJ" = (/obj/structure/flora/crystal/medium/growth{icon_state = "crystalgrowth2"; pixel_x = -23; pixel_y = -1},/obj/structure/window/reinforced{dir = 4},/area/centcom/ferry)
"oOr" = (/obj/structure/closet/crate/large,/obj/effect/turf_decal/stripes/asteroid/line{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel/dark,/area/fatlab)
"oOB" = (/obj/machinery/status_display/ai,/turf/closed/indestructible/riveted,/area/centcom/supply)
"oOT" = (/obj/structure/medkit_cabinet{pixel_x = -27},/turf/open/floor/plasteel/white,/area/centcom/ferry)
_maps/map_files/BoxStation/BoxStation.dmm
+441 -422
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/KiloStation/KiloStation.dmm
+24959 -24956
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation.dmm
+31988 -31989
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Mining/Lavaland_Lower.dmm
+17 -6
View File
@@ -2205,6 +2205,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/item/beacon,
/turf/open/floor/carpet,
/area/xenoarch/gen)
"eZ" = (
@@ -4759,10 +4760,9 @@
/turf/open/floor/plating,
/area/xenoarch/gen)
"kT" = (
/obj/machinery/quantumpad/always_powered{
name = "To mining";
map_pad_id = "to_mining";
map_pad_link_id = "from_mining"
/obj/structure/ladder/unbreakable{
height = 1;
id = "xenoarch"
},
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
@@ -7297,6 +7297,10 @@
},
/turf/open/floor/engine,
/area/xenoarch/caloriteresearch_powered)
"rx" = (
/obj/item/beacon,
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"ry" = (
/obj/item/bodypart/l_leg{
pixel_y = 8;
@@ -9488,6 +9492,13 @@
},
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"Cd" = (
/obj/structure/ladder/unbreakable{
height = 1;
id = "xenoarch"
},
/turf/closed/wall,
/area/xenoarch/gen)
"Cg" = (
/obj/structure/flora/grass/jungle,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -18936,7 +18947,7 @@ ab
ab
ab
ab
Sy
Cd
dv
dv
aR
@@ -20504,7 +20515,7 @@ nN
Pa
fK
rc
el
rx
EY
xn
nZ
_maps/map_files/PubbyStation/PubbyStation.dmm
+30230 -30208
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/generic/CentCom.dmm
+95082 -82573
View File
File diff suppressed because it is too large Load Diff
code/game/objects/structures/beds_chairs/chair.dm
+36 -17
View File
@@ -14,6 +14,8 @@
var/buildstackamount = 1
var/item_chair = /obj/item/chair // if null it can't be picked up
layer = OBJ_LAYER
var/paddingcolor = "" //GS13 - better comfy chairs
var/mutable_appearance/lower
/obj/structure/chair/examine(mob/user)
. = ..()
@@ -26,6 +28,14 @@
if(!anchored) //why would you put these on the shuttle?
addtimer(CALLBACK(src, PROC_REF(RemoveFromLatejoin)), 0)
lower = GetLower() //if the chair has a lower part.
lower.layer = TABLE_LAYER
add_overlay(lower)
return ..()
/obj/structure/chair/proc/GetLower()
return mutable_appearance('GainStation13/icons/obj/chairs.dmi', "[icon_state]_lower") //GS13 - better chairs
/obj/structure/chair/ComponentInitialize()
. = ..()
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, PROC_REF(can_user_rotate),CALLBACK(src), PROC_REF(can_be_rotated)),null)
@@ -183,21 +193,32 @@
/obj/structure/chair/comfy
name = "comfy chair"
desc = "It looks comfy."
icon = 'GainStation13/icons/obj/chairs.dmi' //GS13 - better sprites
icon_state = "comfychair"
color = rgb(255,255,255)
resistance_flags = FLAMMABLE
max_integrity = 70
buildstackamount = 2
item_chair = null
paddingcolor = "#e82d2d" //GS13 - better comfy chairs
var/mutable_appearance/armrest
var/mutable_appearance/padding
/obj/structure/chair/comfy/Initialize(mapload) //GS13 - better comfy chairs
padding = GetPadding()
padding.color = paddingcolor
if(paddingcolor)
add_overlay(padding)
/obj/structure/chair/comfy/Initialize(mapload)
armrest = GetArmrest()
armrest.layer = ABOVE_MOB_LAYER
return ..()
/obj/structure/chair/comfy/proc/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "comfychair_armrest")
return mutable_appearance('GainStation13/icons/obj/chairs.dmi', "comfychair_armrest") //GS13 - better comfy chairs
/obj/structure/chair/comfy/proc/GetPadding()
return mutable_appearance('GainStation13/icons/obj/chairs.dmi', "comfychair_padding") //GS13 - better comfy chairs
/obj/structure/chair/comfy/Destroy()
QDEL_NULL(armrest)
@@ -217,26 +238,23 @@
. = ..()
update_armrest()
/obj/structure/chair/comfy/brown
color = rgb(255,113,0)
/obj/structure/chair/comfy/brown //GS13 - better comfy chairs
paddingcolor = rgb(255,113,0)
/obj/structure/chair/comfy/beige
color = rgb(255,253,195)
/obj/structure/chair/comfy/beige //GS13 - better comfy chairs
paddingcolor = rgb(255,253,195)
/obj/structure/chair/comfy/teal
color = rgb(0,255,255)
/obj/structure/chair/comfy/teal //GS13 - better comfy chairs
paddingcolor = rgb(0,255,255)
/obj/structure/chair/comfy/black
color = rgb(167,164,153)
/obj/structure/chair/comfy/black //GS13 - better comfy chairs
paddingcolor = rgb(167,164,153)
/obj/structure/chair/comfy/green
color = rgb(81,173,106)
/obj/structure/chair/comfy/lime //GS13 - better comfy chairs
paddingcolor = rgb(255,251,0)
/obj/structure/chair/comfy/lime
color = rgb(255,251,0)
/obj/structure/chair/comfy/purple
color = rgb(255,50,230)
/obj/structure/chair/comfy/blue //GS13 - better comfy chairs
paddingcolor = rgb(125, 137, 218)
/obj/structure/chair/comfy/plywood
name = "plywood chair"
@@ -253,6 +271,7 @@
name = "shuttle seat"
desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
icon_state = "shuttle_chair"
paddingcolor = "" //gs13 - padding appearance
/obj/structure/chair/comfy/shuttle/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest")
code/game/objects/structures/signs/_signs.dm
+5 -4
View File
@@ -122,10 +122,11 @@
. = ..()
setDir(turn(dir, 90))
/obj/structure/sign/nanotrasen
name = "\improper Nanotrasen Logo"
desc = "A sign with the Nanotrasen Logo on it. Glory to Nanotrasen!"
icon_state = "nanotrasen"
/obj/structure/sign/nanotrasen //GS13 rebranded this whole thing, it's easier to just gato-ify it than replace every single instance of it on every map
name = "\improper GATO Logo"
desc = "A sign with the GATO Logo on it. Glory to GATO!"
icon = 'GainStation13/icons/obj/decals.dmi'
icon_state = "gato"
/obj/structure/sign/logo
name = "nanotrasen logo"
tgstation.dme
+3 -1
View File
@@ -3946,6 +3946,7 @@
#include "GainStation13\code\game\objects\items\toys.dm"
#include "GainStation13\code\game\objects\items\storage\bags.dm"
#include "GainStation13\code\game\objects\structures\barsigns.dm"
#include "GainStation13\code\game\objects\structures\crate.dm"
#include "GainStation13\code\game\objects\structures\medikit.dm"
#include "GainStation13\code\game\objects\structures\sofa.dm"
#include "GainStation13\code\game\objects\structures\statues.dm"
@@ -4055,8 +4056,10 @@
#include "GainStation13\code\obj\items\bluespace_belt.dm"
#include "GainStation13\code\obj\items\circuits.dm"
#include "GainStation13\code\obj\items\floor_tiles.dm"
#include "GainStation13\code\obj\items\gato.dm"
#include "GainStation13\code\obj\items\holy.dm"
#include "GainStation13\code\obj\items\minor_items.dm"
#include "GainStation13\code\obj\items\reskinable_floor_tile.dm"
#include "GainStation13\code\obj\items\sensors\weight_infared.dm"
#include "GainStation13\code\obj\structure\airlock.dm"
#include "GainStation13\code\obj\structure\calorite_doors.dm"
@@ -4067,7 +4070,6 @@
#include "GainStation13\code\obj\weapons\alter_rays.dm"
#include "GainStation13\code\obj\weapons\fatbeam.dm"
#include "GainStation13\code\obj\weapons\fatoray.dm"
#include "GainStation13\code\obj\items\reskinable_floor_tile.dm"
#include "GainStation13\code\obj\weapons\feeder_ebow.dm"
#include "GainStation13\code\structures\chair.dm"
#include "GainStation13\code\structures\trapped_items.dm"