Removes remnants of my enthusiasm

baystation12.dme

@@ -2332,6 +2332,43 @@
 #include "code\modules\mob\observer\virtual\base.dm"
 #include "code\modules\mob\observer\virtual\helpers.dm"
 #include "code\modules\mob\observer\virtual\mob.dm"
+#include "code\modules\mob\organs\_organ_setup.dm"
+#include "code\modules\mob\organs\blood.dm"
+#include "code\modules\mob\organs\organ.dm"
+#include "code\modules\mob\organs\pain.dm"
+#include "code\modules\mob\organs\robolimbs.dm"
+#include "code\modules\mob\organs\external\_external.dm"
+#include "code\modules\mob\organs\external\_external_damage.dm"
+#include "code\modules\mob\organs\external\_external_icons.dm"
+#include "code\modules\mob\organs\external\diona.dm"
+#include "code\modules\mob\organs\external\head.dm"
+#include "code\modules\mob\organs\external\standard.dm"
+#include "code\modules\mob\organs\external\stump.dm"
+#include "code\modules\mob\organs\external\unbreakable.dm"
+#include "code\modules\mob\organs\external\vox.dm"
+#include "code\modules\mob\organs\external\xenos.dm"
+#include "code\modules\mob\organs\external\wounds\wound.dm"
+#include "code\modules\mob\organs\external\wounds\wound_types.dm"
+#include "code\modules\mob\organs\internal\_internal.dm"
+#include "code\modules\mob\organs\internal\appendix.dm"
+#include "code\modules\mob\organs\internal\borer.dm"
+#include "code\modules\mob\organs\internal\brain.dm"
+#include "code\modules\mob\organs\internal\cerebrum.dm"
+#include "code\modules\mob\organs\internal\embryo.dm"
+#include "code\modules\mob\organs\internal\eyes.dm"
+#include "code\modules\mob\organs\internal\golem.dm"
+#include "code\modules\mob\organs\internal\heart.dm"
+#include "code\modules\mob\organs\internal\kidneys.dm"
+#include "code\modules\mob\organs\internal\liver.dm"
+#include "code\modules\mob\organs\internal\lungs.dm"
+#include "code\modules\mob\organs\internal\machine.dm"
+#include "code\modules\mob\organs\internal\man_machine_interface.dm"
+#include "code\modules\mob\organs\internal\metroid_jelly_vessel.dm"
+#include "code\modules\mob\organs\internal\posibrain.dm"
+#include "code\modules\mob\organs\internal\stack.dm"
+#include "code\modules\mob\organs\internal\stomach.dm"
+#include "code\modules\mob\organs\internal\voicebox.dm"
+#include "code\modules\mob\organs\internal\vox.dm"
 #include "code\modules\mob_spawn\mob_spawn.dm"
 #include "code\modules\mob_spawn\ghost_roles\golem_roles.dm"
 #include "code\modules\mob_spawn\ghost_roles\spider_roles.dm"
@@ -2448,43 +2485,6 @@
 #include "code\modules\nano\modules\human_appearance.dm"
 #include "code\modules\nano\modules\law_manager.dm"
 #include "code\modules\nano\modules\nano_module.dm"
