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

Fixed some stuff related to the previous commit.

Browse Source
This commit is contained in:
SkyMarshal
2012-01-22 23:45:16 -07:00
parent a9520990f7
commit 08a9cabe76
6 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,16 @@
for(var/obj/O in contents)
O.emp_act(severity)
attack(mob/living/M as mob, mob/living/user as mob, def_zone)
if (M == user && user.zone_sel.selecting == "mouth" && load_into_chamber())
M.visible_message("\red [user] sticks their gun in their mouth, ready to pull the trigger...")
if(!do_after(user, 40))
M.visible_message("\blue [user] decided life was worth living")
return
M.visible_message("\red [user] pulls the trigger.")
M.apply_damage(70, BRUTE, "head")
M.apply_damage(110, BRUTE, "chest")
return
afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag, params)//TODO: go over this
if(flag) return //we're placing gun on a table or in backpack
@@ -50,15 +60,6 @@
M.drop_item()
del(src)
return
if (target == user && user.zone_sel.selecting == "mouth")
M.visible_message("\red [user] sticks their gun in their mouth, ready to pull the trigger...")
if(!do_after(user, 20))
M.visible_message("\blue [user] decided life was worth living")
return
M.visible_message("\red [user] pulls the trigger.")
M.apply_damage(60, BRUTE, "head")
M.apply_damage(90, BRUTE, "chest")
return
if (!user.IsAdvancedToolUser())
user << "\red You don't have the dexterity to do this!"