mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 19:47:22 +01:00
Radiation Refactor (#15331)
* First Commit * visible radiation and engine goggles * correction * t-ray fix * further adjustments and fixups * gieger addition and cleaning fixup * yet more fixes * styling fixes * fixes * human glowing fix * do the merge conflict avoidance dance * Update supermatter.dm * supermatter rads * mapping in * radiation doors * yeah yeah line endings * clean up * styling issues * showers
This commit is contained in:
@@ -409,7 +409,7 @@
|
||||
to_chat(M, "<span class = 'danger'><font face='[pick("Curlz MT", "Comic Sans MS")]' size='[rand(4,6)]'>You feel FUCKED UP!!!!!!</font></span>")
|
||||
M << 'sound/effects/singlebeat.ogg'
|
||||
M.emote("faint")
|
||||
M.apply_effect(5, IRRADIATE, negate_armor = 1)
|
||||
M.apply_effect(5, IRRADIATE)
|
||||
M.adjustToxLoss(5)
|
||||
M.adjustBrainLoss(10)
|
||||
else
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
|
||||
/datum/reagent/radium/on_mob_life(mob/living/M)
|
||||
if(M.radiation < 80)
|
||||
M.apply_effect(4, IRRADIATE, negate_armor = 1)
|
||||
M.apply_effect(4, IRRADIATE)
|
||||
return ..()
|
||||
|
||||
/datum/reagent/radium/reaction_turf(turf/T, volume)
|
||||
@@ -190,7 +190,7 @@
|
||||
/datum/reagent/mutagen/on_mob_life(mob/living/M)
|
||||
if(!M.dna)
|
||||
return //No robots, AIs, aliens, Ians or other mobs should be affected by this.
|
||||
M.apply_effect(2*REAGENTS_EFFECT_MULTIPLIER, IRRADIATE, negate_armor = 1)
|
||||
M.apply_effect(2 * REAGENTS_EFFECT_MULTIPLIER, IRRADIATE)
|
||||
if(prob(4))
|
||||
randmutb(M)
|
||||
return ..()
|
||||
@@ -215,7 +215,7 @@
|
||||
/datum/reagent/stable_mutagen/on_mob_life(mob/living/M)
|
||||
if(!ishuman(M) || !M.dna)
|
||||
return
|
||||
M.apply_effect(2*REAGENTS_EFFECT_MULTIPLIER, IRRADIATE, negate_armor = 1)
|
||||
M.apply_effect(2 * REAGENTS_EFFECT_MULTIPLIER, IRRADIATE)
|
||||
if(current_cycle == 10 && islist(data))
|
||||
if(istype(data["dna"], /datum/dna))
|
||||
var/mob/living/carbon/human/H = M
|
||||
@@ -241,7 +241,7 @@
|
||||
taste_description = "the inside of a reactor"
|
||||
|
||||
/datum/reagent/uranium/on_mob_life(mob/living/M)
|
||||
M.apply_effect(2, IRRADIATE, negate_armor = 1)
|
||||
M.apply_effect(2, IRRADIATE)
|
||||
return ..()
|
||||
|
||||
/datum/reagent/uranium/reaction_turf(turf/T, volume)
|
||||
@@ -472,7 +472,7 @@
|
||||
taste_mult = 0
|
||||
|
||||
/datum/reagent/polonium/on_mob_life(mob/living/M)
|
||||
M.apply_effect(8, IRRADIATE, negate_armor = 1)
|
||||
M.apply_effect(8, IRRADIATE)
|
||||
return ..()
|
||||
|
||||
/datum/reagent/histamine
|
||||
@@ -1182,7 +1182,7 @@
|
||||
M.UpdateAppearance()
|
||||
|
||||
/datum/reagent/glowing_slurry/on_mob_life(mob/living/M)
|
||||
M.apply_effect(2, IRRADIATE, 0, negate_armor = 1)
|
||||
M.apply_effect(2, IRRADIATE)
|
||||
if(!M.dna)
|
||||
return
|
||||
var/did_mutation = FALSE
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
temperature_min = 270
|
||||
temperature_max = 350
|
||||
var/ignore_flags = FALSE
|
||||
var/emagged = FALSE
|
||||
var/applied_amount = 8 // How much it applies
|
||||
var/applying = FALSE // So it can't be spammed.
|
||||
var/measured_health = 0 // Used for measuring health; we don't want this to stop applying once the person's health isn't changing.
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
container_type = OPENCONTAINER
|
||||
slot_flags = SLOT_BELT
|
||||
var/ignore_flags = FALSE
|
||||
var/emagged = FALSE
|
||||
var/safety_hypo = FALSE
|
||||
|
||||
/obj/item/reagent_containers/hypospray/attack(mob/living/M, mob/user)
|
||||
|
||||
Reference in New Issue
Block a user