Merge branch 'master' into upstream-merge-14220

This commit is contained in:
Razgriz
2023-01-21 22:24:10 -07:00
committed by GitHub
475 changed files with 172406 additions and 165035 deletions
@@ -38,7 +38,7 @@
icon_state = "dirt"
mouse_opacity = 0
/obj/effect/decal/cleanable/Initialize(var/mapload, var/_age)
/obj/effect/decal/cleanable/dirt/Initialize(var/mapload, var/_age) //CHOMPEdit
.=..()
var/turf/simulated/our_turf = src.loc
if(our_turf && istype(our_turf) && our_turf.can_dirty && _age)
@@ -8,6 +8,10 @@
/obj/effect/landmark/vermin
name = "verminstart"
/obj/effect/landmark/wildlife
name = "wildlife"
var/wildlife_type = 2 //1 for water, 2 for land; thats all for now
/obj/effect/landmark/late_antag
name = "Antag Latespawn"
var/antag_id