-#include "code\modules\organs\_organ_setup.dm"
-#include "code\modules\organs\blood.dm"
-#include "code\modules\organs\organ.dm"
-#include "code\modules\organs\pain.dm"
-#include "code\modules\organs\robolimbs.dm"
-#include "code\modules\organs\external\_external.dm"
-#include "code\modules\organs\external\_external_damage.dm"
-#include "code\modules\organs\external\_external_icons.dm"
-#include "code\modules\organs\external\diona.dm"
-#include "code\modules\organs\external\head.dm"
-#include "code\modules\organs\external\standard.dm"
-#include "code\modules\organs\external\stump.dm"
-#include "code\modules\organs\external\unbreakable.dm"
-#include "code\modules\organs\external\vox.dm"
-#include "code\modules\organs\external\xenos.dm"
-#include "code\modules\organs\external\wounds\wound.dm"
-#include "code\modules\organs\external\wounds\wound_types.dm"
-#include "code\modules\organs\internal\_internal.dm"
-#include "code\modules\organs\internal\appendix.dm"
-#include "code\modules\organs\internal\borer.dm"
-#include "code\modules\organs\internal\brain.dm"
-#include "code\modules\organs\internal\cerebrum.dm"
-#include "code\modules\organs\internal\embryo.dm"
-#include "code\modules\organs\internal\eyes.dm"
-#include "code\modules\organs\internal\golem.dm"
-#include "code\modules\organs\internal\heart.dm"
-#include "code\modules\organs\internal\kidneys.dm"
-#include "code\modules\organs\internal\liver.dm"
-#include "code\modules\organs\internal\lungs.dm"
-#include "code\modules\organs\internal\machine.dm"
-#include "code\modules\organs\internal\man_machine_interface.dm"
-#include "code\modules\organs\internal\metroid_jelly_vessel.dm"
-#include "code\modules\organs\internal\posibrain.dm"
-#include "code\modules\organs\internal\stack.dm"
-#include "code\modules\organs\internal\stomach.dm"
-#include "code\modules\organs\internal\voicebox.dm"
-#include "code\modules\organs\internal\vox.dm"
 #include "code\modules\paperwork\adminpaper.dm"
 #include "code\modules\paperwork\carbonpaper.dm"
 #include "code\modules\paperwork\clipboard.dm"

code/__defines/modifiers.dm

@@ -1,3 +1,5 @@
+#define MODIFIER_GENETIC	1	// Modifiers with this flag will be copied to mobs who get cloned.
+
 #define MODIFIER_STACK_FORBID	1	// Disallows stacking entirely.
 #define MODIFIER_STACK_EXTEND	2	// Disallows a second instance, but will extend the first instance if possible.
 #define MODIFIER_STACK_ALLOWED	3	// Multiple instances are allowed.

code/_onclick/click.dm

@@ -483,12 +483,6 @@
 /mob
 	var/datum/stack/click_handlers
 
-/mob/Destroy()
-	if(click_handlers)
-		click_handlers.QdelClear()
-		QDEL_NULL(click_handlers)
-	. = ..()
-
 var/const/CLICK_HANDLER_NONE                 = 0
 var/const/CLICK_HANDLER_REMOVE_ON_MOB_LOGOUT = 1
 var/const/CLICK_HANDLER_ALL                  = (~0)

code/_onclick/hud/ability_screen_objects.dm

@@ -199,12 +199,6 @@
 			return VP
 	return null
 
-/mob/Login()
-	..()
-	if(ability_master)
-		ability_master.update_abilities(1, src)
-		ability_master.toggle_open(1)
-
 /mob/Initialize()
 	. = ..()
 	ability_master = new /obj/screen/movable/ability_master(null,src)

code/_onclick/hud/skybox.dm

@@ -83,16 +83,3 @@
 	. = ..()
 	if(. && skybox)
 		skybox.update()
-
-/mob/Login()
-	if(!skybox)
-		skybox = new(src)
-		skybox.owner = src
-	client.screen += skybox
-	..()
-
-/mob/Destroy()
-	if(client)
-		client.screen -= skybox
-	QDEL_NULL(skybox)
-	return ..()

code/game/objects/structures/crates_lockers/closets.dm

@@ -156,6 +156,10 @@
 
 	update_icon()
 
+/obj/structure/closet/Destroy()
+	QDEL_NULL(cdoor)
+	return ..()
+
 /obj/structure/closet/proc/WillContain()
 	return null
 

code/game/objects/structures/inflatable.dm

@@ -116,7 +116,9 @@
 
 	for(var/check_dir in GLOB.cardinal)
 		var/turf/T = get_step(get_turf(src), check_dir)
-		var/datum/gas_mixture/env = T.return_air()
+		var/datum/gas_mixture/env = T?.return_air()
+		if(!env)
+			continue
 		var/pressure = env.return_pressure()
 		min_pressure = min(min_pressure, pressure)
 		max_pressure = max(max_pressure, pressure)

