From aabd4267941e92e30f16c0efb2f09e49a057d03f Mon Sep 17 00:00:00 2001 From: ikarrus Date: Tue, 17 Jun 2014 20:26:52 -0600 Subject: [PATCH 1/4] Humanoid aliens can now strip again. Other restrictions are still in place. Fixes #3952 --- code/modules/mob/living/carbon/alien/larva/larva.dm | 12 ++++++++++++ code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/mob/living/carbon/metroid/metroid.dm | 12 ++++++++++++ .../mob/living/simple_animal/simple_animal.dm | 12 ++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 303f19e9b45..0c724d79370 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -292,3 +292,15 @@ var/mob/living/carbon/alien/humanoid/A = new(loc) A.key = key qdel(src) */ + +// The src mob is trying to strip an item from someone +// But we wont let them +/mob/living/carbon/alien/larva/stripPanelUnequip(obj/item/what, mob/who) + src << "You don't have the dexterity to do this!" + return + +// The src mob is trying to place an item on someone +// But we wont let them +/mob/living/carbon/alien/larva/stripPanelEquip(obj/item/what, mob/who) + src << "You don't have the dexterity to do this!" + return diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 765d8689bfd..e357eeff7fc 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -382,7 +382,7 @@ /mob/living/carbon/human/Topic(href, href_list) - if(usr.canUseTopic(src)) + if(!usr.stat && usr.canmove && !usr.restrained() && Adjacent(usr)) if(href_list["item"]) var/slot = text2num(href_list["item"]) if(slot in check_obscured_slots()) diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 599f790d6b8..03c3e2b1987 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -957,6 +957,18 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 return 0 .=..() +// The src mob is trying to strip an item from someone +// But we wont let them +/mob/living/carbon/slime/stripPanelUnequip(obj/item/what, mob/who) + src << "You don't have the dexterity to do this!" + return + +// The src mob is trying to place an item on someone +// But we wont let them +/mob/living/carbon/slime/stripPanelEquip(obj/item/what, mob/who) + src << "You don't have the dexterity to do this!" + return + //////////////////////////////Old shit from metroids/RoRos, and the old cores, would not take much work to re-add them//////////////////////// diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 38916358259..1a2dc5a00b8 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -521,3 +521,15 @@ return gib() return + +// The src mob is trying to strip an item from someone +// But we wont let them +/mob/living/simple_animal/stripPanelUnequip(obj/item/what, mob/who) + src << "You don't have the dexterity to do this!" + return + +// The src mob is trying to place an item on someone +// But we wont let them +/mob/living/simple_animal/stripPanelEquip(obj/item/what, mob/who) + src << "You don't have the dexterity to do this!" + return From 72eb5592cb9c82f398e75ba577cc12c5d4e3806b Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Wed, 18 Jun 2014 08:32:49 -0600 Subject: [PATCH 2/4] Update larva.dm --- code/modules/mob/living/carbon/alien/larva/larva.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 0c724d79370..a174229de6b 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -293,14 +293,10 @@ A.key = key qdel(src) */ -// The src mob is trying to strip an item from someone -// But we wont let them /mob/living/carbon/alien/larva/stripPanelUnequip(obj/item/what, mob/who) src << "You don't have the dexterity to do this!" return -// The src mob is trying to place an item on someone -// But we wont let them /mob/living/carbon/alien/larva/stripPanelEquip(obj/item/what, mob/who) src << "You don't have the dexterity to do this!" return From 38434271fc29f624c20ca50aea832a59c9a9f83d Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Wed, 18 Jun 2014 08:33:17 -0600 Subject: [PATCH 3/4] Update metroid.dm --- code/modules/mob/living/carbon/metroid/metroid.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 03c3e2b1987..fcb12d42d39 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -957,14 +957,10 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 return 0 .=..() -// The src mob is trying to strip an item from someone -// But we wont let them /mob/living/carbon/slime/stripPanelUnequip(obj/item/what, mob/who) src << "You don't have the dexterity to do this!" return -// The src mob is trying to place an item on someone -// But we wont let them /mob/living/carbon/slime/stripPanelEquip(obj/item/what, mob/who) src << "You don't have the dexterity to do this!" return From ff1767a6a80feeefaf6b0009a7910edd81638dd0 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Wed, 18 Jun 2014 08:33:33 -0600 Subject: [PATCH 4/4] Update simple_animal.dm --- code/modules/mob/living/simple_animal/simple_animal.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 1a2dc5a00b8..f7a182b7880 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -522,14 +522,10 @@ gib() return -// The src mob is trying to strip an item from someone -// But we wont let them /mob/living/simple_animal/stripPanelUnequip(obj/item/what, mob/who) src << "You don't have the dexterity to do this!" return -// The src mob is trying to place an item on someone -// But we wont let them /mob/living/simple_animal/stripPanelEquip(obj/item/what, mob/who) src << "You don't have the dexterity to do this!" return