Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

map: Nova armory enforcer fix #6502

Open
wants to merge 2 commits into
base: master220
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 58 additions & 26 deletions _maps/map_files/nova/nova.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -11046,7 +11046,7 @@
},
/area/security/range)
"bCZ" = (
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/bookbinder,
/turf/simulated/floor/wood,
/area/library)
"bDa" = (
Expand Down Expand Up @@ -33620,7 +33620,9 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/obj/structure/table/wood,
/obj/machinery/arcade/minesweeper{
freeplay = 1
},
/turf/simulated/floor/wood,
/area/security/permabrig)
"eRj" = (
Expand Down Expand Up @@ -47977,7 +47979,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/obj/structure/table/wood,
/obj/machinery/computer/arcade,
/turf/simulated/floor/wood,
/area/security/permabrig)
"gWD" = (
Expand Down Expand Up @@ -78610,6 +78612,7 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 6
},
/obj/effect/spawner/random_spawners/rodent,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
Expand Down Expand Up @@ -84978,17 +84981,12 @@
color = "red";
dir = 4
},
/obj/item/gun/projectile/automatic/pistol/enforcer/lethal{
pixel_y = 0;
pixel_x = -2
},
/obj/item/gun/projectile/automatic/pistol/enforcer/lethal{
pixel_y = 0;
pixel_x = 2
/obj/item/gun/projectile/automatic/pistol/enforcer/security{
pixel_x = -4
},
/obj/item/gun/projectile/automatic/pistol/enforcer/lethal{
pixel_y = 0;
pixel_x = 6
/obj/item/gun/projectile/automatic/pistol/enforcer/security,
/obj/item/gun/projectile/automatic/pistol/enforcer/security{
pixel_x = 4
},
/turf/simulated/floor/plasteel{
dir = 5;
Expand Down Expand Up @@ -85663,6 +85661,10 @@
"mGR" = (
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/kitchen_machine/microwave{
pixel_x = -1;
pixel_y = 7
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_regular_floor = "yellowsiding";
Expand Down Expand Up @@ -123215,8 +123217,10 @@
},
/area/aisat/aihallway)
"sbk" = (
/turf/simulated/floor/carpet,
/area/library)
/obj/effect/decal/ants,
/obj/effect/spawner/random_spawners/rodent,
/turf/simulated/floor/plating,
/area/security/permabrig)
"sbm" = (
/obj/machinery/status_display{
pixel_x = -32
Expand Down Expand Up @@ -125486,6 +125490,15 @@
tag = "icon-whitebluecorner"
},
/area/maintenance/medroom)
"ssL" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/rodent,
/turf/simulated/floor/plasteel{
dir = 4;
icon_regular_floor = "yellowsiding";
icon_state = "tranquillite"
},
/area/security/permabrig)
"ssN" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -135719,6 +135732,17 @@
"tNK" = (
/turf/simulated/floor/engine,
/area/engineering/controlroom)
"tNL" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/effect/spawner/random_spawners/rodent,
/turf/simulated/floor/plasteel,
/area/security/permabrig)
"tNR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
Expand Down Expand Up @@ -136631,7 +136655,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dust,
/obj/machinery/computer/library/checkout,
/obj/machinery/computer/library,
/turf/simulated/floor/wood,
/area/security/permabrig)
"tUc" = (
Expand Down Expand Up @@ -142633,6 +142657,14 @@
/obj/effect/landmark/start/roboticist,
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"uPb" = (
/obj/effect/turf_decal/siding/white,
/obj/effect/turf_decal/siding/white{
dir = 1
},
/obj/effect/spawner/random_spawners/rodent,
/turf/simulated/floor/glass/reinforced,
/area/security/permabrig)
"uPc" = (
/obj/structure/window/reinforced{
dir = 4
Expand Down Expand Up @@ -176609,7 +176641,7 @@ sUF
qYi
ilr
qDt
iNO
ssL
lhm
tQA
fUt
Expand Down Expand Up @@ -177120,7 +177152,7 @@ eam
uYD
elg
iNO
iNO
ssL
vLe
lFS
cLT
Expand Down Expand Up @@ -177897,7 +177929,7 @@ qyy
uYD
uYD
jzz
xFS
sbk
scx
dhP
gWy
Expand Down Expand Up @@ -179176,7 +179208,7 @@ ojd
wnr
tru
mZX
kWt
uPb
pkC
cIw
cmZ
Expand Down Expand Up @@ -180721,7 +180753,7 @@ aTt
dYO
afA
bfS
bfS
tNL
siH
vOg
bfS
Expand Down Expand Up @@ -187155,7 +187187,7 @@ nwQ
bCH
bvg
sBR
lDx
qel
lDx
lDx
jOC
Expand Down Expand Up @@ -187412,8 +187444,8 @@ mOV
nCp
ggK
mmg
qel
gGp
sbk
hLp
jOC
pzp
Expand Down Expand Up @@ -187669,7 +187701,7 @@ pJV
sSS
xCQ
hOQ
lDx
qel
lDx
lDx
jOC
Expand Down Expand Up @@ -187926,8 +187958,8 @@ aAA
dyL
qel
qel
qel
gGp
sbk
hLp
jOC
nTa
Expand Down Expand Up @@ -188183,7 +188215,7 @@ qog
oVN
qel
qel
lDx
qel
lDx
lDx
jOC
Expand Down