Merge pull request #6682 from Novacat/nova-basicfixes

Central Fixes
This commit is contained in:
Novacat
2020-02-26 09:55:04 -05:00
committed by GitHub

View File

@@ -4320,6 +4320,7 @@
/obj/effect/floor_decal/techfloor{ /obj/effect/floor_decal/techfloor{
dir = 1 dir = 1
}, },
/obj/machinery/washing_machine,
/turf/simulated/floor/tiled/techfloor/grid, /turf/simulated/floor/tiled/techfloor/grid,
/area/mothership/cryotube) /area/mothership/cryotube)
"hZ" = ( "hZ" = (
@@ -16633,6 +16634,7 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{ /obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 8 dir = 8
}, },
/obj/machinery/light/small,
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/mothership/eva) /area/mothership/eva)
"Dj" = ( "Dj" = (
@@ -17398,6 +17400,16 @@
}, },
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/mothership/robotics) /area/mothership/robotics)
"EX" = (
/obj/structure/table/standard,
/obj/item/weapon/soap,
/obj/effect/floor_decal/borderfloorwhite{
dir = 10
},
/turf/unsimulated/floor/steel{
icon_state = "white"
},
/area/centcom/bathroom)
"EY" = ( "EY" = (
/obj/machinery/door/airlock/multi_tile/metal{ /obj/machinery/door/airlock/multi_tile/metal{
dir = 2; dir = 2;
@@ -18010,6 +18022,7 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{ /obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4 dir = 4
}, },
/obj/machinery/light/small,
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/mothership/eva) /area/mothership/eva)
"Gx" = ( "Gx" = (
@@ -18867,6 +18880,16 @@
/obj/structure/curtain/open/bed, /obj/structure/curtain/open/bed,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/mothership/dorm2) /area/mothership/dorm2)
"Iz" = (
/obj/structure/table/standard,
/obj/item/weapon/soap,
/obj/effect/floor_decal/borderfloorwhite{
dir = 9
},
/turf/unsimulated/floor/steel{
icon_state = "white"
},
/area/centcom/bathroom)
"IA" = ( "IA" = (
/obj/structure/bed/chair/office/dark{ /obj/structure/bed/chair/office/dark{
dir = 8 dir = 8
@@ -20238,6 +20261,10 @@
pixel_x = -32 pixel_x = -32
}, },
/obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/machinery/atmospherics/unary/vent_pump/high_volume,
/obj/machinery/light/small{
dir = 4;
pixel_y = 0
},
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/mothership/breakroom) /area/mothership/breakroom)
"Lv" = ( "Lv" = (
@@ -20347,6 +20374,10 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{ /obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1 dir = 1
}, },
/obj/machinery/light/small{
dir = 4;
pixel_y = 0
},
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/mothership/engineering) /area/mothership/engineering)
"LC" = ( "LC" = (
@@ -20890,6 +20921,15 @@
/obj/machinery/atmospherics/unary/cryo_cell, /obj/machinery/atmospherics/unary/cryo_cell,
/turf/simulated/floor/tiled/white, /turf/simulated/floor/tiled/white,
/area/mothership/resleeving) /area/mothership/resleeving)
"Nc" = (
/obj/structure/closet/crate/bin,
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
},
/turf/unsimulated/floor/steel{
icon_state = "white"
},
/area/centcom/bathroom)
"Nd" = ( "Nd" = (
/obj/effect/floor_decal/industrial/warning/dust/corner, /obj/effect/floor_decal/industrial/warning/dust/corner,
/obj/machinery/light/flamp/noshade, /obj/machinery/light/flamp/noshade,
@@ -21131,6 +21171,7 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{ /obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4 dir = 4
}, },
/obj/machinery/light/small,
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/mothership/telecomms1) /area/mothership/telecomms1)
"NK" = ( "NK" = (
@@ -21825,6 +21866,7 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{ /obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 8 dir = 8
}, },
/obj/machinery/light/small,
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/mothership/telecomms2) /area/mothership/telecomms2)
"Pa" = ( "Pa" = (
@@ -22444,6 +22486,23 @@
}, },
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/mothership/hydroponics) /area/mothership/hydroponics)
"Qr" = (
/obj/structure/sink{
icon_state = "sink";
dir = 8;
pixel_x = -12;
pixel_y = 2
},
/obj/structure/mirror{
pixel_x = -28
},
/obj/effect/floor_decal/borderfloorwhite{
dir = 10
},
/turf/unsimulated/floor/steel{
icon_state = "white"
},
/area/centcom/bathroom)
"Qs" = ( "Qs" = (
/obj/machinery/door/firedoor/glass, /obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/security, /obj/machinery/door/airlock/security,
@@ -22653,6 +22712,15 @@
name = "Sealed Door" name = "Sealed Door"
}, },
/area/mothership/eva) /area/mothership/eva)
"QM" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
},
/obj/structure/closet/crate/bin,
/turf/unsimulated/floor/steel{
icon_state = "white"
},
/area/centcom/bathroom)
"QN" = ( "QN" = (
/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,
@@ -23717,6 +23785,9 @@
"Tv" = ( "Tv" = (
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/mothership/teleporter) /area/mothership/teleporter)
"Tw" = (
/turf/simulated/floor/tiled/techmaint,
/area/mothership/cryotube)
"Tx" = ( "Tx" = (
/obj/machinery/autolathe{ /obj/machinery/autolathe{
desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; desc = "Your typical Autolathe. It appears to have much more options than your regular one, however...";
@@ -23817,6 +23888,14 @@
/obj/item/ammo_magazine/m545saw/ap, /obj/item/ammo_magazine/m545saw/ap,
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/mothership/armory) /area/mothership/armory)
"TG" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
},
/turf/unsimulated/floor/steel{
icon_state = "white"
},
/area/centcom/bathroom)
"TH" = ( "TH" = (
/obj/structure/cable/cyan{ /obj/structure/cable/cyan{
d1 = 0; d1 = 0;
@@ -24673,10 +24752,6 @@
}, },
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/mothership/security) /area/mothership/security)
"Vo" = (
/obj/machinery/washing_machine,
/turf/simulated/floor/tiled/techmaint,
/area/mothership/cryotube)
"Vp" = ( "Vp" = (
/obj/structure/table/bench/steel, /obj/structure/table/bench/steel,
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
@@ -24837,6 +24912,10 @@
pixel_x = 32 pixel_x = 32
}, },
/obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/machinery/atmospherics/unary/vent_pump/high_volume,
/obj/machinery/light/small{
dir = 8;
pixel_x = 0
},
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/mothership/breakroom) /area/mothership/breakroom)
"VK" = ( "VK" = (
@@ -25459,6 +25538,10 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{ /obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1 dir = 1
}, },
/obj/machinery/light/small{
dir = 8;
pixel_x = 0
},
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/mothership/engineering) /area/mothership/engineering)
"Xo" = ( "Xo" = (
@@ -29639,7 +29722,7 @@ KH
Sw Sw
FE FE
VT VT
Vo Sn
Ut Ut
Jd Jd
Fr Fr
@@ -29924,7 +30007,7 @@ Sw
Ng Ng
VT VT
Na Na
Sn Tw
hY hY
Mb Mb
jq jq
@@ -30066,7 +30149,7 @@ Sw
UZ UZ
VT VT
FB FB
LC Tw
hY hY
YO YO
jq jq
@@ -30349,7 +30432,7 @@ KH
Sw Sw
FE FE
VT VT
Vo LC
PB PB
HH HH
GR GR
@@ -34479,22 +34562,22 @@ vK
wq wq
wq wq
xp xp
xN QM
vM TG
yn EX
ry ry
ac ac
ac ac
ac ac
ac ac
ry ry
yn Iz
vM TG
xN Nc
vK
wq wq
wq wq
xp wq
Qr
ry ry
ac ac
ac ac