12/21 modernizations from TG live (#103)
* sync (#3) * shuttle auto call * Merge /vore into /master (#39) * progress * Compile errors fixed No idea if it's test worthy tho as conflicts with race overhaul and narky removal. * Update admins.txt * efforts continue Fuck grab code, seriously * grab code is cancer * Execute the Narkism Do not hesitate. Show no mercy. * holy shit grab code is awful * have I bitched about grab code My bitching, let me show you it * código de agarre es una mierda No really it is * yeah I don't even know anymore. * Lolnope. Fuck grab code * I'm not even sure what to fix anymore * Self eating is not an acceptable fate * Taste the void, son. * My code doesn't pass it's own sanity check. Maybe it's a sign of things to come. * uncommented and notes * It Works and I Don't Know Why (#38) * shuttle auto call * it works and I don't know why * Subsystem 12/21 Most Recent TG subsystem folder * globalvars 12/21 Tossed out the flavor_misc and parallax files * Onclick 12/21 as well as .dme updates * _defines 12/21 ommited old _MC.dm * _HELPERS 12/21 Preserved snowflake placement of furry sprites * _defeines/genetics reapplied narkism holdover for snowflake races. * Oops forgot mutant colors * modules porting 12/21 + Sounds/icons Admin, Client and most of mob life files ommitted * enviroment file * Admin optimizations ahelp log system kept * Mob ports 12/21 Flavor text preserved * datums ported 12/21 * Game ported 12/21 * batch of duplicate fixes/dogborg work Dogborgs need to be modernized to refractored borg standards. * moar fixes * Maps and futher compile fixes
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
/proc/radiation_pulse(turf/epicenter, heavy_range, light_range, severity, log=0)
|
||||
if(!epicenter || !severity) return
|
||||
|
||||
if(!istype(epicenter, /turf))
|
||||
if(!isturf(epicenter))
|
||||
epicenter = get_turf(epicenter.loc)
|
||||
|
||||
if(heavy_range > light_range)
|
||||
@@ -29,9 +29,25 @@
|
||||
/atom/proc/rad_act(var/severity)
|
||||
return 1
|
||||
|
||||
/mob/living/rad_act(amount)
|
||||
/mob/living/rad_act(amount, silent = 0)
|
||||
if(amount)
|
||||
var/blocked = run_armor_check(null, "rad", "Your clothes feel warm.", "Your clothes feel warm.")
|
||||
var/blocked = getarmor(null, "rad")
|
||||
|
||||
if(!silent)
|
||||
src << "Your skin feels warm."
|
||||
|
||||
apply_effect(amount, IRRADIATE, blocked)
|
||||
for(var/obj/I in src) //Radiation is also applied to items held by the mob
|
||||
I.rad_act(amount)
|
||||
|
||||
/mob/living/carbon/rad_act(amount, silent = 0)
|
||||
if(dna && (RADIMMUNE in dna.species.species_traits))
|
||||
silent = TRUE
|
||||
..()
|
||||
|
||||
//Silicons will inherently not get irradiated due to having an empty handle_mutations_and_radiation, but they need to not hear this
|
||||
/mob/living/silicon/rad_act(amount)
|
||||
. = ..(amount, TRUE)
|
||||
|
||||
/mob/living/simple_animal/bot/rad_act(amount)
|
||||
. = ..(amount, TRUE)
|
||||
Reference in New Issue
Block a user