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

Standardized intent names so it's all harm. Fuck you hurt.

Browse Source
This commit is contained in:
ZomgPonies
2014-01-19 08:30:50 -05:00
parent 09e74e4406
commit 90496be20a
39 changed files with 55 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Sayu/programmable.dm
+1 -1
View File
@@ -502,7 +502,7 @@
H << "The boxing machine refuses to acknowledge you unless you face it head on!"
return
var/damage = 0
if(H.a_intent != "hurt")
if(H.a_intent != "harm")
damage += rand(0,5)
else
damage += rand(0,10)
code/WorkInProgress/ZomgPonies/mobs/metroid/powers.dm
+3 -3
View File
@@ -178,7 +178,7 @@
var/mob/living/carbon/slime/adult/new_slime = new adulttype(loc)
new_slime.nutrition = nutrition
new_slime.powerlevel = max(0, powerlevel-1)
new_slime.a_intent = "hurt"
new_slime.a_intent = "harm"
new_slime.key = key
new_slime.universal_speak = universal_speak
new_slime << "<B>You are now an adult slime.</B>"
@@ -242,7 +242,7 @@
babies += M
var/mob/living/carbon/slime/new_slime = pick_n_take(babies)
new_slime.a_intent = "hurt"
new_slime.a_intent = "harm"
new_slime.universal_speak = universal_speak
new_slime.key = key
@@ -255,7 +255,7 @@
var/mob/dead/observer/picked = pick(candidates)
var/mob/living/carbon/slime/S = pick(babies)
S.key = picked
S.a_intent = "hurt"
S.a_intent = "harm"
S.universal_speak = universal_speak
S << "<B>You are now a slime!</B>"