cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ports "Give mood buff for defibbing someone" (#14423)

Browse Source 
* Update computer.dm

* Update meat.dm

* Update objects.dm

* Update generic_positive_events.dm

* Update defib.dm

* Update human.dm

* Update objects.dm

* Update meat.dm

* Update computer.dm
This commit is contained in:
SuperSlayer
2022-06-18 16:20:54 +03:00
committed by GitHub
parent 3217990ed8
commit c264ea025d
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/mood_events/generic_positive_events.dm
View File

@@ -62,7 +62,7 @@
special_screen_obj = "honked_nose" special_screen_obj = "honked_nose"
special_screen_replace = FALSE special_screen_replace = FALSE
/datum/mood_event/perform_cpr /datum/mood_event/saved_life
description = "<span class='nicegreen'>It feels good to save a life.</span>\n" description = "<span class='nicegreen'>It feels good to save a life.</span>\n"
mood_change = 6 mood_change = 6
timeout = 5 MINUTES timeout = 5 MINUTES

1
code/game/objects/items/defib.dm
View File

@@ -624,6 +624,7 @@
H.emote("gasp") H.emote("gasp")
H.Jitter(100) H.Jitter(100)
SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK) SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK)
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "saved_life", /datum/mood_event/saved_life)
log_combat(user, H, "revived", defib) log_combat(user, H, "revived", defib)
if(req_defib) if(req_defib)
defib.deductcharge(revivecost) defib.deductcharge(revivecost)

2
code/modules/mob/living/carbon/human/human.dm
View File

@@ -627,7 +627,7 @@
return return
src.visible_message("[src] performs CPR on [C.name]!", span_notice("You perform CPR on [C.name].")) src.visible_message("[src] performs CPR on [C.name]!", span_notice("You perform CPR on [C.name]."))
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "perform_cpr", /datum/mood_event/perform_cpr) SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "saved_life", /datum/mood_event/saved_life)
C.cpr_time = world.time C.cpr_time = world.time
log_combat(src, C, "CPRed") log_combat(src, C, "CPRed")
SSachievements.unlock_achievement(/datum/achievement/cpr, client) SSachievements.unlock_achievement(/datum/achievement/cpr, client)