cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates Intents

Browse Source
This commit is contained in:
Sam
2017-06-10 09:43:36 +01:00
parent c1cc319f62
commit 4d57fff5c9
94 changed files with 200 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+1 -1
View File
@@ -151,7 +151,7 @@
return 1
if (!is_type_in_list(I, blend_items) && !is_type_in_list(I, juice_items))
if(user.a_intent == I_HARM)
if(user.a_intent == INTENT_HARM)
return ..()
else
to_chat(user, "<span class='warning'>Cannot refine into a reagent!</span>")
code/modules/reagents/chemistry/reagents/misc.dm
+2 -2
View File
@@ -373,8 +373,8 @@
color = "#FF83A5"
/datum/reagent/love/on_mob_life(mob/living/M)
if(M.a_intent == I_HARM)
M.a_intent = I_HELP
if(M.a_intent == INTENT_HARM)
M.a_intent = INTENT_HELP
if(prob(8))
var/lovely_phrase = pick("appreciated", "loved", "pretty good", "really nice", "pretty happy with yourself, even though things haven't always gone as well as they could")