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

Derped up a bit in the last commit.

Browse Source
This commit is contained in:
SkyMarshal
2012-02-26 23:19:04 -07:00
parent c7af63b281
commit d77c42b7b5
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/damage_procs.dm
View File

@@ -48,7 +48,7 @@
if(PARALYZE) if(PARALYZE)
Paralyse(effect/(blocked+1)) Paralyse(effect/(blocked+1))
if(IRRADIATE) if(IRRADIATE)
radiation += max((effect - (effect*getarmor(null, "melee"))), 0)//Rads auto check armor radiation += max((effect - (effect*getarmor(null, "rad"))), 0)//Rads auto check armor
if(STUTTER) if(STUTTER)
stuttering = max(stuttering,(effect/(blocked+1))) stuttering = max(stuttering,(effect/(blocked+1)))
if(SLUR) if(SLUR)

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

@@ -44,16 +44,19 @@
M.visible_message("\blue [user] decided life was worth living") M.visible_message("\blue [user] decided life was worth living")
return return
if(istype(src.in_chamber, /obj/item/projectile/bullet) && !istype(src.in_chamber, /obj/item/projectile/bullet/stunshot)) if(istype(src.in_chamber, /obj/item/projectile/bullet) && !istype(src.in_chamber, /obj/item/projectile/bullet/stunshot))
M.apply_damage(160, BRUTE, "head", used_weapon = "Suicide attempt with a projectile weapon.") M.apply_damage(75, BRUTE, "head", used_weapon = "Suicide attempt with a projectile weapon.")
M.apply_damage(85, BRUTE, "chest")
M.visible_message("\red [user] pulls the trigger.") M.visible_message("\red [user] pulls the trigger.")
else if(istype(src.in_chamber, /obj/item/projectile/bullet/stunshot) || istype(src.in_chamber, /obj/item/projectile/energy/electrode)) else if(istype(src.in_chamber, /obj/item/projectile/bullet/stunshot) || istype(src.in_chamber, /obj/item/projectile/energy/electrode))
M.apply_damage(10, BURN, "head", used_weapon = "Suicide attempt with a stun round.") M.apply_damage(10, BURN, "head", used_weapon = "Suicide attempt with a stun round.")
M.visible_message("\red [user] pulls the trigger, but luckily it was a stun round.") M.visible_message("\red [user] pulls the trigger, but luckily it was a stun round.")
else if(istype(src.in_chamber, /obj/item/projectile/beam) || istype(src.in_chamber, /obj/item/projectile/energy)) else if(istype(src.in_chamber, /obj/item/projectile/beam) || istype(src.in_chamber, /obj/item/projectile/energy))
M.apply_damage(160, BURN, "head", used_weapon = "Suicide attempt with an energy weapon") M.apply_damage(75, BURN, "head", used_weapon = "Suicide attempt with an energy weapon")
M.apply_damage(85, BURN, "chest")
M.visible_message("\red [user] pulls the trigger.") M.visible_message("\red [user] pulls the trigger.")
else else
M.apply_damage(160, BRUTE, "head", used_weapon = "Suicide attempt with a gun") M.apply_damage(75, BRUTE, "head", used_weapon = "Suicide attempt with a gun")
M.apply_damage(85, BRUTE, "chest")
M.visible_message("\red [user] pulls the trigger. Ow.") M.visible_message("\red [user] pulls the trigger. Ow.")
return return
else else