code/modules/mob/living/carbon/human/human_species.dm

@@ -30,6 +30,9 @@
 /mob/living/carbon/human/dummy/mannequin/Life()
 	return // Because we never know
 
+/mob/living/carbon/human/dummy/mannequin/check_shadow()
+	return
+
 /mob/living/carbon/human/skrell/New(new_loc)
 	h_style = "Skrell Male Tentacles"
 	..(new_loc, SPECIES_SKRELL)

code/modules/mob/login.dm

@@ -41,12 +41,12 @@
 			params["name"] = real_name || name
 			world.Export("[config.external.login_export_addr]?[list2params(params)]", null, 1)
 
-/mob
-	var/client/my_client // Need to keep track of this ourselves, since by the time Logout() is called the client has already been nulled
-
 /mob/Login()
 	CAN_BE_REDEFINED(TRUE)
 	SHOULD_CALL_PARENT(TRUE)
+	if(!client)
+		return
+
 	GLOB.player_list |= src
 	update_Login_details()
 	world.update_status()
@@ -57,7 +57,8 @@
 
 	next_move = 1
 	set_sight(sight|SEE_SELF)
-	..()
+
+	client.statobj = src // DO NOT CALL PARENT HERE or BYOND will devour your soul
 
 	my_client = client
 
@@ -89,5 +90,18 @@
 	else
 		winset(src, null, "mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true")
 
+	if(!skybox)
+		skybox = new(src)
+		skybox.owner = src
+	client.screen += skybox
+
+	if(ability_master)
+		ability_master.update_abilities(1, src)
+		ability_master.toggle_open(1)
+		if(mind && ability_master.spell_objects)
+			for(var/obj/screen/ability/spell/screen in ability_master.spell_objects)
+				var/datum/spell/S = screen.spell
+				mind.learned_spells |= S
+
 	SEND_GLOBAL_SIGNAL(SIGNAL_LOGGED_IN, src)
 	SEND_SIGNAL(src, SIGNAL_LOGGED_IN, src)

code/modules/mob/mob.dm

@@ -8,10 +8,16 @@
 	remove_from_dead_mob_list()
 	remove_from_living_mob_list()
 	GLOB.player_list.Remove(src)
+	SSmobs.mob_list.Remove(src)
 
 	unset_machine()
+	//SStgui.force_close_all_windows(src) Needs further investigating
+
 	QDEL_NULL(hud_used)
 	QDEL_NULL(show_inventory)
+	QDEL_NULL(skybox)
+	QDEL_NULL(ability_master)
+	QDEL_NULL(shadow)
 
 	LAssailant = null
 	for(var/obj/item/grab/G in grabbed_by)
@@ -22,6 +28,10 @@
 	if(ability_master)
 		QDEL_NULL(ability_master)
 
+	if(click_handlers)
+		click_handlers.QdelClear()
+		QDEL_NULL(click_handlers)
+
 	remove_screen_obj_references()
 	if(client)
 		for(var/atom/movable/AM in client.screen)

code/modules/mob/mob_defines.dm

@@ -33,6 +33,8 @@
 	var/lastKnownIP = null
 	var/computer_id = null
 
+	var/client/my_client // Need to keep track of this ourselves, since by the time Logout() is called the client has already been nulled
+
 	var/stat = 0 //Whether a mob is alive or dead. TODO: Move this to living - Nodrak
 
 	var/obj/screen/hands = null
@@ -89,6 +91,9 @@
 
 	var/bhunger = 0			//Carbon
 
+	var/last_pain_message
+	var/next_pain_time = 0
+
 	var/druggy = 0			//Carbon
 	var/confused = 0		//Carbon
 	var/sleeping = 0		//Carbon

code/modules/mob/new_player/login.dm

@@ -51,11 +51,10 @@
 		mind.set_current(src)
 
 	loc = null
-	new /obj/screen/splash(client, TRUE)
 	my_client = client
