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

Commit e5681f9

Browse files
committed
TGS Test Merge (#21221)
For an event round (Chubby said its safe to use)
2 parents 8a154e7 + ce3ad15 commit e5681f9

File tree

1,514 files changed

+171078
-149011
lines changed

Some content is hidden

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

1,514 files changed

+171078
-149011
lines changed

.github/guides/HARDDELETES.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ So then, we want to temporarily remember to clear a reference when it's deleted
243243

244244
This is where I might lose you, but we're gonna use signals
245245

246-
`qdel()`, the proc that sets off this whole deletion business, sends a signal called `COMSIG_PARENT_QDELETING`
246+
`qdel()`, the proc that sets off this whole deletion business, sends a signal called `COMSIG_QDELETING`
247247

248248
We can listen for that signal, and if we hear it clear whatever reference we may have
249249

@@ -255,10 +255,10 @@ Here's an example
255255
256256
/somemob/proc/set_target(new_target)
257257
if(target)
258-
UnregisterSignal(target, COMSIG_PARENT_QDELETING) //We need to make sure any old signals are cleared
258+
UnregisterSignal(target, COMSIG_QDELETING) //We need to make sure any old signals are cleared
259259
target = new_target
260260
if(target)
261-
RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clear_target)) //Call clear_target if target is ever qdel()'d
261+
RegisterSignal(target, COMSIG_QDELETING, PROC_REF(clear_target)) //Call clear_target if target is ever qdel()'d
262262
263263
/somemob/proc/clear_target(datum/source)
264264
SIGNAL_HANDLER

_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
/turf/open/floor/wood,
9494
/area/ruin/unpowered)
9595
"s" = (
96-
/obj/effect/decal/cleanable/trail_holder,
96+
/obj/effect/decal/cleanable/blood/trail_holder,
9797
/turf/open/floor/wood,
9898
/area/ruin/unpowered)
9999
"u" = (

_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,8 +1697,7 @@
16971697
/area/ruin/syndicate_icemoon/medical)
16981698
"lY" = (
16991699
/obj/machinery/atmospherics/pipe/layer_manifold{
1700-
dir = 4;
1701-
level = 2
1700+
dir = 4
17021701
},
17031702
/turf/closed/wall/mineral/plastitanium/nodiagonal,
17041703
/area/ruin/syndicate_icemoon/engine)

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242
/area/icemoon/underground/explored)
243243
"ut" = (
244244
/obj/item/flashlight/lantern{
245-
on = 1
245+
light_on = 1
246246
},
247247
/obj/effect/decal/cleanable/dirt,
248248
/turf/open/floor/wood,

_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
/obj/effect/decal/cleanable/dirt/dust,
190190
/obj/item/paper/secretrecipe,
191191
/obj/item/flashlight/lantern/jade{
192-
on = 1
192+
light_on = 1
193193
},
194194
/turf/open/floor/plasteel/cult,
195195
/area/ruin/unpowered/buried_library)
@@ -344,7 +344,7 @@
344344
/area/icemoon/underground/explored)
345345
"bz" = (
346346
/obj/item/flashlight/lantern/jade{
347-
on = 1
347+
light_on = 1
348348
},
349349
/turf/open/floor/plating,
350350
/area/ruin/unpowered/buried_library)

_maps/RandomRuins/IceRuins/icemoon_underground_mining_site.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/area/template_noop)
1212
"f" = (
1313
/obj/item/flashlight/lantern{
14-
on = 1
14+
light_on = 1
1515
},
1616
/turf/open/floor/plating/ice/icemoon,
1717
/area/icemoon/underground/explored)

_maps/RandomRuins/JungleRuins/jungleland_jungle_garden.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
/area/template_noop)
6868
"A" = (
6969
/obj/structure/window/paperframe{
70-
CanAtmosPass = 0
70+
can_atmos_pass = 0
7171
},
7272
/turf/open/floor/wood/jungle,
7373
/area/template_noop)

_maps/RandomRuins/JungleRuins/jungleland_jungle_ivymen_nest.dmm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
/area/jungleland/explored)
3939
"ai" = (
4040
/obj/item/flashlight/lantern{
41-
on = 1
41+
light_on = 1
4242
},
4343
/turf/open/indestructible/grass,
4444
/area/ruin/unpowered/ivymen)
@@ -50,7 +50,7 @@
5050
/turf/open/floor/plating/dirt/jungleland/jungle,
5151
/area/ruin/unpowered/ivymen)
5252
"al" = (
53-
/turf/closed/indestructible/rock/wood,
53+
/turf/closed/indestructible/wood,
5454
/area/ruin/unpowered/ivymen)
5555
"am" = (
5656
/obj/machinery/iv_drip,
@@ -214,7 +214,7 @@
214214
/area/ruin/unpowered/ivymen)
215215
"uo" = (
216216
/obj/item/flashlight/lantern{
217-
on = 1
217+
light_on = 1
218218
},
219219
/turf/open/floor/plating/dirt/jungleland/jungle,
220220
/area/jungleland/explored)

_maps/RandomRuins/JungleRuins/jungleland_jungle_tartemple.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"t" = (
8383
/obj/structure/stone_tile/slab,
8484
/obj/item/flashlight/lantern{
85-
on = 1
85+
light_on = 1
8686
},
8787
/turf/open/floor/plating/dirt/jungleland/barren_rocks,
8888
/area/ruin/unpowered/tar_temple)

_maps/RandomRuins/JungleRuins/jungleland_jungle_xenos.dmm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
/turf/open/floor/plating/dirt/jungleland/jungle,
165165
/area/template_noop)
166166
"aV" = (
167-
/turf/closed/indestructible/rock/wood,
167+
/turf/closed/indestructible/wood,
168168
/area/ruin/unpowered)
169169
"aW" = (
170170
/obj/structure/flora/grass/jungle/b,
@@ -218,7 +218,7 @@
218218
/turf/open/floor/plating/dirt/jungleland/jungle,
219219
/area/ruin/unpowered)
220220
"uP" = (
221-
/turf/closed/indestructible/rock/wood,
221+
/turf/closed/indestructible/wood,
222222
/area/template_noop)
223223
"vl" = (
224224
/obj/structure/mineral_door/wood,
@@ -275,7 +275,7 @@
275275
/obj/structure/sign/warning{
276276
desc = "A warning sign denoting landmines ahead."
277277
},
278-
/turf/closed/indestructible/rock/wood,
278+
/turf/closed/indestructible/wood,
279279
/area/template_noop)
280280
"Ou" = (
281281
/obj/structure/alien/weeds,

0 commit comments

Comments
 (0)