cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-09 15:05:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #691 from ArchieBeepBoop/radioactivedecal

Browse Source 
Adds a radioactive type of greenglow cleanable decal
This commit is contained in:
Dahlular
2020-11-21 22:52:05 -07:00
committed by GitHub
parent 09a02bedc7 a2089ee778
commit 7ca1b3084b
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/meteor/meteors.dm
+1 -1
View File
@@ -265,7 +265,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
/obj/effect/meteor/irradiated/meteor_effect()
..()
explosion(src.loc, 0, 0, 4, 3, 0)
new /obj/effect/decal/cleanable/greenglow(get_turf(src))
new /obj/effect/decal/cleanable/greenglow/radioactive(get_turf(src))
radiation_pulse(src, 500)
//Meaty Ore
code/game/objects/effects/decals/cleanable/misc.dm
+23
View File
@@ -84,6 +84,29 @@
. = ..()
set_light(2, 0.8, "#22FFAA")
/obj/effect/decal/cleanable/greenglow/radioactive
name = "radioactive hazard"
desc = "You should really clean this up..."
var/rad_pulse_strength = 5
var/last_event = 0
var/active = null
/obj/effect/decal/cleanable/greenglow/radioactive/Crossed(atom/movable/O)
. = ..()
if(ismob(O))
radiate()
/obj/effect/decal/cleanable/greenglow/radioactive/proc/radiate()
if(!active)
if(world.time > last_event+15)
active = 1
radiation_pulse(src, rad_pulse_strength)
for(var/obj/effect/decal/cleanable/greenglow/radioactive/T in orange(1,src))
T.radiate()
last_event = world.time
active = 0
return
/obj/effect/decal/cleanable/greenglow/ex_act()
return
code/modules/reagents/chemistry/reagents/other_reagents.dm
+4 -4
View File
@@ -1096,9 +1096,9 @@
/datum/reagent/radium/reaction_turf(turf/T, reac_volume)
if(reac_volume >= 3)
if(!isspaceturf(T))
var/obj/effect/decal/cleanable/greenglow/GG = locate() in T.contents
var/obj/effect/decal/cleanable/greenglow/radioactive/GG = locate() in T.contents
if(!GG)
GG = new/obj/effect/decal/cleanable/greenglow(T)
GG = new/obj/effect/decal/cleanable/greenglow/radioactive(T)
GG.reagents.add_reagent("radium", reac_volume)
/datum/reagent/space_cleaner/sterilizine
@@ -1186,9 +1186,9 @@
/datum/reagent/uranium/reaction_turf(turf/T, reac_volume)
if(reac_volume >= 3)
if(!isspaceturf(T))
var/obj/effect/decal/cleanable/greenglow/GG = locate() in T.contents
var/obj/effect/decal/cleanable/greenglow/radioactive/GG = locate() in T.contents
if(!GG)
GG = new/obj/effect/decal/cleanable/greenglow(T)
GG = new/obj/effect/decal/cleanable/greenglow/radioactive(T)
GG.reagents.add_reagent("uranium", reac_volume)
/datum/reagent/bluespace