cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix for chem grenades and Disposals.

Browse Source
This commit is contained in:
SkyMarshal
2012-01-09 09:58:33 -07:00
parent 7dec599f9b
commit 46fb684c0b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/chemical/Chemistry-Tools.dm
+2 -1
View File
@@ -172,7 +172,8 @@
afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
if (istype(target, /obj/item/weapon/storage || istype(target, /obj/item/weapon/gun/grenadelauncher) || istype(target, /obj/structure/table))) return ..()
if (istype(target, /obj/item/weapon/storage) || istype(target, /obj/item/clothing/suit/storage) || istype(target, /obj/item/weapon/gun/grenadelauncher) || istype(target, /obj/structure/table))
return ..()
if (!src.state && stage == 2 && !crit_fail)
user << "\red You prime the grenade! 3 seconds!"
message_admins("[key_name_admin(user)] used a chemistry grenade ([src.name]).")
code/modules/recycling/disposal.dm
+3 -1
View File
@@ -972,6 +972,8 @@
for(var/i, i <= backType.len, i++)
if(sortTag == src.backType[i])
return negdir
else if (!sortTag && mailsort)
return sortdir
else if (!sortTag && !mailsort)
return posdir
@@ -982,7 +984,7 @@
if(sortTag == src.sortType[i])
issort = 1
if(issort || ((!sortTag || ismail) && mailsort)) //if destination matches filtered type...
if(issort) //if destination matches filtered type...
return sortdir // exit through sortdirection
else
return posdir