-	set_sight(sight|SEE_TURFS)
+	set_sight(sight|SEE_OBJS|SEE_TURFS)
 	GLOB.player_list |= src
-	CreateRenderers()
+	new /obj/screen/splash(client, TRUE)
 
 	if(!SScharacter_setup.initialized)
 		SScharacter_setup.newplayers_requiring_init += src

code/modules/mob/new_player/logout.dm

@@ -8,5 +8,6 @@
 	..()
 	if(!spawning)//Here so that if they are spawning and log out, the other procs can play out and they will have a mob to come back to.
 		key = null//We null their key before deleting the mob, so they are properly kicked out.
+		QDEL_NULL(mind) // We transfer mind during create_character(), so this should only happen if the new_player actually logs out w/out actually entering the round.
 		qdel(src)
 	return

code/modules/mob/new_player/new_player.dm

@@ -32,6 +32,10 @@
 
 	return INITIALIZE_HINT_NORMAL
 
+/mob/new_player/Destroy()
+	QDEL_NULL(panel)
+	return ..()
+
 /mob/new_player/proc/new_player_panel(forced = FALSE)
 	if(!SScharacter_setup.initialized && !forced)
 		return // Not ready yet.
@@ -552,6 +556,7 @@
 			mind.gen_relations_info = client.prefs.relations_info["general"]
 		mind.traits = client.prefs.traits.Copy()
 		mind.transfer_to(new_character)					//won't transfer key since the mind is not active
+		mind = null
 
 	new_character.apply_traits()
 	new_character.SetName(real_name)

code/modules/mob/observer/ghost/ghost.dm

@@ -95,7 +95,7 @@ GLOBAL_LIST_EMPTY(ghost_sightless_images)
 
 	ghost_multitool = new(src)
 
-	GLOB.ghost_mob_list += src
+	GLOB.ghost_mob_list |= src
 
 	..()
 

code/modules/organs/pain.dm → code/modules/mob/organs/pain.dm

@@ -3,9 +3,6 @@
 		animate(pain, alpha = target, time = 15, easing = ELASTIC_EASING)
 		animate(pain, alpha = 0, time = 20)
 
-/mob/var/last_pain_message
-/mob/var/next_pain_time = 0
-
 // message is the custom message to be displayed
 // power decides how much painkillers will stop the message
 // force means it ignores anti-spam timer

code/modules/modifier/modifier.dm

@@ -1,5 +1,3 @@
-#define MODIFIER_GENETIC	1	// Modifiers with this flag will be copied to mobs who get cloned.
-
 
 // This is a datum that tells the mob that something is affecting them.
 // The advantage of using this datum verses just setting a variable on the mob directly, is that there is no risk of two different procs overwriting

code/modules/multiz/zshadow.dm

@@ -27,12 +27,6 @@
 	. = ..() // I'm cautious about this, but its the right thing to do.
 	owner = L
 
-/mob/Destroy()
-	if(shadow)
-		qdel(shadow)
-		shadow = null
-	. = ..()
-
 /mob/zshadow/Destroy()
 	owner = null
 	. = ..()

code/modules/recycling/disposal.dm

@@ -669,7 +669,7 @@
 	return
 
 /obj/structure/disposalholder/Destroy()
-	qdel(gas)
+	QDEL_NULL(gas)
 	active = 0
 	return ..()
 

code/modules/spells/spells.dm

@@ -16,17 +16,6 @@
 				if(SP_HOLDVAR)
 					statpanel(S.panel, "[S.holder_var_type] [S.holder_var_amount]", S.connected_button)
 
-//A fix for when a spell is created before a mob is created
-/mob/Login()
-	. = ..()
-	if(!mind)
-		return
-
-	if(ability_master?.spell_objects)
-		for(var/obj/screen/ability/spell/screen in ability_master.spell_objects)
-			var/datum/spell/S = screen.spell
-			mind.learned_spells |= S
-
 /proc/restore_spells(mob/H)
 	if(!H.mind?.learned_spells)
 		return