Merge pull request #31989 from ninjanomnom/radiation-borg-fix

Fixes silicon mob contents becoming contaminated
This commit is contained in:
oranges
2017-10-22 16:21:24 +13:00
committed by CitadelStationBot
parent 3e1c307e4e
commit bc5c548e9b
3 changed files with 18 additions and 2 deletions
+8 -1
View File
@@ -11,7 +11,14 @@
return
for(var/i in 1 to location.contents.len)
var/static/list/ignored_things = typecacheof(list(/mob/dead, /obj/effect, /obj/docking_port, /turf, /atom/movable/lighting_object, /mob/camera))
var/static/list/ignored_things = typecacheof(list( // These types will never have radiation applied to them or be looked inside of
/mob/dead,
/mob/camera,
/obj/effect,
/obj/docking_port,
/atom/movable/lighting_object
))
var/atom/thing = location.contents[i]
if(ignored_things[thing.type])
continue
+6 -1
View File
@@ -89,7 +89,12 @@
continue
thing.rad_act(strength)
var/static/list/blacklisted = typecacheof(list(/turf, /mob, /obj/structure/cable, /obj/machinery/atmospherics))
var/static/list/blacklisted = typecacheof(list( //These types will never be contaminated
/turf,
/mob,
/obj/structure/cable,
/obj/machinery/atmospherics
))
if(!can_contaminate || blacklisted[thing.type])
continue
if(prob((strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_CHANCE_COEFFICIENT * min(1/(steps*range_modifier), 1))) // Only stronk rads get to have little baby rads
@@ -47,6 +47,10 @@
diag_hud_set_status()
diag_hud_set_health()
/mob/living/silicon/ComponentInitialize()
. = ..()
AddComponent(/datum/component/rad_insulation, RAD_NO_INSULATION, TRUE, TRUE)
/mob/living/silicon/med_hud_set_health()
return //we use a different hud