From dcd7063f43d967da4a99bf0babcfaa7be6f450be Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Mon, 4 Feb 2013 20:15:19 +0000 Subject: [PATCH] Committing Spike68's magboot UI action button. http://forums.nanotrasen.com/viewtopic.php?f=16&t=12084 Committing Faerdan's fix for spiders spamming uncacoonable spiders. http://forums.nanotrasen.com/viewtopic.php?f=16&t=12060 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5651 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/clothing/shoes/magboots.dm | 11 +++++++---- .../simple_animal/hostile/giant_spider.dm | 2 +- code/modules/mob/screen.dm | 2 ++ icons/mob/screen1_action.dmi | Bin 2939 -> 3568 bytes 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 0ade207cf12..1f960676cae 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -4,26 +4,29 @@ icon_state = "magboots0" var/magpulse = 0 // flags = NOSLIP //disabled by default + icon_action_button = "action_magboots" verb/toggle() set name = "Toggle Magboots" set category = "Object" set src in usr + attack_self(usr) + + attack_self(mob/user) if(src.magpulse) src.flags &= ~NOSLIP src.slowdown = SHOES_SLOWDOWN src.magpulse = 0 icon_state = "magboots0" - usr << "You disable the mag-pulse traction system." + user << "You disable the mag-pulse traction system." else src.flags |= NOSLIP src.slowdown = 2 src.magpulse = 1 icon_state = "magboots1" - usr << "You enable the mag-pulse traction system." - usr.update_inv_shoes() //so our mob-overlays update - + user << "You enable the mag-pulse traction system." + user.update_inv_shoes() //so our mob-overlays update examine() set src in view() diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 9f5c97117bb..7558a13b3cd 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -104,7 +104,7 @@ if(!busy && prob(30)) //first, check for potential food nearby to cocoon for(var/mob/living/C in can_see) - if(C.stat) + if(C.stat && !istype(C,/mob/living/simple_animal/hostile/giant_spider)) cocoon_target = C busy = MOVING_TO_TARGET walk_to(src, C, 1, move_to_delay) diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm index e89c1388dd4..3159d6908ef 100644 --- a/code/modules/mob/screen.dm +++ b/code/modules/mob/screen.dm @@ -48,6 +48,8 @@ usr.update_inv_glasses() if("action_jetpack") usr.update_inv_back() + if("action_magboots") + usr.update_inv_shoes() //This is the proc used to update all the action buttons. It just returns for all mob types except humans. /mob/proc/update_action_buttons() diff --git a/icons/mob/screen1_action.dmi b/icons/mob/screen1_action.dmi index ac3232918eb37117325e006dd90fbc86511ddc40..8c1fa3c7f255486dc0308a1b9c5bd63bae953634 100644 GIT binary patch delta 3545 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