shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Game folder

Browse Source
This commit is contained in:
Poojawa
2018-09-11 04:06:45 -05:00
parent b6430559e9
commit 8b9ef1e400
270 changed files with 3120 additions and 2523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+6 -5
View File
@@ -297,7 +297,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
pickup(user)
add_fingerprint(user)
if(!user.put_in_active_hand(src))
if(!user.put_in_active_hand(src, FALSE, FALSE))
user.dropItemToGround(src)
/obj/item/proc/allow_attack_hand_drop(mob/user)
@@ -319,7 +319,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
pickup(user)
add_fingerprint(user)
if(!user.put_in_active_hand(src))
if(!user.put_in_active_hand(src, FALSE, FALSE))
user.dropItemToGround(src)
/obj/item/attack_alien(mob/user)
@@ -348,6 +348,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
// afterattack() and attack() prototypes moved to _onclick/item_attack.dm for consistency
/obj/item/proc/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, args)
if(prob(final_block_chance))
owner.visible_message("<span class='danger'>[owner] blocks [attack_text] with [src]!</span>")
return 1
@@ -483,7 +484,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "eye_stab", /datum/mood_event/eye_stab)
add_logs(user, M, "attacked", "[src.name]", "(INTENT: [uppertext(user.a_intent)])")
log_combat(user, M, "attacked", "[src.name]", "(INTENT: [uppertext(user.a_intent)])")
M.adjust_blurriness(3)
M.adjust_eye_damage(rand(2,4))
@@ -586,8 +587,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
/obj/item/proc/get_dismemberment_chance(obj/item/bodypart/affecting)
if(affecting.can_dismember(src))
if((sharpness || damtype == BURN) && w_class >= 3)
. = force*(w_class-1)
if((sharpness || damtype == BURN) && w_class >= WEIGHT_CLASS_NORMAL && force >= 10)
. = force * (affecting.get_damage() / affecting.max_damage)
/obj/item/proc/get_dismember_sound()
if(damtype == BURN)