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.

Sign up for GitHub

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 tweak #2108

Merged
merged 4 commits into from
Apr 14, 2024
Merged

Map tweak #2108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
424ac96
заменил
ddorou Apr 11, 2024
f5869e2
доделал до актуалочки
ddorou Apr 11, 2024
78ff9bf
еще один апдейт
ddorou Apr 12, 2024
b09d366
Merge branch 'staging-sierra' into map-update
ddorou Apr 14, 2024
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
2 changes: 1 addition & 1 deletion baystation12.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3455,9 +3455,9 @@
#include "mods\_master_files\code\modules\mob\new_player\new_player.dm"
#include "mods\_master_files\code\modules\power\gravitygenerator.dm"
#include "mods\_master_files\code\modules\projectiles\projectile\bullets.dm"
#include "mods\_master_files\code\modules\species\station\adherent.dm"
#include "mods\_master_files\code\modules\sounds\connector.dm"
#include "mods\_master_files\code\modules\sounds\throw.dm"
#include "mods\_master_files\code\modules\species\station\adherent.dm"
#include "mods\_master_files\code\modules\species\station\machine.dm"
#include "mods\_master_files\maps\sierra\sierra_ranks.dm"
#include "mods\_master_files\maps\sierra\items\rigs.dm"
Expand Down
118 changes: 83 additions & 35 deletions maps/sierra/z1-z5_sierra.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10113,6 +10113,10 @@
/obj/floor_decal/techfloor{
dir = 9
},
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/atmos)
"byQ" = (
Expand Down Expand Up @@ -44763,10 +44767,6 @@
/obj/item/inflatable_dispenser,
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/engine_eva)
"gDy" = (
/obj/machinery/suit_storage_unit/explorer/engineer,
/turf/simulated/floor/tiled/techfloor,
/area/quartermaster/exploration/eva)
"gDD" = (
/obj/structure/closet/secure_closet/el,
/obj/floor_decal/borderfloor{
Expand Down Expand Up @@ -45857,7 +45857,7 @@
/turf/simulated/floor/reinforced{
map_airless = 1
},
/area/space)
/area/engineering/engine_room)
"gLh" = (
/obj/structure/table/woodentable/walnut,
/obj/random/single/playing_cards,
Expand Down Expand Up @@ -52571,14 +52571,6 @@
/obj/floor_decal/industrial/outline/blue,
/turf/simulated/floor/tiled/white,
/area/medical/infirmreception)
"hKO" = (
/obj/machinery/atmospherics/portables_connector{
dir = 4
},
/obj/structure/railing/mapped,
/obj/floor_decal/industrial/outline/grey,
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"hKY" = (
/turf/simulated/wall/prepainted,
/area/bridge/adjutants/cobed)
Expand Down Expand Up @@ -57179,6 +57171,11 @@
id = "bridge_windows"
},
/obj/structure/cable/green,
/obj/machinery/door/blast/regular/open{
dir = 4;
id_tag = "bridge_ent";
name = "Bridge Lockdown"
},
/turf/simulated/floor/plating,
/area/bridge)
"iyb" = (
Expand Down Expand Up @@ -64365,6 +64362,10 @@
/obj/floor_decal/techfloor{
dir = 5
},
/obj/machinery/alarm{
dir = 8;
pixel_x = 24
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/atmos)
"jBY" = (
Expand Down Expand Up @@ -71280,6 +71281,9 @@
},
/obj/floor_decal/corner/paleblue,
/obj/floor_decal/industrial/hatch/yellow,
/obj/structure/fireaxecabinet{
pixel_y = -30
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/atmos)
"kBk" = (
Expand Down Expand Up @@ -74250,6 +74254,10 @@
/obj/machinery/computer/modular/preset/engineering{
dir = 1
},
/obj/machinery/camera/network/engine{
c_tag = "Engine - R-UST - Control";
dir = 8
},
/turf/simulated/floor/tiled/steel_grid,
/area/vacant/prototype/control)
"kXN" = (
Expand Down Expand Up @@ -75052,8 +75060,37 @@
/obj/floor_decal/corner/darkblue/border{
dir = 4
},
/obj/machinery/light/spot{
dir = 4
/obj/machinery/button/blast_door{
id_tag = "infimary_hall_lockdown";
name = "Infirmary Public Hallway Lockdown";
pixel_x = 24;
req_access = list("ACCESS_MEDICAL");
pixel_y = 8;
dir = 8
},
/obj/machinery/button/blast_door{
id_tag = "infimary_window_lockdown";
name = "Infirmary Staging lockdown";
pixel_x = 24;
pixel_y = -8;
req_access = list("ACCESS_MEDICAL");
dir = 8
},
/obj/machinery/button/blast_door{
id_tag = "infimary_storage_lockdown";
name = "Infirmary Storage Lockdown";
pixel_x = 32;
pixel_y = 8;
req_access = list("ACCESS_MEDICAL");
dir = 8
},
/obj/machinery/button/blast_door{
id_tag = "infimary_staging_lockdown";
name = "Infirmary Critical Wing Lockdown";
pixel_x = 32;
pixel_y = -8;
req_access = list("ACCESS_MEDICAL");
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/heads/office/cmo)
Expand Down Expand Up @@ -93883,6 +93920,11 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/door/blast/regular/open{
dir = 4;
id_tag = "bridge_ent";
name = "Bridge Lockdown"
},
/turf/simulated/floor/plating,
/area/bridge)
"nVh" = (
Expand Down Expand Up @@ -95801,6 +95843,7 @@
/obj/machinery/light/spot{
dir = 1
},
/obj/item/reagent_containers/spray/sterilizine,
/turf/simulated/floor/tiled/white/monotile,
/area/medical/surgery)
"okx" = (
Expand Down Expand Up @@ -96208,6 +96251,11 @@
},
/turf/simulated/floor/plating,
/area/maintenance/substation/firstdeck)
"onw" = (
/obj/floor_decal/industrial/outline/yellow,
/obj/machinery/suit_storage_unit/explorer/engineer,
/turf/simulated/floor/tiled/techfloor,
/area/quartermaster/exploration/eva)
"onC" = (
/obj/structure/cable/green{
d1 = 4;
Expand Down Expand Up @@ -122577,6 +122625,10 @@
},
/area/space)
"sgt" = (
/obj/floor_decal/industrial/outline/yellow,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/machinery/suit_storage_unit/explorer/medic,
/turf/simulated/floor/tiled/techfloor,
/area/quartermaster/exploration/eva)
Expand Down Expand Up @@ -124860,10 +124912,6 @@
/turf/simulated/floor/tiled/monotile,
/area/rnd/entry)
"sxH" = (
/obj/machinery/camera/network/engine{
c_tag = "Engine - R-UST - Control";
dir = 8
},
/obj/floor_decal/industrial/warning{
dir = 1
},
Expand All @@ -124872,6 +124920,10 @@
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/alarm{
dir = 8;
pixel_x = 24
},
/turf/simulated/floor/tiled/steel_grid,
/area/vacant/prototype/control)
"sxI" = (
Expand Down Expand Up @@ -131487,9 +131539,8 @@
/turf/simulated/floor/tiled/steel_grid,
/area/hallway/primary/thirddeck/fore)
"tvu" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/spray/sterilizine,
/obj/floor_decal/industrial/outline/yellow,
/obj/structure/closet/secure_closet/personal/patient,
/turf/simulated/floor/tiled/white/monotile,
/area/medical/surgery)
"tvE" = (
Expand Down Expand Up @@ -141410,6 +141461,10 @@
/obj/structure/table/glass,
/obj/item/storage/secure/briefcase,
/obj/floor_decal/spline/fancy/black,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
},
/turf/simulated/floor/tiled/dark/monotile,
/area/bridge)
"uVt" = (
Expand Down Expand Up @@ -142948,16 +143003,6 @@
/obj/floor_decal/techfloor,
/turf/simulated/floor/tiled/techfloor/grid,
/area/exploration_shuttle/power)
"vfK" = (
/obj/machinery/atmospherics/portables_connector{
dir = 4
},
/obj/structure/railing/mapped{
dir = 1
},
/obj/floor_decal/industrial/outline/grey,
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"vfQ" = (
/obj/structure/bed/chair/padded/red{
dir = 1
Expand Down Expand Up @@ -145193,13 +145238,13 @@
/turf/simulated/floor/tiled/dark/monotile,
/area/crew_quarters/galley)
"vwI" = (
/obj/structure/flora/pottedplant/orientaltree,
/obj/floor_decal/corner/blue/three_quarters{
dir = 4
},
/obj/floor_decal/corner/darkblue/border{
dir = 6
},
/obj/structure/flora/pottedplant/orientaltree,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/heads/office/cmo)
"vwP" = (
Expand Down Expand Up @@ -157530,6 +157575,9 @@
/obj/floor_decal/corner/darkblue/border{
dir = 4
},
/obj/machinery/light/spot{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/heads/office/cmo)
"xsa" = (
Expand Down Expand Up @@ -184926,7 +184974,7 @@ plv
wBb
xYO
xyI
gDy
onw
sgt
szw
lJL
Expand Down Expand Up @@ -229372,10 +229420,10 @@ pIb
lJq
pNe
rIZ
vfK
wUn
wUn
hKO
wUn
wUn
gab
oYi
iIr
Expand Down