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

whew

Browse Source
This commit is contained in:
silicons
2020-07-07 20:48:54 -07:00
parent a738d52740
commit 6ee63f66aa
201 changed files with 309 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/bscrystal.dm
+1 -1
View File
@@ -75,7 +75,7 @@
to_chat(user, "<span class='warning'>You cannot crush the polycrystal in-hand, try breaking one off.</span>")
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/stack/sheet/bluespace_crystal/attack_hand(mob/user)
/obj/item/stack/sheet/bluespace_crystal/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
if(user.get_inactive_held_item() == src)
if(zero_amount())
return
code/game/objects/items/stacks/medical.dm
+1 -1
View File
@@ -280,7 +280,7 @@
return
. = ..()
/obj/item/stack/medical/mesh/attack_hand(mob/user)
/obj/item/stack/medical/mesh/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
if(!is_open & user.get_inactive_held_item() == src)
to_chat(user, "<span class='warning'>You need to open [src] first.</span>")
return
code/game/objects/items/stacks/stack.dm
+1 -1
View File
@@ -390,7 +390,7 @@
. = ..()
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/stack/attack_hand(mob/user)
/obj/item/stack/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
if(user.get_inactive_held_item() == src)
if(zero_amount())
return