Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync * sync part 1 - underscore folders in code * controllers folder * datums folder * game folder * cmon, work * modules - admin to awaymissions * cargo to events * fields to lighting * mapping > ruins * rest of the code folder * rest of the folders in the root directory * DME * fixes compiling errors. it compiles so it works * readds map changes * fixes dogborg module select * fixes typo in moduleselect_alternate_icon filepath
This commit is contained in:
@@ -445,7 +445,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/atmos)
|
||||
"bm" = (
|
||||
/obj/machinery/atmospherics/components/binary/valve/open{
|
||||
/obj/machinery/atmospherics/components/binary/valve/on{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -1370,6 +1370,13 @@
|
||||
/obj/item/storage/toolbox/syndicate,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/storage/primary)
|
||||
"oL" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/vr_sleeper,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/storage/primary)
|
||||
"oV" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
@@ -1434,6 +1441,13 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/medical/chemistry)
|
||||
"wV" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/vr_sleeper,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/storage/primary)
|
||||
"yp" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
@@ -3123,7 +3137,7 @@ dA
|
||||
dl
|
||||
dD
|
||||
dc
|
||||
dc
|
||||
oL
|
||||
cS
|
||||
af
|
||||
bY
|
||||
@@ -3555,7 +3569,7 @@ dC
|
||||
dl
|
||||
dF
|
||||
dk
|
||||
dk
|
||||
wV
|
||||
cS
|
||||
af
|
||||
ad
|
||||
|
||||
Reference in New Issue
Block a user