mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-27 07:08:55 +01:00
Merge branch 'master' into upstream-merge-14220
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user