From 1033650c66cbce1d90e76b6025bf6a9d01977cec Mon Sep 17 00:00:00 2001 From: Verkister Date: Wed, 6 Apr 2022 15:16:54 +0300 Subject: [PATCH 1/3] Makes mobs not spawn with id unless defined so Makes mob ids only spawn on mobs that should come with them rather than jamming one into every single mouse and cockroach and so on. --- code/modules/mob/living/simple_mob/simple_mob.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_mob/simple_mob.dm b/code/modules/mob/living/simple_mob/simple_mob.dm index 46af0b5269..c2174e820e 100644 --- a/code/modules/mob/living/simple_mob/simple_mob.dm +++ b/code/modules/mob/living/simple_mob/simple_mob.dm @@ -164,15 +164,17 @@ var/limb_icon_key var/understands_common = TRUE //VOREStation Edit - Makes it so that simplemobs can understand galcomm without being able to speak it. var/heal_countdown = 5 //VOREStation Edit - A cooldown ticker for passive healing - var/obj/item/weapon/card/id/mobcard = null - var/list/mobcard_access = list() + var/obj/item/weapon/card/id/mobcard = null //VOREStation Edit + var/list/mobcard_access = list() //VOREStation Edit + var/mobcard_provided = FALSE //VOREStation Edit /mob/living/simple_mob/Initialize() verbs -= /mob/verb/observe health = maxHealth - mobcard = new /obj/item/weapon/card/id(src) - mobcard.access = mobcard_access.Copy() + if(mobcard_provided) + mobcard = new /obj/item/weapon/card/id(src) + mobcard.access = mobcard_access.Copy() for(var/L in has_langs) languages |= GLOB.all_languages[L] @@ -311,4 +313,4 @@ D.open() else ..() -//Vorestation Add End \ No newline at end of file +//Vorestation Add End From b7ff309b13bda944570e239918b52445cdbaa9a5 Mon Sep 17 00:00:00 2001 From: Verkister Date: Wed, 6 Apr 2022 15:18:35 +0300 Subject: [PATCH 2/3] Update catslug.dm --- .../simple_mob/subtypes/animal/alien animals/catslug.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index 31a7a2e9aa..1bc7bb4d3a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -44,6 +44,8 @@ friendly = list("hugs") see_in_dark = 8 + mobcard_provided = TRUE + catalogue_data = list(/datum/category_item/catalogue/fauna/catslug) ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/catslug say_list_type = /datum/say_list/catslug @@ -793,4 +795,4 @@ color = COLOR_LIGHT_PINK /mob/living/simple_mob/vore/alienanimals/catslug/suslug/color/light_yellow - color = COLOR_WHEAT \ No newline at end of file + color = COLOR_WHEAT From e706322e6b177272d38840b9a80096601a9f3c99 Mon Sep 17 00:00:00 2001 From: Verkister Date: Wed, 6 Apr 2022 15:19:40 +0300 Subject: [PATCH 3/3] Update simple_mob.dm --- code/modules/mob/living/simple_mob/simple_mob.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_mob/simple_mob.dm b/code/modules/mob/living/simple_mob/simple_mob.dm index c2174e820e..d9d560188a 100644 --- a/code/modules/mob/living/simple_mob/simple_mob.dm +++ b/code/modules/mob/living/simple_mob/simple_mob.dm @@ -172,7 +172,7 @@ verbs -= /mob/verb/observe health = maxHealth - if(mobcard_provided) + if(mobcard_provided) //VOREStation Edit mobcard = new /obj/item/weapon/card/id(src) mobcard.access = mobcard_access.Copy()