cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 16:44:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Dunking handle_atom_del() in the trash bin. [MDB IGNORE] (#23183)

Browse Source 
* Dunking handle_atom_del() in the trash bin.

* Update _box_magazine.dm

* Modular paths

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-08-18 18:17:04 +02:00
committed by GitHub
parent da34f6839a
commit d21e06104f
70 changed files with 356 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/pets/dog/corgi.dm
+4 -4
View File
@@ -42,16 +42,16 @@
UnregisterSignal(src, list(COMSIG_BASICMOB_LOOK_ALIVE, COMSIG_BASICMOB_LOOK_DEAD))
return ..()
/mob/living/basic/pet/dog/corgi/handle_atom_del(atom/deleting_atom)
if(deleting_atom == inventory_head)
/mob/living/basic/pet/dog/corgi/Exited(atom/movable/gone, direction)
. = ..()
if(gone == inventory_head)
inventory_head = null
update_corgi_fluff()
update_appearance(UPDATE_OVERLAYS)
if(deleting_atom == inventory_back)
if(gone == inventory_back)
inventory_back = null
update_corgi_fluff()
update_appearance(UPDATE_OVERLAYS)
return ..()
/mob/living/basic/pet/dog/corgi/gib()
if(inventory_head)
code/modules/mob/living/basic/pets/pet.dm
+2 -3
View File
@@ -69,10 +69,9 @@
. = ..()
add_memory_in_range(src, 7, /datum/memory/pet_died, deuteragonist = src) //Protagonist is the person memorizing it
/mob/living/basic/pet/handle_atom_del(atom/deleting_atom)
/mob/living/basic/pet/Exited(atom/movable/gone, direction)
. = ..()
if(deleting_atom != collar)
if(gone != collar)
return
collar = null