cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-16 18:36:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into nanites

Browse Source
This commit is contained in:
Archie
2021-06-16 20:40:14 -03:00
parent 729b31f055 6d6642e06a
commit aa92a9422f
66 changed files with 645 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/cleanable/misc.dm
+4 -4
View File
@@ -98,7 +98,7 @@
. = ..()
if(ismob(O))
radiate()
/obj/effect/decal/cleanable/greenglow/radioactive/proc/radiate()
if(!active)
if(world.time > last_event+15)
@@ -230,19 +230,19 @@
name = "generic glitter pile"
desc = "The herpes of arts and crafts."
icon = 'icons/effects/atmospherics.dmi'
icon_state = "glitter"
gender = NEUTER
/obj/effect/decal/cleanable/glitter/pink
name = "pink glitter"
icon_state = "plasma_old"
color = "#9e0089"
/obj/effect/decal/cleanable/glitter/white
name = "white glitter"
icon_state = "nitrous_oxide_old"
/obj/effect/decal/cleanable/glitter/blue
name = "blue glitter"
icon_state = "freon_old"
color = "#2dd6ff"
/obj/effect/decal/cleanable/plasma
name = "stabilized plasma"