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

Merge pull request #3758 from Fox-McCloud/remove-halloss

Browse Source 
Removes Halloss
This commit is contained in:
TheDZD
2016-03-05 22:39:19 -05:00
parent ab490f7fd9 c98e2ff7ce
commit 4b610d8dda
17 changed files with 19 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/gun.dm
View File

@@ -300,7 +300,7 @@
user.death()
else
user << "<span class = 'notice'>Ow...</span>"
user.apply_effect(110,AGONY,0)
user.apply_effect(110,STAMINA,0)
del(in_chamber)
mouthshoot = 0
return

3
code/modules/projectiles/projectile.dm
View File

@@ -51,7 +51,6 @@
var/stutter = 0
var/eyeblur = 0
var/drowsy = 0
var/agony = 0
var/stamina = 0
var/jitter = 0
var/embed = 0 // whether or not the projectile can embed itself in the mob
@@ -87,7 +86,7 @@
if(!isliving(target)) return 0
if(isanimal(target)) return 0
var/mob/living/L = target
return L.apply_effects(stun, weaken, paralyze, irradiate, slur, stutter, eyeblur, drowsy, agony, blocked, stamina, jitter)
return L.apply_effects(stun, weaken, paralyze, irradiate, slur, stutter, eyeblur, drowsy, blocked, stamina, jitter)
proc/OnFired() //if assigned, allows for code when the projectile gets fired
return 1