Skip to content

Commit

Permalink
Merge pull request #83 from KnigTheThrasher/kilosm
Browse files Browse the repository at this point in the history
Kilostation supermatter update
  • Loading branch information
SynthTwo authored Oct 6, 2024
2 parents 20c014f + b02b4ea commit 1c91020
Showing 1 changed file with 31 additions and 15 deletions.
46 changes: 31 additions & 15 deletions _maps/map_files/KiloStation/KiloStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1847,7 +1847,6 @@
/obj/structure/table,
/obj/item/storage/toolbox/electrical,
/obj/item/clothing/mask/gas,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/supermatter/room)
"aDa" = (
Expand Down Expand Up @@ -2031,6 +2030,16 @@
},
/turf/open/floor/iron/dark,
/area/station/maintenance/disposal/incinerator)
"aGk" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/structure/cable,
/obj/machinery/button/delam_scram{
pixel_y = 29
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
"aGn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -13888,6 +13897,16 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/cargo/drone_bay)
"etV" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/obj/machinery/atmospherics/components/unary/delam_scram/directional/east,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
"euc" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
Expand Down Expand Up @@ -19014,9 +19033,6 @@
/obj/effect/landmark/start/nanotrasen_consultant,
/turf/open/floor/stone,
/area/station/command/heads_quarters/nt_rep)
"fSt" = (
/turf/closed/wall/r_wall/rust,
/area/station/engineering/storage_shared)
"fSB" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
Expand Down Expand Up @@ -54095,9 +54111,6 @@
/obj/structure/cable/layer3,
/turf/open/floor/engine,
/area/station/ai_monitored/turret_protected/ai)
"qUU" = (
/turf/closed/wall/rust,
/area/station/security/checkpoint/engineering)
"qUZ" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
Expand Down Expand Up @@ -54863,6 +54876,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/fore)
"rfE" = (
/obj/machinery/air_sensor/engine_chamber,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
"rfF" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -56389,7 +56406,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/supermatter/room)
"rCi" = (
Expand Down Expand Up @@ -111688,7 +111704,7 @@ jBs
fGu
chS
oIS
qUU
fGu
ekm
leb
hYI
Expand Down Expand Up @@ -111941,7 +111957,7 @@ rlx
uFb
vZu
mDM
fSt
tPP
iwb
tKS
kXS
Expand Down Expand Up @@ -113746,12 +113762,12 @@ ekm
xqE
exD
ekm
xrh
aGk
kIn
kAw
ojX
fNo
ojX
rfE
tQi
ojX
cbm
Expand Down Expand Up @@ -114008,7 +114024,7 @@ oAq
pzK
pTv
sCQ
iWd
etV
iWd
iWd
lZX
Expand Down Expand Up @@ -115802,8 +115818,8 @@ oQk
xBz
gDM
qZX
fyj
fyj
qZX
qZX
qZX
fyj
qZX
Expand Down

0 comments on commit 1c91020

Please sign in to comment.