From ffd6cc4f31660322171d03a3114dc046d97d073a Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Sun, 2 Oct 2011 07:34:16 +0000 Subject: [PATCH] Bugfix: Wizards will now longer spray or shoot themselves with whatever they're holding when they cast spells. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes: ◦ Vanilla mulebots move slightly faster, hacked mulebots will move even faster! ◦ Changed the description of carp. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2314 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/bots/mulebot.dm | 6 +++--- code/game/objects/items/weapons/mops_cleaners.dm | 2 ++ code/game/supplyshuttle.dm | 2 +- code/modules/critters/critters.dm | 2 +- code/modules/projectiles/gun.dm | 2 ++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index e494da89cd4..80540bb3550 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -557,13 +557,13 @@ // do nothing if(1) process_bot() - spawn(3) + spawn(2) process_bot() - sleep(3) + sleep(2) process_bot() if(2) process_bot() - spawn(5) + spawn(4) process_bot() if(3) process_bot() diff --git a/code/game/objects/items/weapons/mops_cleaners.dm b/code/game/objects/items/weapons/mops_cleaners.dm index 227785eba50..3dcbace77d3 100644 --- a/code/game/objects/items/weapons/mops_cleaners.dm +++ b/code/game/objects/items/weapons/mops_cleaners.dm @@ -16,6 +16,8 @@ MOP /obj/item/weapon/cleaner/afterattack(atom/A as mob|obj, mob/user as mob) if (istype(A, /obj/item/weapon/storage/backpack )) return + if (istype(A, /obj/proc_holder/spell )) + return else if (src.reagents.total_volume < 1) user << "\blue [src] is empty!" return diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index fc320fcd7ee..2ecf029ef0e 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -49,7 +49,7 @@ var/ordernum=0 return prob(60) else if(istype(A, /mob/living)) // You Shall Not Pass! var/mob/living/M = A - if(!M.lying) // unless you're lying down + if(!M.lying || istype(M, /mob/living/carbon/monkey) || istype(M, /mob/living/carbon/metroid)) // unless you're lying down, or a small creature return 0 return ..() diff --git a/code/modules/critters/critters.dm b/code/modules/critters/critters.dm index aa9e9a7f508..7f40b5eacbc 100644 --- a/code/modules/critters/critters.dm +++ b/code/modules/critters/critters.dm @@ -131,7 +131,7 @@ /obj/critter/spesscarp name = "Spess Carp" - desc = "Oh shit, you're really fucked now." + desc = "A ferocious, fang-bearing creature that resembles a fish." icon_state = "spesscarp" health = 25 max_health = 25 diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index f1a3f017de5..9c5ebb79802 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -66,6 +66,8 @@ return //we're placing gun on a table or in backpack --rastaf0 if(istype(target, /obj/machinery/recharger) && istype(src, /obj/item/weapon/gun/energy)) return + if(istype(target, /obj/proc_holder/spell)) + return if(istype(user, /mob/living)) var/mob/living/M = user if ((M.mutations & CLOWN) && prob(50))