cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix vending machine coin issue/runtime

Browse Source
This commit is contained in:
Markolie
2015-08-12 22:27:29 +02:00
parent f1a4cf1dcf
commit eb84caaa90
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/vending.dm
+4 -4
View File
@@ -464,11 +464,9 @@
usr << "There is no coin in this machine."
return
coin.loc = src.loc
if(!usr.get_active_hand())
usr.put_in_hands(coin)
usr << "\blue You remove the [coin] from the [src]"
usr.put_in_hands(coin)
coin = null
usr << "\blue You remove the [coin] from the [src]"
categories &= ~CAT_COIN
if (href_list["pay"])
@@ -560,9 +558,11 @@
user << "\blue You successfully pull the coin out before the [src] could swallow it."
else
user << "\blue You weren't able to pull the coin out fast enough, the machine ate it, string and all."
coin = null
qdel(coin)
categories &= ~CAT_COIN
else
coin = null
qdel(coin)
categories &= ~CAT_COIN
code/modules/mob/living/carbon/human/human.dm
+3 -1
View File
@@ -431,7 +431,9 @@
var/armor_block = run_armor_check(affecting, "melee")
apply_damage(damage, BRUTE, affecting, armor_block)
/mob/living/carbon/human/proc/is_loyalty_implanted(mob/living/carbon/human/M)
/mob/living/carbon/human/proc/is_loyalty_implanted(mob/living/carbon/human/M)
if(!istype(M))
return 0
for(var/L in M.contents)
if(istype(L, /obj/item/weapon/implant/loyalty))
for(var/obj/item/organ/external/O in M.organs)