Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051
[MIRROR] More radiation balance changes and fixes
This commit is contained in:
@@ -13,6 +13,20 @@
|
||||
item_color = "engineering" //Determines used sprites: hardsuit[on]-[color] and hardsuit[on]-[color]2 (lying down sprite)
|
||||
actions_types = list(/datum/action/item_action/toggle_helmet_light)
|
||||
|
||||
var/rad_count = 0
|
||||
var/rad_record = 0
|
||||
var/grace_count = 0
|
||||
var/datum/looping_sound/geiger/soundloop
|
||||
|
||||
/obj/item/clothing/head/helmet/space/hardsuit/Initialize()
|
||||
. = ..()
|
||||
soundloop = new(list(), FALSE, TRUE)
|
||||
soundloop.volume = 5
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
/obj/item/clothing/head/helmet/space/hardsuit/Destroy()
|
||||
. = ..()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
|
||||
/obj/item/clothing/head/helmet/space/hardsuit/attack_self(mob/user)
|
||||
on = !on
|
||||
@@ -31,6 +45,7 @@
|
||||
..()
|
||||
if(suit)
|
||||
suit.RemoveHelmet()
|
||||
soundloop.stop(user)
|
||||
|
||||
/obj/item/clothing/head/helmet/space/hardsuit/item_action_slot_check(slot)
|
||||
if(slot == slot_head)
|
||||
@@ -41,8 +56,11 @@
|
||||
if(slot != slot_head)
|
||||
if(suit)
|
||||
suit.RemoveHelmet()
|
||||
soundloop.stop(user)
|
||||
else
|
||||
qdel(src)
|
||||
else
|
||||
soundloop.start(user)
|
||||
|
||||
/obj/item/clothing/head/helmet/space/hardsuit/proc/display_visor_message(var/msg)
|
||||
var/mob/wearer = loc
|
||||
@@ -50,9 +68,22 @@
|
||||
wearer.show_message("[icon2html(src, wearer)]<b><span class='robot'>[msg]</span></b>", 1)
|
||||
|
||||
/obj/item/clothing/head/helmet/space/hardsuit/rad_act(severity)
|
||||
..()
|
||||
if(severity > RAD_AMOUNT_EXTREME)
|
||||
display_visor_message("Radiation pulse detected! Magnitude: <span class='green'>[severity]</span> RADs.")
|
||||
. = ..()
|
||||
rad_count += severity
|
||||
|
||||
/obj/item/clothing/head/helmet/space/hardsuit/process()
|
||||
if(!rad_count)
|
||||
grace_count++
|
||||
if(grace_count == 2)
|
||||
soundloop.last_radiation = 0
|
||||
return
|
||||
|
||||
grace_count = 0
|
||||
rad_record -= rad_record/5
|
||||
rad_record += rad_count/5
|
||||
rad_count = 0
|
||||
|
||||
soundloop.last_radiation = rad_record
|
||||
|
||||
/obj/item/clothing/head/helmet/space/hardsuit/emp_act(severity)
|
||||
..()
|
||||
|
||||
@@ -112,8 +112,9 @@
|
||||
item_state = "bombsuit_white"
|
||||
|
||||
/*
|
||||
* Radiation protection
|
||||
*/
|
||||
* Radiation protection
|
||||
*/
|
||||
|
||||
/obj/item/clothing/head/radiation
|
||||
name = "radiation hood"
|
||||
icon_state = "rad"
|
||||
|
||||
Reference in New Issue
Block a user