Fix some harddels. (#21373)

Let's try to haunt down this brain and mannequin harddel bullshit

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2025-09-29 23:20:44 +00:00
committed by GitHub
co-authored by Matt Atlas
parent eeefc04d3a
commit 7f474bd363
10 changed files with 39 additions and 9 deletions
@@ -14,6 +14,10 @@
hold.max_storage_space = DEFAULT_BOX_STORAGE
hold.max_w_class = WEIGHT_CLASS_SMALL
/obj/item/clothing/accessory/storage/Destroy()
QDEL_NULL(hold)
return ..()
/obj/item/clothing/accessory/storage/attack_hand(mob/user as mob)
if (has_suit) //if we are part of a suit
hold.open(user)
+2 -1
View File
@@ -100,7 +100,8 @@
var/datum/weakref/carp_weakref = carp_ref
var/mob/living/simple_animal/hostile/carp/fish = carp_weakref.resolve()
if (fish && prob(50) && is_type_in_typecache(fish.loc, despawn_turfs))
qdel(fish)
spawned_carp -= carp_weakref
qdel(carp_weakref)
/datum/event/carp_migration/cozmo/start()
..()
@@ -21,7 +21,7 @@
death(1) //Brains can die again. AND THEY SHOULD AHA HA HA HA HA HA
ghostize() //Ghostize checks for key so nothing else is necessary.
container = null
. = ..()
return ..()
/mob/living/carbon/brain/IsAdvancedToolUser() // to be able to use weapons when piloting a hardsuit
return TRUE
@@ -19,7 +19,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
/mob/living/carbon/human/dummy/mannequin/Destroy()
SSmobs.free_mannequin(src)
. = ..()
return ..()
/mob/living/carbon/human/vatgrown/Initialize(mapload)
. = ..(mapload, SPECIES_HUMAN_VATGROWN)
+13 -3
View File
@@ -66,9 +66,6 @@
var/toxloss = 0
var/datum/reagents/metabolism/ingested
/mob/living/carbon/slime/get_ingested_reagents()
return ingested
/mob/living/carbon/slime/Initialize(mapload, colour = "grey")
. = ..()
@@ -90,6 +87,19 @@
last_AI = world.time
regenerate_icons()
/mob/living/carbon/slime/Destroy()
victim = null
target = null
leader = null
for(var/mob/friend in friends)
friends -= friend
friends.Cut()
QDEL_NULL(ingested)
return ..()
/mob/living/carbon/slime/get_ingested_reagents()
return ingested
/mob/living/carbon/slime/purple/Initialize(mapload, colour = "purple")
. = ..()
@@ -265,7 +265,6 @@
var/mob_type = pick(repopulate_types)
var/mob/S = new mob_type(T)
animals += S
GLOB.death_event.register(S, src, PROC_REF(remove_animal))
RegisterSignal(S, COMSIG_QDELETING, PROC_REF(remove_animal))
adapt_animal(S)
if(animals.len >= max_animal_count)
@@ -287,7 +286,6 @@
/obj/effect/overmap/visitable/sector/exoplanet/proc/remove_animal(mob/M)
animals -= M
GLOB.death_event.unregister(M, src)
UnregisterSignal(M, COMSIG_QDELETING)
repopulate_types |= M.type
@@ -35,6 +35,10 @@
atom_flags ^= ATOM_FLAG_OPEN_CONTAINER
update_icon()
/obj/item/reagent_containers/food/drinks/flask/vacuumflask/Destroy()
QDEL_NULL(cup)
return ..()
/obj/item/reagent_containers/food/drinks/flask/vacuumflask/attack_self(mob/user)
if(cup)
to_chat(user, SPAN_NOTICE("You remove \the [src]'s cap."))