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

Merge pull request #14033 from BlueWildrose/colormateys

Browse Source 
Adds Color Mates to every station (except Snaxi)
This commit is contained in:
DeltaFire
2021-01-13 18:39:40 +01:00
committed by GitHub
parent eba8a16486 5436db5f3b
commit 6bdca6b8e4
9 changed files with 119 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+12 -3
View File
@@ -29620,10 +29620,10 @@
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
"bsU" = (
/mob/living/simple_animal/hostile/retaliate/ghost,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/mob/living/simple_animal/hostile/retaliate/ghost,
/turf/open/floor/wood,
/area/maintenance/port/fore)
"bsV" = (
@@ -53488,6 +53488,10 @@
},
/turf/closed/wall,
/area/science/circuit)
"dxF" = (
/obj/machinery/gear_painter,
/turf/open/floor/wood,
/area/maintenance/bar)
"dyE" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -56505,6 +56509,10 @@
},
/turf/open/floor/wood/wood_diagonal,
/area/maintenance/port/fore)
"kqy" = (
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"kqI" = (
/obj/structure/window,
/turf/open/floor/wood,
@@ -58551,6 +58559,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"pqR" = (
@@ -86334,7 +86343,7 @@ oKh
oKh
iiW
iiW
iiW
dxF
izv
nfm
bCq
@@ -98349,7 +98358,7 @@ awB
att
azh
fHG
fHG
kqy
kxf
ufD
alP
_maps/map_files/CogStation/CogStation.dmm
+14 -6
View File
@@ -33604,6 +33604,10 @@
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
/obj/item/kirbyplants{
icon_state = "plant-20";
pixel_y = 3
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"bvu" = (
@@ -38936,10 +38940,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/item/kirbyplants{
icon_state = "plant-20";
pixel_y = 3
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"bGN" = (
@@ -52867,7 +52868,7 @@
dir = 4;
pixel_x = -28
},
/obj/item/kirbyplants/random,
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"cjB" = (
@@ -71256,6 +71257,13 @@
},
/turf/open/floor/plating/airless,
/area/router/aux)
"stP" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/item/kirbyplants/random,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"sAm" = (
/obj/structure/plasticflaps,
/obj/machinery/door/poddoor{
@@ -114255,7 +114263,7 @@ ckq
bgf
beB
cxC
bgq
stP
cjA
biy
bjN
_maps/map_files/Deltastation/DeltaStation2.dmm
+5 -3
View File
@@ -3535,9 +3535,7 @@
dir = 4
},
/obj/effect/turf_decal/delivery,
/obj/item/kirbyplants{
icon_state = "plant-21"
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"ajL" = (
@@ -3823,6 +3821,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/item/kirbyplants{
icon_state = "plant-21"
},
/turf/open/floor/plasteel/white/corner,
/area/hallway/secondary/entry)
"akn" = (
@@ -79384,6 +79385,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
_maps/map_files/KiloStation/KiloStation.dmm
+30 -27
View File
@@ -48007,8 +48007,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/structure/closet/wardrobe/mixed,
/obj/machinery/light/small,
/obj/effect/turf_decal/delivery,
/obj/machinery/gear_painter,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/locker)
"bzo" = (
@@ -48767,7 +48768,6 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
"bAA" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -48777,11 +48777,6 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/storage/backpack{
pixel_x = 4;
pixel_y = 4
},
/obj/item/storage/backpack,
/obj/machinery/firealarm{
dir = 8;
pixel_x = 26
@@ -49398,6 +49393,7 @@
dir = 1;
name = "recreation camera"
},
/obj/structure/closet/wardrobe/mixed,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"bBy" = (
@@ -54797,11 +54793,6 @@
/area/hallway/secondary/exit/departure_lounge)
"bKn" = (
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -4;
pixel_y = 4
},
/obj/item/pen,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -54810,6 +54801,11 @@
/obj/machinery/airalarm{
pixel_y = 22
},
/obj/item/storage/backpack{
pixel_x = 4;
pixel_y = 4
},
/obj/item/storage/backpack,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
"bKo" = (
@@ -55425,6 +55421,12 @@
pixel_x = 28;
pixel_y = 22
},
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -4;
pixel_y = 4
},
/obj/item/pen,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"bLd" = (
@@ -60844,6 +60846,11 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/structure/table,
/obj/item/toy/figure/assistant{
pixel_x = 8;
pixel_y = 6
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bTD" = (
@@ -61021,6 +61028,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 10
},
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -4;
pixel_y = 4
},
/obj/item/pen,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bTO" = (
@@ -61259,19 +61272,8 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -4;
pixel_y = 4
},
/obj/item/pen,
/obj/item/toy/figure/assistant{
pixel_x = 8;
pixel_y = 6
},
/obj/effect/turf_decal/loading_area{
dir = 1
},
/obj/effect/turf_decal/delivery,
/obj/machinery/gear_painter,
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/entry)
"bUi" = (
@@ -71325,15 +71327,16 @@
icon_gib = "magicarp_gib";
icon_living = "magicarp";
icon_state = "magicarp";
maxHealth = 200;
max_co2 = 5;
max_tox = 2;
maxHealth = 200;
melee_damage_lower = 15;
melee_damage_upper = 20;
min_oxy = 5;
name = "Lia";
real_name = "Lia";
response_help = "pets";
response_help_continuous = "pets";
response_help_simple = "pet";
turns_per_move = 10
},
/turf/open/floor/plasteel/dark,
_maps/map_files/LambdaStation/dorms.dmm
+1
View File
@@ -13764,6 +13764,7 @@
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 4
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"Jp" = (
_maps/map_files/MetaStation/MetaStation.dmm
+32 -14
View File
@@ -4826,6 +4826,7 @@
/obj/machinery/light{
dir = 4
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel/white/corner,
/area/hallway/secondary/entry)
"aiU" = (
@@ -23177,6 +23178,9 @@
},
/obj/machinery/light,
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/newscaster{
pixel_y = -32
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTy" = (
@@ -23190,17 +23194,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTz" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/light,
/obj/machinery/newscaster{
pixel_y = -32
},
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTA" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
@@ -81348,6 +81341,21 @@
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
/area/engine/engineering)
"foN" = (
/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
},
/obj/machinery/light,
/obj/machinery/gear_painter,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/locker)
"fpa" = (
/obj/structure/extinguisher_cabinet{
pixel_y = -30
@@ -81974,6 +81982,16 @@
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/cryopod)
"lFR" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/machinery/light{
dir = 4
},
/obj/machinery/vending/clothing,
/turf/open/floor/plasteel/white/corner,
/area/hallway/secondary/entry)
"lGS" = (
/obj/docking_port/stationary/public_mining_dock,
/turf/open/floor/plating,
@@ -97543,7 +97561,7 @@ blU
aiT
bEs
bHJ
aiT
lFR
iSt
mcS
alK
@@ -118601,8 +118619,8 @@ aOD
aPK
aQV
aOu
aTz
aUM
aTt
foN
aUM
aYe
dnh
_maps/map_files/OmegaStation/OmegaStation.dmm
+4 -3
View File
@@ -15268,6 +15268,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/kirbyplants{
icon_state = "plant-21"
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/dorms)
"axG" = (
@@ -19618,9 +19621,6 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/dorms)
"aEL" = (
/obj/item/kirbyplants{
icon_state = "plant-21"
},
/obj/machinery/status_display{
pixel_y = -32
},
@@ -19635,6 +19635,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/dorms)
"aEM" = (
_maps/map_files/PubbyStation/PubbyStation.dmm
+16 -5
View File
@@ -511,10 +511,10 @@
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"abi" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 8
/obj/structure/disposalpipe/segment{
dir = 10
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"abj" = (
@@ -59138,6 +59138,13 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"qAx" = (
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/disposal/bin,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"qAM" = (
/obj/effect/spawner/lootdrop/maintenance,
/obj/item/cigbutt,
@@ -60933,6 +60940,10 @@
/obj/effect/turf_decal/plaque,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"uNA" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"uQR" = (
/obj/item/ammo_casing/shotgun/beanbag,
/turf/open/floor/plating,
@@ -104126,8 +104137,8 @@ aaY
awB
abe
abi
axw
axw
uNA
qAx
axw
axw
aBX
_maps/map_files/generic/CentCom.dmm
+5 -1
View File
@@ -10524,6 +10524,10 @@
},
/turf/open/floor/plasteel,
/area/centcom/control)
"yl" = (
/obj/machinery/gear_painter,
/turf/open/indestructible/hotelwood,
/area/centcom/holding)
"yn" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/vacuum,
@@ -43992,7 +43996,7 @@ NS
Nd
ZL
NS
NS
yl
Nd
CU
NS