Skip to content

Commit

Permalink
Merge branch 'master' into translate
Browse files Browse the repository at this point in the history
  • Loading branch information
@Legendaxe
Legendaxe committed Apr 13, 2024
2 parents 0f9ab9e + 650fa9e commit 259a73b
Show file tree
Hide file tree
Showing 157 changed files with 2,328 additions and 4,165 deletions.
314 changes: 166 additions & 148 deletions .github/CONTRIBUTING.md
View file

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions _maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6864,10 +6864,8 @@
"yD" = (
/obj/structure/rack,
/obj/effect/turf_decal/delivery,
/obj/machinery/alarm/monitor{
dir = 8;
locked = 0;
pixel_x = 24
/obj/machinery/alarm/monitor/directional/east{
locked = 0
},
/obj/item/analyzer,
/turf/simulated/floor/plasteel{
Expand Down
60 changes: 15 additions & 45 deletions _maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -999,8 +999,7 @@
/turf/simulated/floor/plasteel/white,
/area/ruin/ancientstation/proto)
"cW" = (
/obj/machinery/alarm/all_access{
pixel_y = 24;
/obj/machinery/alarm/all_access/directional/north{
report_danger_level = 0
},
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -1202,9 +1201,7 @@
/turf/simulated/wall,
/area/ruin/ancientstation/sec)
"dB" = (
/obj/machinery/alarm/all_access{
dir = 8;
pixel_x = 24;
/obj/machinery/alarm/all_access/directional/east{
report_danger_level = 0
},
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -1702,9 +1699,7 @@
/obj/structure/chair{
dir = 1
},
/obj/machinery/alarm/all_access{
dir = 8;
pixel_x = 24;
/obj/machinery/alarm/all_access/directional/east{
report_danger_level = 0
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -1883,9 +1878,7 @@
/obj/machinery/light/small{
dir = 8
},
/obj/machinery/alarm/all_access{
dir = 4;
pixel_x = -24;
/obj/machinery/alarm/all_access/directional/west{
report_danger_level = 0
},
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -2197,9 +2190,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/alarm/all_access{
dir = 8;
pixel_x = 24;
/obj/machinery/alarm/all_access/directional/east{
report_danger_level = 0
},
/turf/simulated/floor/plasteel,
Expand Down Expand Up @@ -2228,9 +2219,7 @@
"fP" = (
/obj/structure/rack,
/obj/item/clothing/suit/space/nasavoid/old,
/obj/machinery/alarm/all_access{
dir = 8;
pixel_x = 24;
/obj/machinery/alarm/all_access/directional/east{
report_danger_level = 0
},
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -2658,9 +2647,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/alarm/all_access{
dir = 4;
pixel_x = -24;
/obj/machinery/alarm/all_access/directional/west{
report_danger_level = 0
},
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -2873,9 +2860,7 @@
"hj" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/alarm/all_access{
dir = 8;
pixel_x = 24;
/obj/machinery/alarm/all_access/directional/east{
report_danger_level = 0
},
/mob/living/simple_animal/hostile/hivebot,
Expand Down Expand Up @@ -4348,8 +4333,7 @@
/area/ruin/ancientstation/atmo)
"kx" = (
/obj/effect/decal/cleanable/egg_smudge,
/obj/machinery/alarm/all_access{
pixel_y = 24;
/obj/machinery/alarm/all_access/directional/north{
report_danger_level = 0
},
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -4563,9 +4547,7 @@
"lb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/alarm/all_access{
dir = 8;
pixel_x = 24;
/obj/machinery/alarm/all_access/directional/east{
report_danger_level = 0
},
/turf/simulated/floor/plasteel,
Expand Down Expand Up @@ -4635,12 +4617,8 @@
},
/area/ruin/ancientstation/hydroponics)
"lj" = (
/obj/machinery/alarm{
dir = 1;
name = "custom placement";
pixel_y = -22
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/alarm/directional/south,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "greencorner"
Expand Down Expand Up @@ -4828,9 +4806,7 @@
},
/area/ruin/ancientstation/engi)
"lA" = (
/obj/machinery/alarm/all_access{
dir = 4;
pixel_x = -24;
/obj/machinery/alarm/all_access/directional/west{
report_danger_level = 0
},
/obj/structure/rack,
Expand Down Expand Up @@ -4870,9 +4846,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/alarm/all_access{
dir = 4;
pixel_x = -24;
/obj/machinery/alarm/all_access/directional/west{
report_danger_level = 0
},
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -4925,9 +4899,7 @@
/area/ruin/ancientstation/atmo)
"lK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/alarm/all_access{
dir = 8;
pixel_x = 24;
/obj/machinery/alarm/all_access/directional/east{
report_danger_level = 0
},
/mob/living/simple_animal/hostile/hivebot,
Expand All @@ -4952,9 +4924,7 @@
/area/ruin/ancientstation/sec)
"lN" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/alarm/all_access{
dir = 8;
pixel_x = 24;
/obj/machinery/alarm/all_access/directional/east{
report_danger_level = 0
},
/turf/simulated/floor/plasteel,
Expand Down
86 changes: 15 additions & 71 deletions _maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -779,11 +779,7 @@
/turf/simulated/floor/plating,
/area/ruin/unpowered/syndicate_space_base/atmos)
"eD" = (
/obj/machinery/alarm/syndicate{
pixel_x = -24;
name = "Syndie West Air Alarm";
dir = 4
},
/obj/machinery/alarm/syndicate/directional/west,
/obj/structure/closet/radiation,
/turf/simulated/floor/plasteel{
icon_state = "darkgreen";
Expand Down Expand Up @@ -1149,11 +1145,7 @@
/area/ruin/unpowered/syndicate_space_base/chemistry)
"gt" = (
/obj/structure/table/reinforced,
/obj/machinery/alarm/syndicate{
pixel_x = -24;
name = "Syndie West Air Alarm";
dir = 4
},
/obj/machinery/alarm/syndicate/directional/west,
/obj/item/storage/box/monkeycubes/syndicate{
pixel_x = 7;
pixel_y = 7
Expand Down Expand Up @@ -2055,11 +2047,7 @@
/turf/simulated/floor/grass,
/area/ruin/unpowered/syndicate_space_base/service)
"ld" = (
/obj/machinery/alarm/syndicate{
pixel_y = -24;
dir = 1;
name = "Syndie South Air Alarm"
},
/obj/machinery/alarm/syndicate/directional/south,
/turf/simulated/floor/plating,
/area/ruin/unpowered/syndicate_space_base/engineering)
"lo" = (
Expand Down Expand Up @@ -4003,11 +3991,7 @@
/obj/item/reagent_containers/drinks/flask/barflask,
/obj/item/reagent_containers/drinks/flask/barflask,
/obj/structure/table/wood,
/obj/machinery/alarm/syndicate{
pixel_x = -24;
name = "Syndie West Air Alarm";
dir = 4
},
/obj/machinery/alarm/syndicate/directional/west,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
Expand Down Expand Up @@ -4210,11 +4194,7 @@
/obj/machinery/light{
dir = 8
},
/obj/machinery/alarm/syndicate{
pixel_x = -24;
name = "Syndie West Air Alarm";
dir = 4
},
/obj/machinery/alarm/syndicate/directional/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/green{
Expand Down Expand Up @@ -4330,10 +4310,7 @@
},
/area/ruin/unpowered/syndicate_space_base/toxlaunch)
"xO" = (
/obj/machinery/alarm/syndicate{
name = "Syndie North Air Alarm";
pixel_y = 24
},
/obj/machinery/alarm/syndicate/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkblue"
Expand Down Expand Up @@ -5199,10 +5176,7 @@
},
/area/ruin/unpowered/syndicate_space_base/dormitories)
"CR" = (
/obj/machinery/alarm/syndicate{
name = "Syndie North Air Alarm";
pixel_y = 24
},
/obj/machinery/alarm/syndicate/directional/north,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -5546,10 +5520,7 @@
/turf/simulated/floor/plating,
/area/ruin/unpowered/syndicate_space_base/engineering)
"EU" = (
/obj/machinery/alarm/syndicate{
name = "Syndie North Air Alarm";
pixel_y = 24
},
/obj/machinery/alarm/syndicate/directional/north,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
Expand Down Expand Up @@ -5750,11 +5721,7 @@
},
/area/ruin/unpowered/syndicate_space_base/main)
"FP" = (
/obj/machinery/alarm/syndicate{
pixel_x = -24;
name = "Syndie West Air Alarm";
dir = 4
},
/obj/machinery/alarm/syndicate/directional/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/green{
Expand Down Expand Up @@ -6142,10 +6109,7 @@
},
/area/ruin/unpowered/syndicate_space_base/main)
"Ik" = (
/obj/machinery/alarm/syndicate{
name = "Syndie North Air Alarm";
pixel_y = 24
},
/obj/machinery/alarm/syndicate/directional/north,
/turf/simulated/floor/plating,
/area/ruin/unpowered/syndicate_space_base/atmos)
"Il" = (
Expand Down Expand Up @@ -7130,11 +7094,7 @@
/obj/item/handheld_defibrillator,
/obj/item/handheld_defibrillator,
/obj/item/defibrillator,
/obj/machinery/alarm/syndicate{
pixel_x = 24;
name = "Syndie West Air Alarm";
dir = 8
},
/obj/machinery/alarm/syndicate/directional/east,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
Expand Down Expand Up @@ -8144,11 +8104,7 @@
/area/ruin/unpowered/syndicate_space_base/engineering)
"TW" = (
/obj/structure/table,
/obj/machinery/alarm/syndicate{
pixel_y = -24;
dir = 1;
name = "Syndie South Air Alarm"
},
/obj/machinery/alarm/syndicate/directional/south,
/obj/item/stack/sheet/metal/fifty,
/obj/item/storage/toolbox/mechanical,
/obj/item/storage/box/beakers,
Expand Down Expand Up @@ -8255,11 +8211,7 @@
},
/area/ruin/unpowered/syndicate_space_base/arrivals)
"UC" = (
/obj/machinery/alarm/syndicate{
pixel_x = -24;
name = "Syndie West Air Alarm";
dir = 4
},
/obj/machinery/alarm/syndicate/directional/west,
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
dir = 1
Expand Down Expand Up @@ -8577,11 +8529,7 @@
},
/area/ruin/unpowered/syndicate_space_base/virology)
"Wr" = (
/obj/machinery/alarm/syndicate{
pixel_x = 24;
name = "Syndie West Air Alarm";
dir = 8
},
/obj/machinery/alarm/syndicate/directional/east,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -8781,11 +8729,7 @@
"Xn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/alarm/syndicate{
pixel_x = 24;
name = "Syndie West Air Alarm";
dir = 8
},
/obj/machinery/alarm/syndicate/directional/east,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down
Loading

0 comments on commit 259a73b

Please sign in to comment.