mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 22:17:32 +01:00
Bugfix: Wizards will now longer spray or shoot themselves with whatever they're holding when they cast spells.
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
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 ..()
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user