From 5fd641599ecec415630aea3af058396320cd87ec Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Sat, 7 Jan 2012 00:49:48 -0700 Subject: [PATCH] Fixed stupid unescapable edit apperance Fixed some stupid with grenades. --- code/modules/admin/admin_verbs.dm | 4 +++- code/modules/chemical/Chemistry-Tools.dm | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 1186d68cd05..30157c594b8 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -779,7 +779,9 @@ if(!istype(M, /mob/living/carbon/human)) usr << "\red You can only do this to humans!" return - + switch(alert("You sure you wish to edit this mob's appearance?",,"Yes","No")) + if("Yes") + return var/new_facial = input("Please select facial hair color.", "Character Generation") as color if(new_facial) M.r_facial = hex2num(copytext(new_facial, 2, 4)) diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index a6bae31c618..4cca4ed0ff7 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -172,8 +172,7 @@ afterattack(atom/target as mob|obj|turf|area, mob/user as mob) - if (istype(target, /obj/item/weapon/storage)) return ..() - if (istype(target, /obj/item/weapon/gun/grenadelauncher)) return ..() + if (istype(target, /obj/item/weapon/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]).")