Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Ports "Give mood buff for defibbing someone" #14423

Merged
SomeguyManperson merged 13 commits into from Jun 18, 2022
Merged

Ports "Give mood buff for defibbing someone" #14423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
82a331e
Update computer.dm
Jun 2, 2022
3fc045e
Update meat.dm
Jun 4, 2022
7e9c538
Merge branch 'yogstation13:master' into master
Jun 6, 2022
e6e36c9
Merge branch 'yogstation13:master' into master
Jun 7, 2022
db1f407
Update objects.dm
Jun 7, 2022
e43bf46
Merge branch 'yogstation13:master' into master
Jun 8, 2022
fa56816
Merge branch 'yogstation13:master' into master
Jun 9, 2022
335dded
Update generic_positive_events.dm
Jun 14, 2022
cfdac21
Update defib.dm
Jun 14, 2022
82a7d94
Update human.dm
Jun 14, 2022
8458757
Update objects.dm
Jun 14, 2022
d96c17d
Update meat.dm
Jun 14, 2022
b85dd1d
Update computer.dm
Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/datums/mood_events/generic_positive_events.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
special_screen_obj = "honked_nose"
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"
mood_change = 6
timeout = 5 MINUTES
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/defib.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,7 @@
H.emote("gasp")
H.Jitter(100)
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)
if(req_defib)
defib.deductcharge(revivecost)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/human.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@
return

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
log_combat(src, C, "CPRed")
SSachievements.unlock_achievement(/datum/achievement/cpr, client)
Expand Down