From fbacbad91dd656463ef04f4ce5816a7401b15cdb Mon Sep 17 00:00:00 2001 From: lbnesquik Date: Sun, 2 Aug 2020 22:22:27 +0200 Subject: [PATCH 1/5] Tweaks to taur clothes, particularly saddles as well as tail tags. - Remove capitalisation from back_vr.dmi - Add a tag to most tails. This can be used for many things, but mostly to have an simpler check of the tail type. See backpack_vr.dm. - Switch the backpack sprite selection to a switch() --- .../items/weapons/storage/backpack_vr.dm | 84 +++++------------- .../appearance/sprite_accessories_taur_vr.dm | 31 +++++++ icons/mob/back_vr.dmi | Bin 22019 -> 22024 bytes 3 files changed, 51 insertions(+), 64 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index 744abb85d8..b7485be674 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -13,10 +13,6 @@ mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) if(istype(H) && istype(H.tail_style, taurtype)) - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) return 1 else to_chat(H, "[no_message]") @@ -44,66 +40,20 @@ mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) - var/datum/sprite_accessory/tail/taur/TT = H.tail_style - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/horse)) - item_state = "[icon_base]_Horse" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/wolf)) - item_state = "[icon_base]_Wolf" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/cow)) - item_state = "[icon_base]_Cow" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/lizard)) - item_state = "[icon_base]_Lizard" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/feline)) - item_state = "[icon_base]_Feline" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/drake)) - item_state = "[icon_base]_Drake" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/otie)) - item_state = "[icon_base]_Otie" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/deer)) - item_state = "[icon_base]_Deer" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 + if(!istype(H))//Error, non HUMAN. + log_runtime("[H] was not a valid human!") + return + + if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? If yes, they get no slowdown. + slowdown = 0 else - to_chat(H, "[no_message]") - return 0 + slowdown = initial(slowdown) + + var/datum/sprite_accessory/tail/taur/TT = H.tail_style + item_state = "[icon_base]_[TT.icon_sprite_tag]" //icon_sprite_tag is something like "deer" + return 1 + + /obj/item/weapon/storage/backpack/saddlebag_common/robust //Shared bag for other taurs with sturdy backs name = "Robust Saddlebags" @@ -116,7 +66,7 @@ /obj/item/weapon/storage/backpack/saddlebag_common/vest //Shared bag for other taurs with sturdy backs name = "Taur Duty Vest" - desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though." + desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though. Holds less than a saddle." icon = 'icons/obj/clothing/backpack_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "taurvest" @@ -145,6 +95,7 @@ icon_override = 'icons/mob/back_vr.dmi' item_state = "satchel-explorer" icon_state = "satchel-explorer" + /obj/item/weapon/storage/backpack/explorer name = "explorer backpack" desc = "A backpack for carrying a large number of supplies easily." @@ -152,6 +103,7 @@ icon_override = 'icons/mob/back_vr.dmi' item_state = "explorerpack" icon_state = "explorerpack" + /obj/item/weapon/storage/backpack/satchel/roboticist name = "roboticist satchel" desc = "A satchel for carrying a large number of spare parts easily." @@ -159,6 +111,7 @@ icon_override = 'icons/mob/back_vr.dmi' item_state = "satchel-robo" icon_state = "satchel-robo" + /obj/item/weapon/storage/backpack/roboticist name = "roboticist backpack" desc = "A backpack for carrying a large number of spare parts easily." @@ -166,6 +119,7 @@ icon_override = 'icons/mob/back_vr.dmi' item_state = "backpack-robo" icon_state = "backpack-robo" + /obj/item/weapon/storage/backpack/vietnam name = "vietnam backpack" desc = "There are tangos in the trees! We need napalm right now! Why is my gun jammed?" @@ -173,6 +127,7 @@ icon_override = 'icons/mob/back_vr.dmi' item_state = "nambackpack" icon_state = "nambackpack" + /obj/item/weapon/storage/backpack/russian name = "russian backpack" desc = "Useful for carrying large quantities of vodka." @@ -180,6 +135,7 @@ icon_override = 'icons/mob/back_vr.dmi' item_state = "ru_rucksack" icon_state = "ru_rucksack" + /obj/item/weapon/storage/backpack/korean name = "korean backpack" desc = "Insert witty description here." diff --git a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm index 876cd4afb6..26c760efdb 100644 --- a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm @@ -126,6 +126,8 @@ var/icon/suit_sprites = null //File for suit sprites, if any. var/icon/under_sprites = null + var/icon_sprite_tag // This is where we put stuff like _Horse, so we can assign icons easier. + var/can_ride = 1 //whether we're real rideable taur or just in that category //Could do nested lists but it started becoming a nightmare. It'd be more fun for lookups of a_intent and m_intent, but then subtypes need to @@ -167,32 +169,38 @@ icon_state = "wolf_s" under_sprites = 'icons/mob/taursuits_wolf_vr.dmi' suit_sprites = 'icons/mob/taursuits_wolf_vr.dmi' + icon_sprite_tag = "wolf" //TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatwolf name = "Fat Wolf (Taur)" icon_state = "fatwolf_s" + icon_sprite_tag = "wolf" //This could be modified later. /datum/sprite_accessory/tail/taur/wolf/wolf_2c name = "Wolf dual-color (Taur)" icon_state = "wolf_s" extra_overlay = "wolf_markings" + //icon_sprite_tag = "wolf2c" //TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c name = "Fat Wolf dual-color (Taur)" icon_state = "fatwolf_s" extra_overlay = "fatwolf_markings" + //icon_sprite_tag = "fatwolf2c" /datum/sprite_accessory/tail/taur/wolf/synthwolf name = "SynthWolf dual-color (Taur)" icon_state = "synthwolf_s" extra_overlay = "synthwolf_markings" + //icon_sprite_tag = "synthwolf" /datum/sprite_accessory/tail/taur/naga name = "Naga (Taur)" icon_state = "naga_s" suit_sprites = 'icons/mob/taursuits_naga_vr.dmi' + //icon_sprite_tag = "naga" msg_owner_help_walk = "You carefully slither around %prey." msg_prey_help_walk = "%owner's huge tail slithers past beside you!" @@ -225,12 +233,14 @@ name = "Naga dual-color (Taur)" icon_state = "naga_s" extra_overlay = "naga_markings" + //icon_sprite_tag = "naga2c" /datum/sprite_accessory/tail/taur/horse name = "Horse (Taur)" icon_state = "horse_s" under_sprites = 'icons/mob/taursuits_horse_vr.dmi' suit_sprites = 'icons/mob/taursuits_horse_vr.dmi' + icon_sprite_tag = "horse" msg_owner_disarm_run = "You quickly push %prey to the ground with your hoof!" msg_prey_disarm_run = "%owner pushes you down to the ground with their hoof!" @@ -251,11 +261,13 @@ name = "SynthHorse dual-color (Taur)" icon_state = "synthhorse_s" extra_overlay = "synthhorse_markings" + //icon_sprite_tag = "synthhorse" /datum/sprite_accessory/tail/taur/cow name = "Cow (Taur)" icon_state = "cow_s" suit_sprites = 'icons/mob/taursuits_cow_vr.dmi' + icon_sprite_tag = "cow" msg_owner_disarm_run = "You quickly push %prey to the ground with your hoof!" msg_prey_disarm_run = "%owner pushes you down to the ground with their hoof!" @@ -277,6 +289,7 @@ icon_state = "deer_s" extra_overlay = "deer_markings" suit_sprites = 'icons/mob/taursuits_deer_vr.dmi' + icon_sprite_tag = "deer" msg_owner_disarm_run = "You quickly push %prey to the ground with your hoof!" msg_prey_disarm_run = "%owner pushes you down to the ground with their hoof!" @@ -297,21 +310,25 @@ name = "Lizard (Taur)" icon_state = "lizard_s" suit_sprites = 'icons/mob/taursuits_lizard_vr.dmi' + icon_sprite_tag = "lizard" /datum/sprite_accessory/tail/taur/lizard/lizard_2c name = "Lizard dual-color (Taur)" icon_state = "lizard_s" extra_overlay = "lizard_markings" + //icon_sprite_tag = "lizard2c" /datum/sprite_accessory/tail/taur/lizard/synthlizard name = "SynthLizard dual-color (Taur)" icon_state = "synthlizard_s" extra_overlay = "synthlizard_markings" + //icon_sprite_tag = "synthlizard" /datum/sprite_accessory/tail/taur/spider name = "Spider (Taur)" icon_state = "spider_s" suit_sprites = 'icons/mob/taursuits_spider_vr.dmi' + icon_sprite_tag = "spider" msg_owner_disarm_run = "You quickly push %prey to the ground with your leg!" msg_prey_disarm_run = "%owner pushes you down to the ground with their leg!" @@ -331,6 +348,7 @@ /datum/sprite_accessory/tail/taur/tents name = "Tentacles (Taur)" icon_state = "tent_s" + icon_sprite_tag = "tentacle" can_ride = 0 msg_prey_stepunder = "You run between %prey's tentacles." @@ -358,11 +376,13 @@ name = "Feline (Taur)" icon_state = "feline_s" suit_sprites = 'icons/mob/taursuits_feline_vr.dmi' + icon_sprite_tag = "feline" //TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatfeline name = "Fat Feline (Taur)" icon_state = "fatfeline_s" + //icon_sprite_tag = "fatfeline" /datum/sprite_accessory/tail/taur/fatfeline_wag name = "Fat Feline (Taur) (vwag)" @@ -373,22 +393,26 @@ name = "Feline dual-color (Taur)" icon_state = "feline_s" extra_overlay = "feline_markings" + //icon_sprite_tag = "feline2c" //TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/feline/fatfeline_2c name = "Fat Feline dual-color (Taur)" icon_state = "fatfeline_s" extra_overlay = "fatfeline_markings" + //icon_sprite_tag = "fatfeline2c" /datum/sprite_accessory/tail/taur/feline/synthfeline name = "SynthFeline dual-color (Taur)" icon_state = "synthfeline_s" extra_overlay = "synthfeline_markings" + //icon_sprite_tag = "synthfeline" /datum/sprite_accessory/tail/taur/slug name = "Slug (Taur)" icon_state = "slug_s" suit_sprites = 'icons/mob/taursuits_slug_vr.dmi' + icon_sprite_tag = "slug" msg_owner_help_walk = "You carefully slither around %prey." msg_prey_help_walk = "%owner's huge tail slithers past beside you!" @@ -420,11 +444,13 @@ /datum/sprite_accessory/tail/taur/frog name = "Frog (Taur)" icon_state = "frog_s" + icon_sprite_tag = "frog" /datum/sprite_accessory/tail/taur/thicktentacles name = "Thick Tentacles (Taur)" icon_state = "tentacle_s" can_ride = 0 + icon_sprite_tag = "thick_tentacles" msg_prey_stepunder = "You run between %prey's tentacles." msg_owner_stepunder = "%owner runs between your tentacles." @@ -452,12 +478,14 @@ icon_state = "drake_s" extra_overlay = "drake_markings" suit_sprites = 'icons/mob/taursuits_drake_vr.dmi' + icon_sprite_tag = "drake" /datum/sprite_accessory/tail/taur/otie name = "Otie (Taur)" icon_state = "otie_s" extra_overlay = "otie_markings" suit_sprites = 'icons/mob/taursuits_otie_vr.dmi' + icon_sprite_tag = "otie" /datum/sprite_accessory/tail/taur/alraune/alraune_2c name = "Alraune (dual color)" @@ -468,12 +496,14 @@ extra_overlay = "alraunecolor_markings" extra_overlay_w = "alraunecolor_closed_markings" clip_mask_state = "taur_clip_mask_alraune" + icon_sprite_tag = "alraune" /datum/sprite_accessory/tail/taur/wasp name = "Wasp (dual color)" icon_state = "wasp_s" extra_overlay = "wasp_markings" clip_mask_state = "taur_clip_mask_wasp" + icon_sprite_tag = "wasp" msg_owner_disarm_run = "You quickly push %prey to the ground with your leg!" msg_prey_disarm_run = "%owner pushes you down to the ground with their leg!" @@ -494,6 +524,7 @@ name = "Mermaid (Taur)" icon_state = "mermaid_s" can_ride = 0 + icon_sprite_tag = "mermaid" msg_owner_help_walk = "You carefully slither around %prey." msg_prey_help_walk = "%owner's huge tail slithers past beside you!" diff --git a/icons/mob/back_vr.dmi b/icons/mob/back_vr.dmi index dad66ba3c3ed5c560584de7dec858e1402d70fae..474731f1a1ffa823c3aad37ace25f330d03d1b84 100644 GIT binary patch delta 329 zcmV-P0k-~wtO1Cu0gxnrFnUy2bVOxyV{&P5bZKvH004NLm6AgjoH>9=K9Z^U^6Om%%1gQ4wcc=hy8O|}%^EiHO@8RS4SzI7L7wMqMTWleN!}Cj; zj8+8$8N9!xiP83I!sFqC2pTfjbp{FBa=`m8O_U`M86482CUMh$9x`}cP%o5nx)N7D zS&r!H2wdVAK|A{^NJR*>cDB_KfQg@jG1TN#mp-bO$3g?My@MoeXvqkpDdTni?Hyq<+Y}`{#nMd z0aksXEOtURjK+gIG}=88R=5dQLN=X{4UcZcZ4x%whDz#X<2fw#e0GYb@0~+pOl|`I b>v|8zOAh(DNdEw44f`Gwu~hD}SOKe45+R=- delta 324 zcmV-K0lWT)tO0|p0gxnrD|%E|bVOxyV{&P5bZKvH004NLosvy&gD?z+&*WEF?RnEa zdgZdwZAfc(+z}a)mM9b>C(vrYeuoMWm(|%Z((~AU?X2Nt`=0M1+vRF7>@BsB!sh-# zC1nI!Dl-_6J!<2ydpbt%(pmi2ZGzsqB5YTC&6oLlSx+{9`KNsuqrLTLF6> zj1RKp6D>(S!Lq~?E=)V|u}L#V7lD5T8+k5SgM}h$GXHE@hnbHpZwyC9mKgH|MDacQx!9!J>=8ma0q?>SwmFuu_GP=dnDBNTn7u;9QOIYsZ>=@5nx`tS=xe@$p>NRZl W8DzU${Q}m8_`XTiK{m5p0jpFGYL_wq From 1f382c6cd7ba3abda7aa10d7776d2b7305f9cc90 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 3 Aug 2020 18:38:51 -0400 Subject: [PATCH 2/5] Nerfs harm/disarm steppies - Reduces damage multiplier on harm steppies from 3.5 to 2.5 - Removes forcerest and halloss from disarm steppies. Replaces with weaken proc. --- code/modules/vore/resizing/resize_vr.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 07d3a7831f..a224b88cdc 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -246,7 +246,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 now_pushing = 0 forceMove(tmob.loc) if(a_intent == I_GRAB || a_intent == I_DISARM) - tmob.resting = 1 + tmob.Weaken(1) var/size_damage_multiplier = size_multiplier - tmob.size_multiplier // This technically means that I_GRAB will set this value to the same as I_HARM, but @@ -311,7 +311,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 message_pred = STEP_TEXT_OWNER(tail.msg_owner_disarm_walk) message_prey = STEP_TEXT_PREY(tail.msg_prey_disarm_walk) add_attack_logs(pred, prey, "Pinned underfoot (walk, about [damage] halloss)") - tmob.apply_damage(damage, HALLOSS) + tmob.Weaken(1) //Removed halloss because it was being abused if(I_HURT) message_pred = "You methodically place your foot down upon [prey]'s body, slowly applying pressure, crushing them against the floor below!" message_prey = "[pred] methodically places their foot upon your body, slowly applying pressure, crushing you against the floor below!" @@ -319,7 +319,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 message_pred = STEP_TEXT_OWNER(tail.msg_owner_harm_walk) message_prey = STEP_TEXT_PREY(tail.msg_prey_harm_walk) // Multiplies the above damage by 3.5. This means a min of 1.75 damage, or a max of 9.1875. damage to each limb, depending on size and RNG. - calculated_damage *= 3.5 + calculated_damage *= 2.5 for(var/obj/item/organ/I in prey.organs) I.take_damage(calculated_damage, 0) prey.drip(3) From 22c9294aa3da3e639cfaf807afdecd31d98e494d Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 3 Aug 2020 19:10:10 -0400 Subject: [PATCH 3/5] Phase 1 tweaks --- code/modules/vore/resizing/resize_vr.dm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index a224b88cdc..3db6dc4386 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -243,10 +243,18 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 if(a_intent == I_HELP) // Theoretically not possible, but just in case. return FALSE + if(tmob.a_intent != I_HELP && prob(35)) + to_chat(pred, "[prey] dodges out from under your foot!") + to_chat(prey, "You narrowly avoid [pred]'s foot!") + return FALSE + now_pushing = 0 forceMove(tmob.loc) if(a_intent == I_GRAB || a_intent == I_DISARM) - tmob.Weaken(1) + if(tmob.a_intent = I_HELP) + tmob.resting = 1 + else + tmob.Weaken(1) var/size_damage_multiplier = size_multiplier - tmob.size_multiplier // This technically means that I_GRAB will set this value to the same as I_HARM, but @@ -311,7 +319,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 message_pred = STEP_TEXT_OWNER(tail.msg_owner_disarm_walk) message_prey = STEP_TEXT_PREY(tail.msg_prey_disarm_walk) add_attack_logs(pred, prey, "Pinned underfoot (walk, about [damage] halloss)") - tmob.Weaken(1) //Removed halloss because it was being abused + tmob.Weaken(2) //Removed halloss because it was being abused if(I_HURT) message_pred = "You methodically place your foot down upon [prey]'s body, slowly applying pressure, crushing them against the floor below!" message_prey = "[pred] methodically places their foot upon your body, slowly applying pressure, crushing you against the floor below!" @@ -319,7 +327,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 message_pred = STEP_TEXT_OWNER(tail.msg_owner_harm_walk) message_prey = STEP_TEXT_PREY(tail.msg_prey_harm_walk) // Multiplies the above damage by 3.5. This means a min of 1.75 damage, or a max of 9.1875. damage to each limb, depending on size and RNG. - calculated_damage *= 2.5 + calculated_damage *= 3.5 for(var/obj/item/organ/I in prey.organs) I.take_damage(calculated_damage, 0) prey.drip(3) From d0c9b7ccd1d425787e50b9c4842f1a821883272c Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Mon, 3 Aug 2020 20:50:02 -0700 Subject: [PATCH 4/5] Fixed TGUI Not refocusing mapwindow --- code/modules/tgui/tgui_window.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm index 18cf715368..26533447d4 100644 --- a/code/modules/tgui/tgui_window.dm +++ b/code/modules/tgui/tgui_window.dm @@ -140,6 +140,7 @@ log_tgui(client, "[id]/close: suspending") status = TGUI_WINDOW_READY send_message("suspend") + winset(client, null, "mapwindow.map.focus=true") return log_tgui(client, "[id]/close") release_lock() @@ -149,7 +150,7 @@ // to read the error message. if(!fatally_errored) client << browse(null, "window=[id]") - + winset(client, null, "mapwindow.map.focus=true") /** * public * From 5344b970690f93df58b984b0c9e615002e0f815c Mon Sep 17 00:00:00 2001 From: Rykka Date: Tue, 4 Aug 2020 16:11:17 -0400 Subject: [PATCH 5/5] Skip calling handle_ambience() if there is no client assigned Fixes potential CPU usage issue for EVERY single mob having that call --- code/modules/mob/living/life.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index a74a4a22b3..bf3d898b6c 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -46,8 +46,8 @@ //Check if we're on fire handle_fire() - // Handle re-running ambience to mobs if they've remained in an area. - handle_ambience() + if(client) // Handle re-running ambience to mobs if they've remained in an area, AND have an active client assigned to them. + handle_ambience() //stuff in the stomach //handle_stomach() //VOREStation Code