cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes last references to simple_animal

Browse Source
This commit is contained in:
Novacat
2022-09-10 16:53:32 -04:00
committed by CHOMPStation2
parent c05c3ea8d9
commit 06014fb014
4 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/__defines/dcs/signals.dm
View File

@@ -400,10 +400,6 @@
///called when removing a given item from a mob, from mob/living/carbon/remove_embedded_object(mob/living/carbon/target, /obj/item) ///called when removing a given item from a mob, from mob/living/carbon/remove_embedded_object(mob/living/carbon/target, /obj/item)
#define COMSIG_CARBON_EMBED_REMOVAL "item_embed_remove_safe" #define COMSIG_CARBON_EMBED_REMOVAL "item_embed_remove_safe"
// /mob/living/simple_animal/hostile signals
#define COMSIG_HOSTILE_ATTACKINGTARGET "hostile_attackingtarget"
#define COMPONENT_HOSTILE_NO_ATTACK (1<<0)
// /obj signals // /obj signals
///from base of obj/deconstruct(): (disassembled) ///from base of obj/deconstruct(): (disassembled)

7
code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm
View File

@@ -382,13 +382,6 @@
. = TRUE . = TRUE
if(src in KA.modkits) // Sanity check to prevent installing the same modkit twice thanks to occasional click/lag delays. if(src in KA.modkits) // Sanity check to prevent installing the same modkit twice thanks to occasional click/lag delays.
return FALSE return FALSE
// if(minebot_upgrade)
// if(minebot_exclusive && !istype(KA.loc, /mob/living/simple_animal/hostile/mining_drone))
// to_chat(user, "<span class='notice'>The modkit you're trying to install is only rated for minebot use.</span>")
// return FALSE
// else if(istype(KA.loc, /mob/living/simple_animal/hostile/mining_drone))
// to_chat(user, "<span class='notice'>The modkit you're trying to install is not rated for minebot use.</span>")
// return FALSE
if(denied_type) if(denied_type)
var/number_of_denied = 0 var/number_of_denied = 0
for(var/A in KA.get_modkits()) for(var/A in KA.get_modkits())

3
code/modules/tgui/states/notcontained.dm
View File

@@ -21,6 +21,3 @@ GLOBAL_DATUM_INIT(tgui_notcontained_state, /datum/tgui_state/notcontained_state,
/mob/living/silicon/notcontained_can_use_tgui_topic(src_object) /mob/living/silicon/notcontained_can_use_tgui_topic(src_object)
return default_can_use_tgui_topic(src_object) // Silicons use default bevhavior. return default_can_use_tgui_topic(src_object) // Silicons use default bevhavior.
/mob/living/simple_animal/drone/notcontained_can_use_tgui_topic(src_object)
return default_can_use_tgui_topic(src_object) // Drones use default bevhavior.

6
code/modules/xenobio2/mob/xeno.dm
View File

@@ -101,6 +101,12 @@ Also includes Life and New
stasis += hit.stasisforce stasis += hit.stasisforce
..() ..()
<<<<<<< HEAD
/mob/living/simple_animal/xeno/Destroy() /mob/living/simple_animal/xeno/Destroy()
QDEL_NULL(traitdat) QDEL_NULL(traitdat)
=======
/mob/living/simple_mob/xeno/Destroy()
traitdat.Destroy() //Let's clean up after ourselves.
traitdat = null
>>>>>>> 1ef36f1a6e... Merge pull request #13709 from Heroman3003/remove-animal
..() ..()