cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 16:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Paxazide stops harm intent (#16940)

Browse Source 
* Paxazide stops harm intent

* Update code/modules/mob/living/life.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
Doxxmedearly
2023-08-04 11:31:42 +00:00
committed by GitHub
co-authored by SleepyGemmy
parent 4ec7b336c5
commit 21f92e65fd
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_helpers.dm
+6
View File
@@ -41,6 +41,12 @@
#undef HUMAN_EATING_NO_MOUTH
#undef HUMAN_EATING_BLOCKED_MOUTH
/mob/living/carbon/human/set_intent(var/set_intent)
if(is_pacified() && set_intent == I_HURT && !is_berserk())
to_chat(src, SPAN_WARNING("You don't want to harm other beings!"))
return
..()
/mob/living/carbon/human/proc/update_equipment_vision()
flash_protection = 0
equipment_tint_total = 0
code/modules/mob/living/life.dm
+2 -2
View File
@@ -107,8 +107,8 @@
//Ears
handle_hearing()
if((is_pacified()) && a_intent == I_HURT)
to_chat(src, "<span class='notice'>You don't feel like harming anybody.</span>")
if((is_pacified()) && a_intent == I_HURT && !is_berserk())
to_chat(src, SPAN_NOTICE("You don't feel like harming anybody."))
a_intent_change(I_HELP)
//this handles hud updates. Calls update_vision() and handle_hud_icons()