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

Remove Jointbreaking, Joint fracturing, and Knifing

Browse Source 
This commit removes Jointbreaking, Joint fracturing, and Knifing from the
grab system due to near-universal dislike of the features.
This commit is contained in:
Tigercat2000
2015-05-10 06:46:58 -07:00
parent eee9339ef3
commit 0e948ffeec
3 changed files with 7 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_attackhand.dm
+1 -29
View File
@@ -226,32 +226,4 @@
return
/mob/living/carbon/human/proc/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, inrange, params)
return
/mob/living/carbon/human/proc/grab_joint(var/mob/living/user, var/def_zone)
var/has_grab = 0
for(var/obj/item/weapon/grab/G in list(user.l_hand, user.r_hand))
if(G.affecting == src && G.state == GRAB_NECK)
has_grab = 1
break
if(!has_grab)
return 0
if(!def_zone) def_zone = user.zone_sel.selecting
var/target_zone = check_zone(def_zone)
if(!target_zone)
return 0
var/obj/item/organ/external/organ = get_organ(check_zone(target_zone))
if(!organ || organ.is_broken())
return 0
if(organ.limb_name == "chest" || organ.limb_name == "groin")
return 0 //what how do you dislocate a chest with your hands or a groin really
user.visible_message("<span class='warning'>[user] begins to fracture [src]'s [organ.name]!</span>")
if(do_after(user, 100))
organ.fracture()
src.visible_message("<span class='danger'>[src]'s [organ.name] [pick("cracks","gives way","snaps","collapses")]!</span>")
return 1
return 0
return
code/modules/mob/mob_grab.dm
+6 -22
View File
@@ -293,21 +293,11 @@
assailant << "<span class='warning'>You no longer pin [affecting] to the ground.</span>"
force_down = 0
return
if("grab")
if(state < GRAB_AGGRESSIVE)
assailant << "<span class='warning'>You require a better grab to do this.</span>"
return
var/obj/item/organ/external/organ = affected.get_organ(check_zone(last_hit_zone))
if(!organ || organ.is_broken() || organ.limb_name == "chest" || organ.limb_name == "groin") //necessary to prevent chest and groin
return
assailant.visible_message("<span class='danger'>[assailant] begins [pick("bending", "twisting")] [affecting]'s [organ.name] into a jointlock!</span>")
var/armor = affected.run_armor_check(affecting, "melee")
if(armor < 2)
affecting << "<span class='danger'>You feel extreme pain!</span>"
affecting.apply_damage(40, HALLOSS, last_hit_zone, armor)
return
if("harm")
if("grab")
return
if("harm")
if(last_hit_zone == "eyes")
if(state < GRAB_NECK)
assailant << "<span class='warning'>You require a better grab to do this.</span>"
@@ -330,14 +320,7 @@
if (eyes.damage >= eyes.min_broken_damage)
if(M.stat != 2)
M << "\red You go blind!"
else if(last_hit_zone != "chest" && last_hit_zone != "groin") //headbutting should probably use head hitzone,
if(state < GRAB_NECK)// but, chest and groin being fractured doesn't paticulary make sense in this context
assailant << "<span class='warning'>You require a better grab to do this.</span>"//and head does
return
if(affected.grab_joint(assailant))
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
return
else
else if(last_hit_zone == "head")
if(affecting.lying)
return
assailant.visible_message("<span class='danger'>[assailant] thrusts \his head into [affecting]'s skull!</span>")
@@ -352,6 +335,7 @@
affecting.attack_log += text("\[[time_stamp()]\] <font color='orange'>Headbutted by [assailant.name] ([assailant.ckey])</font>")
msg_admin_attack("[key_name(assailant)] has headbutted [key_name(affecting)]")
return
if("disarm")
if(state < GRAB_AGGRESSIVE)
assailant << "<span class='warning'>You require a better grab to do this.</span>"