mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 11:34:19 +01:00
TG: Commited on behalf of Nodrak
- Fixes: Issue 257 , Issue 346 and Issue 343 - Monkeys no longer continue to take suffocation damage after dying. - PDAs can no longer be used while stunned or paralysed. - Vending machines now have a delay to stop product spamming. Note: I upped the delay a little as it was still pretty spammable when I tested it, seems to be fine now as it's way more effort than it's worth to empty a vending machine. Revision: r3107 Author: trubblebass
This commit is contained in:
@@ -567,7 +567,7 @@
|
||||
|
||||
playsound(P.loc, 'twobeep.ogg', 50, 1)
|
||||
|
||||
// log_pda("[usr] (PDA: [src.name]) sent \"[t]\" to [P.name]")
|
||||
log_pda("[usr] (PDA: [src.name]) sent \"[t]\" to [P.name]")
|
||||
|
||||
|
||||
if("Send Honk")//Honk virus
|
||||
|
||||
@@ -564,7 +564,7 @@ Code:
|
||||
/obj/item/weapon/cartridge/Topic(href, href_list)
|
||||
..()
|
||||
|
||||
if (usr.stat || usr.restrained() || !in_range(loc, usr))
|
||||
if (!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
|
||||
usr.machine = null
|
||||
usr << browse(null, "window=pda")
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user