Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 312ef35

Browse files
fluffe9911fluffe9911
committed
Merge branch 'master' into goat_memes
2 parents c118d5d + 13c2a17 commit 312ef35

498 files changed

Lines changed: 11694 additions & 126970 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,7 @@
1818
#Partheo
1919
#/yogstation/icons/ @Partheo
2020

21-
#ThatLing
21+
#AsV9
2222

23-
/code/__DEFINES/tick.dm @ThatLing
24-
/code/controllers/admin.dm @ThatLing
25-
/code/controllers/failsafe.dm @ThatLing
26-
/code/controllers/subsystem.dm @ThatLing
27-
/code/controllers/subsystem/ @ThatLing
28-
/code/modules/keybindings/ @ThatLing
29-
/yogstation/code/controllers/ @ThatLing
30-
/yogstation/code/modules/keybindings/ @ThatLing
31-
32-
#Multiple Owners
33-
34-
/code/__DEFINES/MC.dm @AsV9 @ThatLing
35-
/code/controllers/master.dm @AsV9 @ThatLing
23+
/code/__DEFINES/MC.dm @AsV9
24+
/code/controllers/master.dm @AsV9

‎_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm‎

Lines changed: 38 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@
129129
/obj/machinery/chem_dispenser/fullupgrade,
130130
/turf/open/floor/plasteel,
131131
/area/ruin/unpowered/syndicate_lava_base/chemistry)
132+
"aQ" = (
133+
/obj/effect/decal/cleanable/dirt,
134+
/obj/machinery/light/small,
135+
/turf/open/floor/plasteel,
136+
/area/ruin/unpowered/syndicate_lava_base/arrivals)
132137
"aW" = (
133138
/obj/effect/turf_decal/tile/red,
134139
/obj/effect/turf_decal/tile/red{
@@ -694,6 +699,12 @@
694699
/obj/effect/turf_decal/tile/neutral{
695700
dir = 8
696701
},
702+
/obj/item/paper/crumpled{
703+
info = "Explosive testing on site is STRICTLY forbidden, as this outpost's walls are lined with explosives intended for intentional self-destruct purposes that may be set off prematurely through careless experiments.";
704+
name = "Explosives Testing Warning";
705+
pixel_x = -6;
706+
pixel_y = -3
707+
},
697708
/turf/open/floor/plasteel/dark,
698709
/area/ruin/unpowered/syndicate_lava_base/testlab)
699710
"ep" = (
@@ -6206,6 +6217,18 @@
62066217
/obj/structure/sign/departments/chemistry,
62076218
/turf/closed/wall/mineral/plastitanium/nodiagonal,
62086219
/area/ruin/unpowered/syndicate_lava_base/testlab)
6220+
"pQ" = (
6221+
/obj/structure/sign/warning/explosives/alt{
6222+
pixel_x = 32
6223+
},
6224+
/turf/open/floor/circuit/red,
6225+
/area/ruin/unpowered/syndicate_lava_base/main)
6226+
"qG" = (
6227+
/obj/structure/sign/warning/explosives/alt{
6228+
pixel_x = -32
6229+
},
6230+
/turf/open/floor/engine,
6231+
/area/ruin/unpowered/syndicate_lava_base/testlab)
62096232
"tW" = (
62106233
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
62116234
/turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -6251,6 +6274,12 @@
62516274
},
62526275
/turf/open/floor/engine,
62536276
/area/ruin/unpowered/syndicate_lava_base/testlab)
6277+
"DL" = (
6278+
/obj/structure/sign/warning/explosives/alt{
6279+
pixel_x = 32
6280+
},
6281+
/turf/open/floor/engine,
6282+
/area/ruin/unpowered/syndicate_lava_base/testlab)
62546283
"EZ" = (
62556284
/obj/machinery/door/airlock/external{
62566285
req_access_txt = "150"
@@ -6276,15 +6305,6 @@
62766305
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
62776306
/turf/open/floor/engine,
62786307
/area/ruin/unpowered/syndicate_lava_base/testlab)
6279-
"Pa" = (
6280-
/obj/effect/turf_decal/tile/red,
6281-
/obj/effect/turf_decal/tile/red{
6282-
dir = 8
6283-
},
6284-
/turf/open/floor/plasteel/white/corner{
6285-
dir = 4
6286-
},
6287-
/area/ruin/unpowered/syndicate_lava_base/arrivals)
62886308
"RE" = (
62896309
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
62906310
dir = 9
@@ -7184,7 +7204,7 @@ ae
71847204
ae
71857205
aq
71867206
aq
7187-
aq
7207+
qG
71887208
dc
71897209
aq
71907210
dQ
@@ -7434,7 +7454,7 @@ ae
74347454
ae
74357455
aq
74367456
aq
7437-
aq
7457+
DL
74387458
di
74397459
aq
74407460
dS
@@ -7564,8 +7584,8 @@ my
75647584
jy
75657585
nt
75667586
nW
7567-
oo
7568-
ox
7587+
aW
7588+
mT
75697589
ab
75707590
ab
75717591
ab
@@ -7615,7 +7635,7 @@ jy
76157635
nu
76167636
nX
76177637
oo
7618-
ox
7638+
mT
76197639
ab
76207640
ab
76217641
ab
@@ -7663,8 +7683,8 @@ jy
76637683
jy
76647684
mX
76657685
nv
7666-
nX
7667-
aW
7686+
aQ
7687+
mT
76687688
mT
76697689
ab
76707690
ab
@@ -7714,7 +7734,6 @@ mz
77147734
mY
77157735
nw
77167736
nZ
7717-
Pa
77187737
mT
77197738
ab
77207739
ab
@@ -7723,6 +7742,7 @@ ab
77237742
ab
77247743
ab
77257744
ab
7745+
ab
77267746
aa
77277747
"}
77287748
(29,1,1) = {"
@@ -8198,7 +8218,7 @@ hl
81988218
hU
81998219
ha
82008220
it
8201-
iJ
8221+
pQ
82028222
jd
82038223
ha
82048224
jw

‎_maps/RandomRuins/SpaceRuins/listeningstation.dmm‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -877,15 +877,13 @@
877877
/obj/machinery/syndicatebomb/self_destruct{
878878
anchored = 1
879879
},
880-
/obj/structure/sign/warning/securearea{
881-
desc = "A warning sign which reads 'DANGER: SELF DESTRUCT DEVICE'.";
882-
name = "DANGER: SELF DESTRUCT DEVICE";
883-
pixel_x = 32
884-
},
885880
/obj/machinery/door/window/brigdoor{
886881
dir = 8;
887882
req_access_txt = "150"
888883
},
884+
/obj/structure/sign/warning/explosives/alt{
885+
pixel_x = 32
886+
},
889887
/turf/open/floor/circuit/red,
890888
/area/ruin/space/has_grav/listeningstation)
891889
"bm" = (

0 commit comments

Comments
 (0)