cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for "the floor emits a pulse of energy"

Browse Source 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
caelaislinn
2012-06-24 11:45:51 +10:00
parent 2ef4379765
commit 639c00fb66
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/research/artifact_effect.dm
View File

@@ -72,8 +72,8 @@
H.update_body() H.update_body()
H.update_face() H.update_face()
H.UpdateDamageIcon() H.UpdateDamageIcon()
return 1 return 1
// //
if (istype(user, /mob/living/carbon/monkey/)) if (istype(user, /mob/living/carbon/monkey/))
user << "\blue You feel a soothing energy invigorate you." user << "\blue You feel a soothing energy invigorate you."
user.adjustOxyLoss(-25) user.adjustOxyLoss(-25)
@@ -81,6 +81,7 @@
user.adjustBruteLoss(-25) user.adjustBruteLoss(-25)
user.adjustFireLoss(-25) user.adjustFireLoss(-25)
user.adjustBrainLoss(-25) user.adjustBrainLoss(-25)
return 1
else user << "Nothing happens." else user << "Nothing happens."
if("injure") if("injure")
if (istype(user, /mob/living/carbon/)) if (istype(user, /mob/living/carbon/))

4
code/modules/research/artifacts.dm
View File

@@ -179,7 +179,7 @@
my_effect.UpdateEffect(src.loc) my_effect.UpdateEffect(src.loc)
//activate //activate
if(src.charged && my_effect.DoEffect(src.loc)) if(src.charged && my_effect.DoEffect(src))
src.charged = 0 src.charged = 0
src.chargetime = src.recharge src.chargetime = src.recharge
@@ -207,7 +207,7 @@
else if (my_effect.trigger != "touch" && !src.activated) user << "Nothing happens." else if (my_effect.trigger != "touch" && !src.activated) user << "Nothing happens."
if (my_effect.effectmode == "contact" && src.activated && src.charged) if (my_effect.effectmode == "contact" && src.activated && src.charged)
my_effect.DoEffect(src.loc) my_effect.DoEffect(src)
src.charged = 0 src.charged = 0
src.chargetime = src.recharge src.chargetime = src.recharge