From 5f7b65040175114787d5f4c12f92e4716e9664a9 Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Sun, 10 Aug 2025 07:34:04 -0700 Subject: [PATCH] Fixes for #29996 (#30005) --- .../chemical_flamethrower/fire_effect.dm | 2 +- .../mob/living/carbon/alien/alien_base.dm | 4 --- .../mob/living/carbon/alien/alien_death.dm | 1 + .../simple_animal/friendly/diona_nymph.dm | 18 +++++-------- .../simple_animal/friendly/farm_animals.dm | 2 +- .../living/simple_animal/friendly/mouse.dm | 26 ++++++++----------- .../projectiles/guns/projectile/pistol.dm | 2 +- code/modules/surgery/tools.dm | 5 +--- 8 files changed, 23 insertions(+), 37 deletions(-) diff --git a/code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm b/code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm index 85b2cffe7f7..e8262cdf97e 100644 --- a/code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm +++ b/code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm @@ -137,7 +137,7 @@ GLOBAL_LIST_EMPTY(flame_effects) . = ..(mapload, T0C + 300, 4 HOURS, 1) set_light(3, 3, LIGHT_COLOR_LAVA) -/obj/effect/fire/water_act(volume, temperature, source, method) +/obj/effect/fire/mapping/water_act(volume, temperature, source, method) . = ..() duration -= 30 MINUTES if(duration <= 0) diff --git a/code/modules/mob/living/carbon/alien/alien_base.dm b/code/modules/mob/living/carbon/alien/alien_base.dm index f9322dd50de..b1455fc31b9 100644 --- a/code/modules/mob/living/carbon/alien/alien_base.dm +++ b/code/modules/mob/living/carbon/alien/alien_base.dm @@ -34,10 +34,6 @@ var/obj/item/organ/internal/organ = new organ_path() organ.insert(src) -/mob/living/carbon/alien/death(gibbed) - move_resist = null - return ..() - /// returns the list of type paths of the organs that we need to insert into /// this particular xeno upon its creation /mob/living/carbon/alien/proc/get_caste_organs() diff --git a/code/modules/mob/living/carbon/alien/alien_death.dm b/code/modules/mob/living/carbon/alien/alien_death.dm index 78c021f9bf5..47169f5cc97 100644 --- a/code/modules/mob/living/carbon/alien/alien_death.dm +++ b/code/modules/mob/living/carbon/alien/alien_death.dm @@ -61,6 +61,7 @@ QDEL_IN(animation, 15) /mob/living/carbon/alien/death(gibbed) + move_resist = null // Only execute the below if we successfully died . = ..(gibbed) if(!.) diff --git a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm index 083c78a6b2b..29ad8d58d41 100644 --- a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm +++ b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm @@ -54,6 +54,13 @@ /mob/living/simple_animal/diona/Initialize(mapload) . = ..() AddElement(/datum/element/wears_collar) + if(name == initial(name)) //To stop named dionas becoming generic. + name = "[name] ([rand(1, 1000)])" + real_name = name + add_language("Rootspeak") + merge_action.Grant(src) + evolve_action.Grant(src) + steal_blood_action.Grant(src) /datum/action/innate/diona/merge name = "Merge with gestalt" @@ -82,17 +89,6 @@ var/mob/living/simple_animal/diona/user = owner user.steal_blood() -/mob/living/simple_animal/diona/Initialize(mapload) - . = ..() - - if(name == initial(name)) //To stop Pun-Pun becoming generic. - name = "[name] ([rand(1, 1000)])" - real_name = name - add_language("Rootspeak") - merge_action.Grant(src) - evolve_action.Grant(src) - steal_blood_action.Grant(src) - /mob/living/simple_animal/diona/UnarmedAttack(atom/A) if(isdiona(A) && (src in A.contents)) //can't attack your gestalt visible_message("[src] wiggles around a bit.") diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index e7cfc84a62e..dfc483deced 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -226,7 +226,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) update_appearance(UPDATE_ICON_STATE) GLOB.chicken_count += 1 -/mob/living/simple_animal/chick/scatter_atom(x_offset, y_offset) +/mob/living/simple_animal/chicken/scatter_atom(x_offset, y_offset) pixel_x = rand(-6, 6) + x_offset pixel_y = rand(0, 10) + y_offset diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index d0129513d33..3221b803cbb 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -39,6 +39,17 @@ . = ..() AddElement(/datum/element/wears_collar) AddComponent(/datum/component/squeak, list('sound/creatures/mousesqueak.ogg' = 1), 100, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) //as quiet as a mouse or whatever + if(!mouse_color) + mouse_color = pick("brown", "gray", "white") + icon_state = "mouse_[mouse_color]" + icon_living = "mouse_[mouse_color]" + icon_dead = "mouse_[mouse_color]_dead" + icon_resting = "mouse_[mouse_color]_sleep" + update_appearance(UPDATE_ICON_STATE|UPDATE_DESC) + var/static/list/loc_connections = list( + COMSIG_ATOM_ENTERED = PROC_REF(on_atom_entered) + ) + AddElement(/datum/element/connect_loc, loc_connections) /mob/living/simple_animal/mouse/handle_automated_action() #if defined(GAME_TESTS) || defined(MAP_TESTS) // DO NOT EAT MY CABLES DURING TESTS @@ -76,21 +87,6 @@ else if(prob(0.5)) lay_down() -/mob/living/simple_animal/mouse/Initialize(mapload) - . = ..() - - if(!mouse_color) - mouse_color = pick("brown", "gray", "white") - icon_state = "mouse_[mouse_color]" - icon_living = "mouse_[mouse_color]" - icon_dead = "mouse_[mouse_color]_dead" - icon_resting = "mouse_[mouse_color]_sleep" - update_appearance(UPDATE_ICON_STATE|UPDATE_DESC) - var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = PROC_REF(on_atom_entered) - ) - AddElement(/datum/element/connect_loc, loc_connections) - /mob/living/simple_animal/mouse/update_desc() . = ..() desc = "It's a small [mouse_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself." diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 66724cae82f..de9f5826f2b 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -45,7 +45,7 @@ mag_type = /obj/item/ammo_box/magazine/m45 can_suppress = FALSE -/obj/item/gun/projectile/automatic/pistol/update_overlays() +/obj/item/gun/projectile/automatic/pistol/m1911/update_overlays() . = list() if(gun_light) var/flashlight = "uflashlight_attached" diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 058dd556b08..b1278088890 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -63,6 +63,7 @@ /obj/item/cautery/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_SURGICAL, ROUNDSTART_TRAIT) RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit)) RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit)) @@ -88,10 +89,6 @@ cig.light(user, target) return TRUE -/obj/item/cautery/Initialize(mapload) - . = ..() - ADD_TRAIT(src, TRAIT_SURGICAL, ROUNDSTART_TRAIT) - /obj/item/cautery/augment desc = "A heated element that cauterizes wounds." toolspeed = 0.5