mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-27 07:08:55 +01:00
The 515 MegaPR early downport (#7783)
Co-authored-by: Selis <selis@xynolabs.com> Co-authored-by: Selis <sirlionfur@hotmail.de> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: SatinIsle <thesatinisle@gmail.com> Co-authored-by: Heroman <alesha3000@list.ru> Co-authored-by: Casey <a.roaming.shadow@gmail.com> Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
co-authored by
Selis
Selis
Kashargul
SatinIsle
Heroman
Casey
Raeschen
parent
96a43a09c1
commit
b90f7ec922
+32
-5
@@ -2,21 +2,38 @@
|
||||
mob_list -= src
|
||||
dead_mob_list -= src
|
||||
living_mob_list -= src
|
||||
player_list -= src
|
||||
unset_machine()
|
||||
qdel(hud_used)
|
||||
QDEL_NULL(hud_used)
|
||||
clear_fullscreen()
|
||||
if(client)
|
||||
for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
|
||||
qdel(spell_master)
|
||||
remove_screen_obj_references()
|
||||
client.screen = list()
|
||||
client.screen.Cut()
|
||||
if(mind && mind.current == src)
|
||||
spellremove(src)
|
||||
if(!istype(src,/mob/observer)) //CHOMPEdit
|
||||
ghostize() //CHOMPEdit
|
||||
//ChompEDIT start - fix hard qdels
|
||||
QDEL_NULL(plane_holder)
|
||||
..()
|
||||
return QDEL_HINT_HARDDEL_NOW
|
||||
|
||||
if(pulling)
|
||||
stop_pulling() //TG does this on atom/movable but our stop_pulling proc is here so whatever
|
||||
|
||||
previewing_belly = null // from code/modules/vore/eating/mob_ch.dm
|
||||
vore_selected = null // from code/modules/vore/eating/mob_vr
|
||||
|
||||
|
||||
if(mind)
|
||||
if(mind.current == src)
|
||||
mind.current = null
|
||||
if(mind.original == src)
|
||||
mind.original = null
|
||||
|
||||
. = ..()
|
||||
update_client_z(null)
|
||||
//return QDEL_HINT_HARDDEL_NOW
|
||||
|
||||
/mob/proc/remove_screen_obj_references()
|
||||
hands = null
|
||||
@@ -44,7 +61,8 @@
|
||||
set_focus(src) // VOREStation Add - Key Handling
|
||||
hook_vr("mob_new",list(src)) //VOREStation Code
|
||||
update_transform() // Some mobs may start bigger or smaller than normal.
|
||||
return ..()
|
||||
. = ..()
|
||||
//return QDEL_HINT_HARDDEL_NOW Just keep track of mob references. They delete SO much faster now.
|
||||
|
||||
/mob/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2)
|
||||
var/time = say_timestamp()
|
||||
@@ -1210,6 +1228,15 @@
|
||||
var/exploitmsg = html_decode("\n" + "Has " + I.name + ".")
|
||||
exploit_record += exploitmsg
|
||||
|
||||
|
||||
/obj/Destroy()
|
||||
if(istype(src.loc, /mob))
|
||||
var/mob/holder = src.loc
|
||||
if(src in holder.exploit_addons)
|
||||
holder.exploit_addons -= src
|
||||
. = ..()
|
||||
|
||||
|
||||
/client/proc/check_has_body_select()
|
||||
return mob && mob.hud_used && istype(mob.zone_sel, /obj/screen/zone_sel)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user