Merge branch 'master' into upstream-merge-29940

code/__DEFINES/food.dm

@@ -0,0 +1,12 @@
+#define MEAT 1
+#define VEGETABLES 2
+#define RAW 4
+#define JUNKFOOD 8
+#define GRAIN 16
+#define FRUIT 32
+#define DAIRY 64
+#define FRIED 128
+#define ALCOHOL 256
+#define SUGAR 512
+#define GROSS 1024
+#define TOXIC 2048

code/__DEFINES/misc.dm

@@ -441,3 +441,8 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #define BEAT_NONE 0
 
 #define BEAT_CHANNEL 150
+
+//http://www.byond.com/docs/ref/info.html#/atom/var/mouse_opacity
+#define MOUSE_OPACITY_TRANSPARENT 0
+#define MOUSE_OPACITY_ICON 1
+#define MOUSE_OPACITY_OPAQUE 2

code/__DEFINES/mobs.dm

@@ -65,6 +65,12 @@
 #define NUTRITION_LEVEL_HUNGRY 250
 #define NUTRITION_LEVEL_STARVING 150
 
+//Disgust levels for humans
+#define DISGUST_LEVEL_MAXEDOUT 150
+#define DISGUST_LEVEL_DISGUSTED 75
+#define DISGUST_LEVEL_VERYGROSS 50
+#define DISGUST_LEVEL_GROSS 25
+
 //Slime evolution threshold. Controls how fast slimes can split/grow
 #define SLIME_EVOLUTION_THRESHOLD 10
 

code/__DEFINES/server_tools.dm

@@ -4,6 +4,9 @@
 
 #define IRC_STATUS_THROTTLE 5
 
+#define PR_ANNOUNCEMENTS_PER_ROUND 5 //The number of unique PR announcements allowed per round
+									//This makes sure that a single person can only spam 3 reopens and 3 closes before being ignored
+
 //keep these in sync with TGS3
 #define SERVICE_WORLD_PARAM "server_service"
 #define SERVICE_PR_TEST_JSON "..\\..\\prtestjob.json"
@@ -17,7 +20,7 @@
 #define SERVICE_CMD_NAME_CHECK "namecheck"
 #define SERVICE_CMD_ADMIN_WHO "adminwho"
 
-//#define SERVICE_CMD_PARAM_KEY //defined in __compile_options.dm
+#define SERVICE_CMD_PARAM_KEY "serviceCommsKey"
 #define SERVICE_CMD_PARAM_COMMAND "command"
 #define SERVICE_CMD_PARAM_MESSAGE "message"
 #define SERVICE_CMD_PARAM_TARGET "target"

code/__HELPERS/type2type.dm

@@ -537,3 +537,18 @@
 	if(!istype(the_matrix) || the_matrix.len != 20)
 		return "#ffffffff"
 	return rgb(the_matrix[1]*255, the_matrix[6]*255, the_matrix[11]*255, the_matrix[16]*255)
+
+/proc/type2parent(child)
+	var/string_type = "[child]"
+	var/last_slash = findlasttext(string_type, "/")
+	if(last_slash == 1)
+		switch(child)
+			if(/datum)
+				return null
+			if(/obj || /mob)
+				return /atom/movable
+			if(/area || /turf)
+				return /atom
+			else
+				return /datum
+	return text2path(copytext(string_type, 1, last_slash))

code/_compile_options.dm

@@ -69,8 +69,6 @@
 #error You need version 511 or higher
 #endif
 
- #define SERVICE_CMD_PARAM_KEY "serviceCommsKey"
-
 //Update this whenever the db schema changes 
 //make sure you add an update to the schema_version stable in the db changelog
 #define DB_MAJOR_VERSION 3

code/_onclick/click.dm

@@ -434,7 +434,7 @@
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "flash"
 	plane = CLICKCATCHER_PLANE
-	mouse_opacity = 2
+	mouse_opacity = MOUSE_OPACITY_OPAQUE
 	screen_loc = "CENTER"
 
 /obj/screen/click_catcher/proc/UpdateGreed(view_size_x = 7, view_size_y = 7)

code/_onclick/hud/alert.dm

@@ -92,7 +92,7 @@
 	icon_state = "default"
 	name = "Alert"
 	desc = "Something seems to have gone wrong with this alert, so report this bug please"
-	mouse_opacity = 1
+	mouse_opacity = MOUSE_OPACITY_ICON
 	var/timeout = 0 //If set to a number, this alert will clear itself after that many deciseconds
 	var/severity = 0
 	var/alerttooltipstyle = ""
@@ -166,6 +166,21 @@
 	desc = "You're severely malnourished. The hunger pains make moving around a chore."
 	icon_state = "starving"
 
+/obj/screen/alert/gross
+	name = "Grossed out."
+	desc = "That was kind of gross..."
+	icon_state = "gross"
+
+/obj/screen/alert/verygross
+	name = "Very grossed out."
+	desc = "I'm not feeling very well.."
+	icon_state = "gross2"
+
+/obj/screen/alert/disgusted
+	name = "DISGUSTED"
+	desc = "ABSOLUTELY DISGUSTIN'"
+	icon_state = "gross3"
+
 /obj/screen/alert/hot
 	name = "Too Hot"
 	desc = "You're flaming hot! Get somewhere cooler and take off any insulating clothing like a fire suit."

code/_onclick/hud/blob_overmind.dm

@@ -130,7 +130,7 @@
 	blobpwrdisplay.name = "blob power"
 	blobpwrdisplay.icon_state = "block"
 	blobpwrdisplay.screen_loc = ui_health
-	blobpwrdisplay.mouse_opacity = 0
+	blobpwrdisplay.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	blobpwrdisplay.layer = ABOVE_HUD_LAYER
 	blobpwrdisplay.plane = ABOVE_HUD_PLANE
 	infodisplay += blobpwrdisplay

code/_onclick/hud/fullscreen.dm

@@ -67,7 +67,7 @@
 	screen_loc = "CENTER-7,CENTER-7"
 	layer = FULLSCREEN_LAYER
 	plane = FULLSCREEN_PLANE
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	var/severity = 0
 	var/show_when_dead = FALSE
 

code/_onclick/hud/parallax.dm

@@ -243,7 +243,7 @@
 	blend_mode = BLEND_ADD
 	plane = PLANE_SPACE_PARALLAX
 	screen_loc = "CENTER-7,CENTER-7"
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 
 /obj/screen/parallax_layer/Initialize(mapload, view)

code/_onclick/hud/plane_master.dm

@@ -26,13 +26,13 @@
 	name = "lighting plane master"
 	plane = LIGHTING_PLANE
 	blend_mode = BLEND_MULTIPLY
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/screen/plane_master/parallax
 	name = "parallax plane master"
 	plane = PLANE_SPACE_PARALLAX
 	blend_mode = BLEND_MULTIPLY
-	mouse_opacity = FALSE
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/screen/plane_master/parallax_white
 	name = "parallax whitifier plane master"

code/_onclick/hud/screen_objects.dm

@@ -33,7 +33,7 @@
 /obj/screen/text
 	icon = null
 	icon_state = null
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	screen_loc = "CENTER-7,CENTER-7"
 	maptext_height = 480
 	maptext_width = 480
@@ -468,7 +468,7 @@
 	name = "dmg"
 	blend_mode = BLEND_MULTIPLY
 	screen_loc = "CENTER-7,CENTER-7"
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	layer = UI_DAMAGE_LAYER
 	plane = FULLSCREEN_PLANE
 
@@ -494,7 +494,7 @@
 	name = "blob health"
 	icon_state = "block"
 	screen_loc = ui_internal
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/screen/healths/blob/naut
 	name = "health"
@@ -511,13 +511,13 @@
 	icon = 'icons/mob/guardian.dmi'
 	icon_state = "base"
 	screen_loc = ui_health
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/screen/healths/clock
 	icon = 'icons/mob/actions.dmi'
 	icon_state = "bg_clock"
 	screen_loc = ui_health
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/screen/healths/clock/gear
 	icon = 'icons/mob/clockwork_mobs.dmi'
@@ -529,13 +529,13 @@
 	icon = 'icons/mob/actions.dmi'
 	icon_state = "bg_revenant"
 	screen_loc = ui_health
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/screen/healths/construct
 	icon = 'icons/mob/screen_construct.dmi'
 	icon_state = "artificer_health0"
 	screen_loc = ui_construct_health
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/screen/healthdoll
 	name = "health doll"

code/citadel/cit_arousal.dm

@@ -181,224 +181,364 @@
 			else
 				to_chat(src, "<span class='notice'>You aren't aroused enough for that.</span>")
 
+
+//These are various procs that we'll use later, split up for readability instead of having one, huge proc.
+//For all of these, we assume the arguments given are proper and have been checked beforehand.
+/mob/living/carbon/human/proc/mob_masturbate(obj/item/organ/genital/G, mb_time = 30) //Masturbation, keep it gender-neutral
+	var/total_fluids = 0
+	var/datum/reagents/fluid_source = null
+
+	if(G.producing) //Can it produce its own fluids, such as breasts?
+		fluid_source = G.reagents
+	else
+		if(!G.linked_organ)
+			to_chat(src, "<span class='warning'>Your [G.name] is unable to produce it's own fluids, it's missing the organs for it.</span>")
+			return
+		fluid_source = G.linked_organ.reagents
+	total_fluids = fluid_source.total_volume
+	if(mb_time)
+		src.visible_message("<span class='danger'>[src] starts to [G.masturbation_verb] [p_their()] [G.name].</span>", \
+							"<span class='green'>You start to [G.masturbation_verb] your [G.name].</span>", \
+							"<span class='green'>You start to [G.masturbation_verb] your [G.name].</span>")
+
+	if(do_after(src, mb_time, target = src))
+		if(total_fluids > 5)
+			fluid_source.reaction(src.loc, TOUCH, 1, 0)
+			fluid_source.clear_reagents()
+		src.visible_message("<span class='danger'>[src] orgasms, cumming[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""]!</span>", \
+							"<span class='green'>You cum[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""].</span>", \
+							"<span class='green'>You have relieved yourself.</span>")
+		if(G.can_climax)
+			setArousalLoss(min_arousal)
+
+
+/mob/living/carbon/human/proc/mob_climax_outside(obj/item/organ/genital/G, mb_time = 30) //This is used for forced orgasms and other hands-free climaxes
+	var/total_fluids = 0
+	var/datum/reagents/fluid_source = null
+	var/unable_to_come = FALSE
+
+	if(G.producing) //Can it produce its own fluids, such as breasts?
+		fluid_source = G.reagents
+		total_fluids = fluid_source.total_volume
+	else
+		if(!G.linked_organ)
+			unable_to_come = TRUE
+		else
+			fluid_source = G.linked_organ.reagents
+			total_fluids = fluid_source.total_volume
+
+	if(unable_to_come)
+		src.visible_message("<span class='danger'>[src] shudders, their [G.name] unable to cum.</span>", \
+							"<span class='userdanger'>Your [G.name] cannot cum, giving no relief.</span>", \
+							"<span class='userdanger'>Your [G.name] cannot cum, giving no relief.</span>")
+	else
+		total_fluids = fluid_source.total_volume
+		if(mb_time) //as long as it's not instant, give a warning
+			src.visible_message("<span class='danger'>[src] looks like they're about to cum.</span>", \
+								"<span class='green'>You feel yourself about to orgasm.</span>", \
+								"<span class='green'>You feel yourself about to orgasm.</span>")
+		if(do_after(src, mb_time, target = src))
+			if(total_fluids > 5)
+				fluid_source.reaction(src.loc, TOUCH, 1, 0)
+			fluid_source.clear_reagents()
+			src.visible_message("<span class='danger'>[src] orgasms[istype(src.loc, /turf/open/floor) ? ", spilling onto [src.loc]" : ""], using [p_their()] [G.name]!</span>", \
+								"<span class='green'>You climax[istype(src.loc, /turf/open/floor) ? ", spilling onto [src.loc]" : ""] with your [G.name].</span>", \
+								"<span class='green'>You climax using your [G.name].</span>")
+			if(G.can_climax)
+				setArousalLoss(min_arousal)
+
+
+/mob/living/carbon/human/proc/mob_climax_partner(obj/item/organ/genital/G, mob/living/L, spillage = TRUE, mb_time = 30) //Used for climaxing with any living thing
+	var/total_fluids = 0
+	var/datum/reagents/fluid_source = null
+
+	if(G.producing) //Can it produce its own fluids, such as breasts?
+		fluid_source = G.reagents
+	else
+		if(!G.linked_organ)
+			to_chat(src, "<span class='warning'>Your [G.name] is unable to produce it's own fluids, it's missing the organs for it.</span>")
+			return
+		fluid_source = G.linked_organ.reagents
+	total_fluids = fluid_source.total_volume
+	if(mb_time) //Skip warning if this is an instant climax.
+		src.visible_message("[src] is about to climax with [L]!", \
+							"You're about to climax with [L]!", \
+							"<span class='danger'>You're preparing to climax with someone!</span>")
+	if(spillage)
+		if(do_after(src, mb_time, target = src) && in_range(src, L))
+			fluid_source.trans_to(L, total_fluids*G.fluid_transfer_factor)
+			total_fluids -= total_fluids*G.fluid_transfer_factor
+			if(total_fluids > 5)
+				fluid_source.reaction(L.loc, TOUCH, 1, 0)
+			fluid_source.clear_reagents()
+			src.visible_message("<span class='danger'>[src] climaxes with [L][spillage ? ", overflowing and spilling":""], using [p_their()] [G.name]!</span>", \
+								"<span class='green'>You orgasm with [L][spillage ? ", spilling out of them":""], using your [G.name].</span>", \
+								"<span class='green'>You have climaxed with someone[spillage ? ", spilling out of them":""], using your [G.name].</span>")
+			if(G.can_climax)
+				setArousalLoss(min_arousal)
+	else //knots and other non-spilling orgasms
+		if(do_after(src, mb_time, target = src) && in_range(src, L))
+			fluid_source.trans_to(L, total_fluids)
+			total_fluids = 0
+			src.visible_message("<span class='danger'>[src] climaxes with [L], [p_their()] [G.name] spilling nothing!</span>", \
+								"<span class='green'>You ejaculate with [L], your [G.name] spilling nothing.</span>", \
+								"<span class='green'>You have climaxed inside someone, your [G.name] spilling nothing.</span>")
+			if(G.can_climax)
+				setArousalLoss(min_arousal)
+
+
+/mob/living/carbon/human/proc/mob_fill_container(obj/item/organ/genital/G, obj/item/weapon/reagent_containers/container, mb_time = 30) //For beaker-filling, beware the bartender
+	var/total_fluids = 0
+	var/datum/reagents/fluid_source = null
+
+	if(G.producing) //Can it produce its own fluids, such as breasts?
+		fluid_source = G.reagents
+	else
+		if(!G.linked_organ)
+			to_chat(src, "<span class='warning'>Your [G.name] is unable to produce it's own fluids, it's missing the organs for it.</span>")
+			return
+		fluid_source = G.linked_organ.reagents
+	total_fluids = fluid_source.total_volume
+
+	//if(!container) //Something weird happened
+	//	to_chat(src, "<span class='warning'>You need a container to do this!</span>")
+	//	return
+
+	src.visible_message("<span class='danger'>[src] starts to [G.masturbation_verb] their [G.name] over [container].</span>", \
+						"<span class='userdanger'>You start to [G.masturbation_verb] your [G.name] over [container].</span>", \
+						"<span class='userdanger'>You start to [G.masturbation_verb] your [G.name] over something.</span>")
+	if(do_after(src, mb_time, target = src) && in_range(src, container))
+		fluid_source.trans_to(container, total_fluids)
+		src.visible_message("<span class='danger'>[src] uses [p_their()] [G.name] to fill [container]!</span>", \
+							"<span class='green'>You used your [G.name] to fill [container].</span>", \
+							"<span class='green'>You have relieved some pressure.</span>")
+		if(G.can_climax)
+			setArousalLoss(min_arousal)
+
+/mob/living/carbon/human/proc/pick_masturbate_genitals()
+	var/obj/item/organ/genital/ret_organ
+	var/list/genitals_list = list()
+	var/list/worn_stuff = get_equipped_items()
+
+	for(var/obj/item/organ/genital/G in internal_organs)
+		if(G.can_masturbate_with) //filter out what you can't masturbate with
+			if(G.is_exposed(worn_stuff)) //Nude or through_clothing
+				genitals_list += G
+	if(genitals_list.len)
+		ret_organ = input(src, "with what?", "Masturbate", null)  as null|obj in genitals_list
+		return ret_organ
+	return null //error stuff
+
+
+/mob/living/carbon/human/proc/pick_climax_genitals()
+	var/obj/item/organ/genital/ret_organ
+	var/list/genitals_list = list()
+	var/list/worn_stuff = get_equipped_items()
+
+	for(var/obj/item/organ/genital/G in internal_organs)
+		if(G.can_climax) //filter out what you can't masturbate with
+			if(G.is_exposed(worn_stuff)) //Nude or through_clothing
+				genitals_list += G
+	if(genitals_list.len)
+		ret_organ = input(src, "with what?", "Climax", null)  as null|obj in genitals_list
+		return ret_organ
+	return null //error stuff
+
+
+/mob/living/carbon/human/proc/pick_partner()
+	var/list/partners = list()
+	if(src.pulling)
+		partners += src.pulling //Yes, even objects for now
+	if(src.pulledby)
+		partners += src.pulledby
+	//Now we got both of them, let's check if they're proper
+	for(var/I in partners)
+		if(isliving(I))
+			if(iscarbon(I))
+				var/mob/living/carbon/C = I
+				if(!C.exposed_genitals.len) //Nothing through_clothing
+					if(!C.is_groin_exposed()) //No pants undone
+						if(!C.is_chest_exposed()) //No chest exposed
+							partners -= I //Then not proper, remove them
+		else
+			partners -= I //No fucking objects
+	//NOW the list should only contain correct partners
+	if(!partners.len)
+		return null //No one left.
+	return input(src, "With whom?", "Sexual partner", null) in partners //pick one, default to null
+
+/mob/living/carbon/human/proc/pick_climax_container()
+	var/obj/item/weapon/reagent_containers/SC = null
+	var/list/containers_list = list()
+
+	for(var/obj/item/weapon/reagent_containers/container in held_items)
+		if(container.is_open_container() || istype(container, /obj/item/weapon/reagent_containers/food/snacks))
+			containers_list += container
+
+	if(containers_list.len)
+		SC = input(src, "Into or onto what?(Cancel for nowhere)", null)  as null|obj in containers_list
+		if(SC)
+			if(in_range(src, SC))
+				return SC
+	return null //If nothing correct, give null.
+
+
+//Here's the main proc itself
 /mob/living/carbon/human/mob_climax(forced_climax=FALSE) //Forced is instead of the other proc, makes you cum if you have the tools for it, ignoring restraints
 	if(mb_cd_timer > world.time)
 		if(!forced_climax) //Don't spam the message to the victim if forced to come too fast
 			to_chat(src, "<span class='warning'>You need to wait [round((mb_cd_timer - world.time)/(20))] seconds before you can do that again!</span>")
 		return
 	mb_cd_timer = (world.time + mb_cd_length)
-	var/list/genitals_list = list()
-	var/obj/item/organ/genital/SG = null//originally selected_genital
-	var/list/containers_list = list()
-	var/obj/item/weapon/reagent_containers/SC = null
-	var/datum/reagents/fluid_source = null
-	var/into_container = 0
-	var/free_hands = get_num_arms() //arms was only used to know if we had ANY at all
-	var/total_cum = 0
-	var/finished = 0
-	var/mb_time = 30
+
+
 	if(canbearoused && has_dna())
 		if(stat==2)
 			to_chat(src, "<span class='warning'>You can't do that while dead!</span>")
 			return
 		if(forced_climax) //Something forced us to cum, this is not a masturbation thing and does not progress to the other checks
-			for(var/obj/item/organ/genital/G in internal_organs)
-				if(G.can_masturbate_with) //All capable genitals will orgasm with this
-					var/unable_to_come = FALSE
-					switch(G.type)
-						if(/obj/item/organ/genital/penis)
-							var/obj/item/organ/genital/penis/P = G
-							if(!P.linked_balls)
-								unable_to_come = TRUE
-							else
-								fluid_source = P.linked_balls.reagents
+			for(var/obj/item/organ/O in internal_organs)
+				if(istype(O, /obj/item/organ/genital))
+					var/obj/item/organ/genital/G = O
+					if(!G.can_climax) //Skip things like wombs and testicles
+						continue
+					var/mob/living/partner
+					var/check_target
+					var/list/worn_stuff = get_equipped_items()
 
+					if(G.is_exposed(worn_stuff))
+						if(src.pulling) //Are we pulling someone? Priority target, we can't be making option menus for this, has to be quick
+							if(isliving(src.pulling)) //Don't fuck objects
+								check_target = src.pulling
+						if(src.pulledby && !check_target) //prioritise pulled over pulledby
+							if(isliving(src.pulledby))
+								check_target = src.pulledby
+						//Now we should have a partner, or else we have to come alone
+						if(check_target)
+							if(iscarbon(check_target)) //carbons can have clothes
+								var/mob/living/carbon/C = check_target
+								if(C.exposed_genitals.len || C.is_groin_exposed() || C.is_chest_exposed()) //Are they naked enough?
+									partner = C
+							else //A cat is fine too
+								partner = check_target
+						if(partner) //Did they pass the clothing checks?
+							mob_climax_partner(G, partner, mb_time = 0) //Instant climax due to forced
+							continue //You've climaxed once with this organ, continue on
+					//not exposed OR if no partner was found while exposed, climax alone
+					mob_climax_outside(G, mb_time = 0) //removed climax timer for sudden, forced orgasms
+			//Now all genitals that could climax, have.
+			//Since this was a forced climax, we do not need to continue with the other stuff
+			return
+		//If we get here, then this is not a forced climax and we gotta check a few things.
 
-						if(/obj/item/organ/genital/vagina)
-							var/obj/item/organ/genital/vagina/V = G
-							if(!V.linked_womb)
-								unable_to_come = TRUE
-							else
-								fluid_source = V.linked_womb.reagents
-						else //Weird, undefined genitalia behaviour
-							unable_to_come = TRUE
-
-					if(unable_to_come)
-						src.visible_message("<span class='danger'>[src] shudders, their [G.name] unable to cum.</span>", \
-						"<span class='userdanger'>Your [G.name] cannot cum, giving no relief.</span>", \
-						"<span class='userdanger'>Your [G.name] cannot cum, giving no relief.</span>")
-					else
-						if(fluid_source)
-							total_cum = fluid_source.total_volume
-							src.visible_message("<span class='danger'>[src] looks like they're about to cum.</span>", \
-							"<span class='green'>You feel yourself about to orgasm.</span>", \
-							"<span class='green'>You feel yourself about to orgasm.</span>")
-							if(do_after(src, mb_time, target = src))
-								if(total_cum > 5)
-									fluid_source.reaction(src.loc, TOUCH, 1, 0)
-								fluid_source.clear_reagents()
-								fluid_source = null //cleanup so this can be used for the next genitalia
-
-								src.visible_message("<span class='danger'>[src] orgasms, cumming[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""]!</span>", \
-								"<span class='green'>You're forced to cum[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""] with your [G].</span>", \
-								"<span class='green'>Your [G] have been forced to climax.</span>")
-								finished = 1
-			if(finished)
-				setArousalLoss(min_arousal)
-			return //Do not proceed to masturbating if all genitals have been forced to orgasm.
-		if(stat==1) //Sleeping people can be forced chemically or with electrical stimulants, for example.
+		if(stat==1) //No sleep-masturbation, you're unconscious.
 			to_chat(src, "<span class='warning'>You must be conscious to do that!</span>")
 			return
-		if(restrained())
-			to_chat(src, "<span class='warning'>You can't do that while restrained!</span>")
-			return
-		if(getArousalLoss() < 33)//flat number instead of percentage
+		if(getArousalLoss() < 33) //flat number instead of percentage
 			to_chat(src, "<span class='warning'>You aren't aroused enough for that!</span>")
 			return
-		if(!is_groin_exposed())
-			to_chat(src, "<span class='warning'>You need to undress, first!</span>")
-			return
-		if(!free_hands)
-			to_chat(src, "<span class='warning'>You need at least one free arm.</span>")
-			return
-		for(var/helditem in held_items)//how many hands are free
-			if(isobj(helditem))
-				free_hands--
-		if(free_hands <= 0)
-			to_chat(src, "<span class='warning'>You need at least one free hand.</span>")
-			return
-		for(var/obj/item/organ/genital/G in internal_organs)
-			if(G.can_masturbate_with)//filter out what you can't masturbate with
-				genitals_list += G
-		if(genitals_list.len)
-			SG = input(src, "with what?", "Masturbate")  as null|obj in genitals_list
-			if(SG)
-				for(var/obj/item/weapon/reagent_containers/container in held_items)
-					if(container.is_open_container() || istype(container, /obj/item/weapon/reagent_containers/food/snacks/pie))
-						containers_list += container
-				if(containers_list.len)
-					SC = input(src, "Into or onto what?(Cancel for nowhere)", "Masturbate")  as null|obj in containers_list
-					if(SC)
-						if(in_range(src, SC))
-							into_container = 1
-				SG.update()
-				switch(SG.type)
 
-					//Penis
-					if(/obj/item/organ/genital/penis)
-						var/obj/item/organ/genital/penis/P = SG
-						if(!P.linked_balls)
-							to_chat(src, "<span class='warning'>You need a pair of testicles to do this.</span>")
-							return
-						fluid_source = P.linked_balls.reagents
-						total_cum = fluid_source.total_volume
-						if(into_container)//into a glass or beaker or whatever
-							src.visible_message("<span class='danger'>[src] starts [pick("jerking off","stroking")] their [SG.name] over [SC].</span>", \
-								"<span class='userdanger'>You start jerking off over [SC.name].</span>", \
-								"<span class='userdanger'>You start masturbating.</span>")
-							if(do_after(src, mb_time, target = src) && in_range(src, SC))
-								fluid_source.trans_to(SC, total_cum)
-								src.visible_message("<span class='danger'>[src] orgasms, [pick("cumming into", "emptying themself into")] [SC]!</span>", \
-									"<span class='green'>You cum into [SC].</span>", \
-									"<span class='green'>You have relieved yourself.</span>")
-								finished = 1
-						else //Not in a container
-							if(src.pulling)
-								if(iscarbon(src.pulling))
-									var/mob/living/carbon/C = src.pulling
-									if(!C.is_groin_exposed())
-										to_chat(src, "<span class='warning'>You must undress someone to climax inside them.</span>")
-										return
-								if(isliving(src.pulling)) //Gotta be alive to fuck it, don't wanna have to code fucking objects that ain't containers...
-									var/mob/living/partner = src.pulling
-									src.visible_message("[src] is about to climax inside [partner]!", \
-									"You're about to climax inside [partner]!", \
-									"<span class='danger'>You're preparing to climax inside someone!</span>")
-									switch(grab_state)
-										if(GRAB_PASSIVE)
-											if(do_after(src, mb_time, target = src) && in_range(src, partner))
-												var/spillage = 0.5 //Leaks a bit on passive grab
-												var/did_spill = FALSE
-												fluid_source.trans_to(partner, total_cum*(1-spillage))
-												total_cum = total_cum*spillage
-												if(total_cum > 5)
-													fluid_source.reaction(partner.loc, TOUCH, 1, 0)
-													did_spill = TRUE
-												fluid_source.clear_reagents()
+		//Ok, now we check what they want to do.
+		var/choice = input(src, "Select sexual activity", "Sexual activity:") in list("Masturbate", "Climax alone", "Climax with partner", "Fill container")
 
-												src.visible_message("<span class='danger'>[src] ejaculates inside [partner][did_spill ? ", overflowing and spilling":""]!</span>", \
-												"<span class='green'>You ejaculate inside [partner][did_spill ? ", spilling out of them":""].</span>", \
-												"<span class='green'>You have climaxed inside someone[did_spill ? ", spilling out of them":""].</span>")
-												finished = 1
-										else //Aggressive or higher
-											if(do_after(src, mb_time, target = src) && in_range(src, partner))
-												var/spillage = 0.0 //Leakproofing seals
-												fluid_source.trans_to(partner, total_cum*(1-spillage))
-												total_cum = total_cum*spillage
-												if(total_cum > 5)
-													fluid_source.reaction(partner.loc, TOUCH, 1, 0)
-												fluid_source.clear_reagents()
+		switch(choice)
+			if("Masturbate")
+				if(restrained(TRUE)) //TRUE ignores grabs
+					to_chat(src, "<span class='warning'>You can't do that while restrained!</span>")
+					return
+				var/free_hands = get_num_arms()
+				if(!free_hands)
+					to_chat(src, "<span class='warning'>You need at least one free arm.</span>")
+					return
+				for(var/helditem in held_items)//how many hands are free
+					if(isobj(helditem))
+						free_hands--
+				if(free_hands <= 0)
+					to_chat(src, "<span class='warning'>You're holding too many things.</span>")
+					return
+				//We got hands, let's pick an organ
+				var/obj/item/organ/genital/picked_organ
+				picked_organ = pick_masturbate_genitals()
+				if(picked_organ)
+					mob_masturbate(picked_organ)
+					return
+				else //They either lack organs that can masturbate, or they didn't pick one.
+					to_chat(src, "<span class='warning'>You cannot masturbate without choosing genitals.</span>")
+					return
 
-												src.visible_message("<span class='danger'>[src] ejaculates inside [partner], spilling nothing!</span>", \
-												"<span class='green'>You ejaculate inside [partner], spilling nothing.</span>", \
-												"<span class='green'>You have climaxed inside someone, spilling nothing.</span>")
-												finished = 1
-								//Don't care, not coding you fucking a unanchored girder
-							else //No pulling, or pulling non-living things
-								src.visible_message("<span class='danger'>[src] starts [pick("jerking off","stroking")] their [SG].</span>", \
-								"<span class='green'>You start masturbating.</span>", \
-								"<span class='green'>You start masturbating.</span>")
-								if(do_after(src, mb_time, target = src))
-									if(total_cum > 5)
-										fluid_source.reaction(src.loc, TOUCH, 1, 0)
-									fluid_source.clear_reagents()
+			if("Climax alone")
+				if(restrained(TRUE)) //TRUE ignores grabs
+					to_chat(src, "<span class='warning'>You can't do that while restrained!</span>")
+					return
+				var/free_hands = get_num_arms()
+				if(!free_hands)
+					to_chat(src, "<span class='warning'>You need at least one free arm.</span>")
+					return
+				for(var/helditem in held_items)//how many hands are free
+					if(isobj(helditem))
+						free_hands--
+				if(free_hands <= 0)
+					to_chat(src, "<span class='warning'>You're holding too many things.</span>")
+					return
+				//We got hands, let's pick an organ
+				var/obj/item/organ/genital/picked_organ
+				picked_organ = pick_climax_genitals()
+				if(picked_organ)
+					mob_climax_outside(picked_organ)
+					return
+				else //They either lack organs that can masturbate, or they didn't pick one.
+					to_chat(src, "<span class='warning'>You cannot climax without choosing genitals.</span>")
+					return
 
-									src.visible_message("<span class='danger'>[src] orgasms, cumming[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""]!</span>", \
-									"<span class='green'>You cum[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""].</span>", \
-									"<span class='green'>You have relieved yourself.</span>")
-									finished = 1
+			if("Climax with partner")
+				//We need no hands, we can be restrained and so on, so let's pick an organ
+				var/obj/item/organ/genital/picked_organ
+				picked_organ = pick_climax_genitals()
+				if(picked_organ)
+					var/mob/living/partner = pick_partner() //Get someone
+					if(partner)
+						var/spillage = input(src, "Would your fluids spill outside?", "Choose overflowing option", "Yes") as anything in list("Yes", "No")
+						if(spillage == "Yes")
+							mob_climax_partner(picked_organ, partner, TRUE)
+						else
+							mob_climax_partner(picked_organ, partner, FALSE)
+						return
+					else
+						to_chat(src, "<span class='warning'>You cannot do this alone.</span>")
+						return
+				else //They either lack organs that can masturbate, or they didn't pick one.
+					to_chat(src, "<span class='warning'>You cannot climax without choosing genitals.</span>")
+					return
 
-					if(/obj/item/organ/genital/vagina)
-						var/obj/item/organ/genital/vagina/V = SG
-						if(!V.linked_womb)
-							to_chat(src, "<span class='warning'>You need a womb to do this.</span>")
-							return
-						fluid_source = V.linked_womb.reagents
-						total_cum = fluid_source.total_volume
-						if(into_container)//into a glass or beaker or whatever
-							src.visible_message("<span class='danger'>[src] starts fingering their [SG.name] over [SC].</span>", \
-								"<span class='userdanger'>You start fingering over [SC.name].</span>", \
-								"<span class='userdanger'>You start masturbating.</span>")
-							if(do_after(src, mb_time, target = src) && in_range(src, SC))
-								fluid_source.trans_to(SC, total_cum)
-								src.visible_message("<span class='danger'>[src] orgasms, [pick("cumming into", "emptying themself into")] [SC]!</span>", \
-									"<span class='green'>You cum into [SC].</span>", \
-									"<span class='green'>You have relieved yourself.</span>")
-								finished = 1
-
-						else//not into a container
-							src.visible_message("<span class='danger'>[src] starts fingering their vagina.</span>", \
-								"<span class='userdanger'>You start fingering your vagina.</span>", \
-										"<span class='userdanger'>You start masturbating.</span>")
-							if(do_after(src, mb_time, target = src))
-								if(total_cum > 5)
-									fluid_source.reaction(src.loc, TOUCH, 1, 0)
-								fluid_source.clear_reagents()
-								src.visible_message("<span class='danger'>[src] orgasms, cumming[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""]!</span>", \
-									"<span class='green'>You cum[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""].</span>", \
-									"<span class='green'>You have relieved yourself.</span>")
-								finished = 1
-
-					else//backup message, just in case
-						src.visible_message("<span class='danger'>[src] starts masturbating!</span>", \
-								"<span class='userdanger'>You start masturbating.</span>")
-						if(do_after(src, mb_time, target = src))
-							src.visible_message("<span class='danger'>[src] [pick("relieves themself!", "shudders and moans in orgasm!")]</span>", \
-								"<span class='userdanger'>You have relieved yourself.</span>")
-							finished = 1
-				if(finished)
-					setArousalLoss(min_arousal)
-
-		else
-			to_chat(src, "<span class='warning'>You have no genitals!</span>")
-			return
+			if("Fill container")
+				//We'll need hands and no restraints.
+				if(restrained(TRUE)) //TRUE ignores grabs
+					to_chat(src, "<span class='warning'>You can't do that while restrained!</span>")
+					return
+				var/free_hands = get_num_arms()
+				if(!free_hands)
+					to_chat(src, "<span class='warning'>You need at least one free arm.</span>")
+					return
+				for(var/helditem in held_items)//how many hands are free
+					if(isobj(helditem))
+						free_hands--
+				if(free_hands <= 0)
+					to_chat(src, "<span class='warning'>You're holding too many things.</span>")
+					return
+				//We got hands, let's pick an organ
+				var/obj/item/organ/genital/picked_organ
+				picked_organ = pick_climax_genitals() //Gotta be climaxable, not just masturbation, to fill with fluids.
+				if(picked_organ)
+					//Good, got an organ, time to pick a container
+					var/obj/item/weapon/reagent_containers/fluid_container = pick_climax_container()
+					if(fluid_container)
+						mob_fill_container(picked_organ, fluid_container)
+						return
+					else
+						to_chat(src, "<span class='warning'>You cannot do this without anything to fill.</span>")
+						return
+				else //They either lack organs that can climax, or they didn't pick one.
+					to_chat(src, "<span class='warning'>You cannot fill anything without choosing genitals.</span>")
+					return
+			else //Somehow another option was taken, maybe something interrupted the selection or it was cancelled
+				return //Just end it in that case.

code/citadel/cit_reagents.dm

@@ -153,14 +153,13 @@
 	if(prob(33))
 		if(M.getArousalLoss() >= 100 && ishuman(M) && M.has_dna())
 			var/mob/living/carbon/human/H = M
-			to_chat(H, "<span class='love'>Your libido is going haywire!</span>")
-			H.mob_climax(forced_climax=TRUE)
+			if(prob(50)) //Less spam
+				to_chat(H, "<span class='love'>Your libido is going haywire!</span>")
+				H.mob_climax(forced_climax=TRUE)
 		if(M.min_arousal < 50)
 			M.min_arousal += 1
-			to_chat(M, "<span class='love'>You're having a hard time thinkin about things other than sex!</span>")
 		if(M.min_arousal < M.max_arousal)
 			M.min_arousal += 1
-			to_chat(M, "<span class='love'>You feel your libido permanently increasing.</span>")
 		M.adjustArousalLoss(2)
 	..()
 
@@ -197,10 +196,8 @@
 	if(prob(33))
 		if(M.min_arousal > 0)
 			M.min_arousal -= 1
-			to_chat(M, "<span class='notice'>You feel your libido returning to more normal levels.</span>")
 		if(M.min_arousal > 50)
 			M.min_arousal -= 1
-			to_chat(M, "<span class='notice'>You feel like your overactive libido is calming down.</span>")
 		M.adjustArousalLoss(-2)
 	..()
 

code/citadel/organs/breasts.dm

@@ -1,5 +1,5 @@
 /obj/item/organ/genital/breasts
-	name 					= "Breasts"
+	name 					= "breasts"
 	desc 					= "Female milk producing organs."
 	icon_state 				= "breasts"
 	icon 					= 'code/citadel/icons/breasts.dmi'
@@ -11,6 +11,10 @@
 	var/amount				= 2
 	producing				= TRUE
 	shape					= "pair"
+	can_masturbate_with		= TRUE
+	masturbation_verb 		= "massage"
+	can_climax				= TRUE
+	fluid_transfer_factor 	=0.5
 
 /obj/item/organ/genital/breasts/Initialize()
 	. = ..()
@@ -54,4 +58,10 @@
 				var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need.
 				color = "#[skintone2hex(H.skin_tone)]"
 		else
-			color = "#[owner.dna.features["breasts_color"]]"
+			color = "#[owner.dna.features["breasts_color"]]"
+
+/obj/item/organ/genital/breasts/is_exposed()
+	. = ..()
+	if(.)
+		return TRUE
+	return owner.is_chest_exposed()

code/citadel/organs/eggsack.dm

@@ -7,7 +7,7 @@
 	slot 			= "testicles"
 	color			= null //don't use the /genital color since it already is colored
 	w_class 		= 3
-	var/internal = TRUE
+	internal = TRUE
 	var/egg_girth = EGG_GIRTH_DEF
 	var/cum_mult = CUM_RATE_MULT
 	var/cum_rate = CUM_RATE

code/citadel/organs/genitals.dm

@@ -3,7 +3,10 @@
 	var/shape = "human"
 	var/sensitivity = 1
 	var/list/genital_flags = list()
-	var/can_masturbate_with = 0
+	var/can_masturbate_with = FALSE
+	var/masturbation_verb = "masturbate"
+	var/can_climax = FALSE
+	var/fluid_transfer_factor = 0.0 //How much would a partner get in them if they climax using this?
 	var/size = 2 //can vary between num or text, just used in icon_state strings
 	var/fluid_id = null
 	var/fluid_max_volume = 50
@@ -13,6 +16,9 @@
 	var/producing = FALSE
 	var/aroused_state = FALSE //Boolean used in icon_state strings
 	var/aroused_amount = 50 //This is a num from 0 to 100 for arousal percentage for when to use arousal state icons.
+	var/obj/item/organ/genital/linked_organ
+	var/through_clothes = FALSE
+	var/internal 		= FALSE
 
 /obj/item/organ/genital/Initialize()
 	. = ..()
@@ -34,6 +40,52 @@
 	update_appearance()
 	update_link()
 
+//exposure and through-clothing code
+/mob/living/carbon
+	var/list/exposed_genitals = list() //Keeping track of them so we don't have to iterate through every genitalia and see if exposed
+
+/obj/item/organ/genital/proc/is_exposed()
+	if(!owner)
+		return FALSE
+	if(internal)
+		return FALSE
+	if(through_clothes)
+		return TRUE
+
+/obj/item/organ/genital/proc/toggle_through_clothes()
+	if(through_clothes)
+		through_clothes = FALSE
+		owner.exposed_genitals -= src
+	else
+		through_clothes = TRUE
+		owner.exposed_genitals += src
+	if(ishuman(owner)) //recast to use update genitals proc
+		var/mob/living/carbon/human/H = owner
+		H.update_genitals()
+
+/mob/living/carbon/verb/toggle_genitals()
+	set category = "IC"
+	set name = "Expose/Hide genitals"
+	set desc = "Allows you to toggle which genitals should show through clothes or not."
+
+	var/list/genital_list = list()
+	for(var/obj/item/organ/O in internal_organs)
+		if(istype(O, /obj/item/organ/genital))
+			var/obj/item/organ/genital/G = O
+			if(!G.internal)
+				genital_list += G
+	if(!genital_list.len) //There is nothing to expose
+		return
+	//Full list of exposable genitals created
+	var/obj/item/organ/genital/picked_organ
+	picked_organ = input(src, "Expose/Hide genitals", "Choose which genitalia to expose/hide", null) in genital_list
+	if(picked_organ)
+		picked_organ.toggle_through_clothes()
+	return
+
+
+
+
 /obj/item/organ/genital/proc/update_size()
 
 /obj/item/organ/genital/proc/update_appearance()
@@ -41,6 +93,9 @@
 /obj/item/organ/genital/proc/update_link()
 
 /obj/item/organ/genital/proc/remove_ref()
+	if(linked_organ)
+		linked_organ.linked_organ = null
+		linked_organ = null
 
 /obj/item/organ/genital/Insert(mob/living/carbon/M, special = 0)
 	..()
@@ -58,21 +113,21 @@
 		var/obj/item/organ/genital/GtoClean
 		for(GtoClean in internal_organs)
 			qdel(GtoClean)
-
-	if(dna.features["has_cock"])
-		give_penis()
-		if(dna.features["has_balls"])
-			give_balls()
-	else if(dna.features["has_ovi"])
-		give_ovipositor()
-		if(dna.features["has_eggsack"])
-			give_eggsack()
+	//Order should be very important. FIRST vagina, THEN testicles, THEN penis, as this affects the order they are rendered in.
 	if(dna.features["has_breasts"])
 		give_breasts()
 	if(dna.features["has_vag"])
 		give_vagina()
-		if(dna.features["has_womb"])
-			give_womb()
+	if(dna.features["has_womb"])
+		give_womb()
+	if(dna.features["has_balls"])
+		give_balls()
+	if(dna.features["has_cock"])
+		give_penis()
+	if(dna.features["has_ovi"])
+		give_ovipositor()
+	if(dna.features["has_eggsack"])
+		give_eggsack()
 
 /mob/living/carbon/human/proc/give_penis()
 	if(!dna)
@@ -208,17 +263,15 @@
 	if(H.disabilities & HUSK)
 		return
 	//start scanning for genitals
-	var/list/worn_stuff = H.get_equipped_items()//cache this list so it's not built again
-	if(H.is_groin_exposed(worn_stuff))
-		//ORDER is important here. Vaginas first, theoretical testes after, and penis LAST.
-		//The latter is always drawn on top of the former.
-		if(H.has_vagina())
-			genitals_to_add += H.getorganslot("vagina")
-		if(H.has_penis())
-			genitals_to_add += H.getorganslot("penis")
-	if(H.is_chest_exposed(worn_stuff))
-		if(H.has_breasts())
-			genitals_to_add += H.getorganslot("breasts")
+	//var/list/worn_stuff = H.get_equipped_items()//cache this list so it's not built again
+
+	for(var/obj/item/organ/O in H.internal_organs)
+		if(istype(O, /obj/item/organ/genital))
+			var/obj/item/organ/genital/G = O
+			if(G.is_exposed()) //Checks appropriate clothing slot and if it's through_clothes
+				genitals_to_add += H.getorganslot(G.slot)
+	//Now we added all genitals that aren't internal and should be rendered
+
 	var/image/I
 	//start applying overlays
 	for(var/layer in relevant_layers)

code/citadel/organs/penis.dm

@@ -1,21 +1,23 @@
 /obj/item/organ/genital/penis
-	name 		= "Penis"
-	desc 		= "A male reproductive organ."
-	icon_state 	= "penis"
-	icon 		= 'code/citadel/icons/penis.dmi'
-	zone 		= "groin"
-	slot 		= "penis"
-	w_class 	= 3
-	can_masturbate_with = 1
-	size 	= 2 //arbitrary value derived from length and girth for sprites.
-	var/length 	= 6	//inches
+	name 					= "penis"
+	desc 					= "A male reproductive organ."
+	icon_state 				= "penis"
+	icon 					= 'code/citadel/icons/penis.dmi'
+	zone 					= "groin"
+	slot 					= "penis"
+	w_class 				= 3
+	can_masturbate_with 	= TRUE
+	masturbation_verb 		= "stroke"
+	can_climax 				= TRUE
+	fluid_transfer_factor = 0.5
+	size 					= 2 //arbitrary value derived from length and girth for sprites.
+	var/length 				= 6	//inches
 	var/cached_length //used to detect a change in length
-	var/girth  	= 0
-	var/girth_ratio = COCK_GIRTH_RATIO_DEF //0.73; check citadel_defines.dm
-	var/knot_girth_ratio = KNOT_GIRTH_RATIO_DEF
-	var/list/dickflags = list()
-	var/list/knotted_types = list("knotted", "barbknot")
-	var/obj/item/organ/genital/testicles/linked_balls
+	var/girth  				= 0
+	var/girth_ratio 		= COCK_GIRTH_RATIO_DEF //0.73; check citadel_defines.dm
+	var/knot_girth_ratio 	= KNOT_GIRTH_RATIO_DEF
+	var/list/dickflags 		= list()
+	var/list/knotted_types 	= list("knotted", "barbknot")
 
 /obj/item/organ/genital/penis/update_size()
 	if(length == cached_length)
@@ -55,15 +57,16 @@
 
 /obj/item/organ/genital/penis/update_link()
 	if(owner)
-		linked_balls = (owner.getorganslot("testicles"))
-		if(linked_balls)
-			linked_balls.linked_penis = src
+		linked_organ = (owner.getorganslot("testicles"))
+		if(linked_organ)
+			linked_organ.linked_organ = src
 	else
-		if(linked_balls)
-			linked_balls.linked_penis = null
-		linked_balls = null
+		if(linked_organ)
+			linked_organ.linked_organ = null
+		linked_organ = null
 
-/obj/item/organ/genital/penis/remove_ref()
-	if(linked_balls)
-		linked_balls.linked_penis = null
-		linked_balls = null
+/obj/item/organ/genital/penis/is_exposed()
+	. = ..()
+	if(.)
+		return TRUE
+	return owner.is_groin_exposed()

code/citadel/organs/testicles.dm

@@ -1,18 +1,17 @@
 /obj/item/organ/genital/testicles
-	name = "Testicles"
+	name = "testicles"
 	desc = "A male reproductive organ."
 	icon_state = "testicles"
 	icon = 'code/citadel/icons/penis.dmi'
 	zone = "groin"
 	slot = "testicles"
 	w_class = 3
-	var/internal 		= FALSE
+	internal	 		= TRUE
 	size 				= BALLS_SIZE_DEF
 	var/sack_size		= BALLS_SACK_SIZE_DEF
 	fluid_id 			= "semen"
 	producing			= TRUE
 	var/sent_full_message = 1 //defaults to 1 since they're full to start
-	var/obj/item/organ/genital/penis/linked_penis
 
 /obj/item/organ/genital/testicles/Initialize()
 	. = ..()
@@ -33,20 +32,20 @@
 		return FALSE
 	sent_full_message = 0
 	update_link()
-	if(!linked_penis)
+	if(!linked_organ)
 		return FALSE
 	reagents.isolate_reagent(fluid_id)//remove old reagents if it changed and just clean up generally
 	reagents.add_reagent(fluid_id, (fluid_mult * fluid_rate))//generate the cum
 
 /obj/item/organ/genital/testicles/update_link()
 	if(owner && !QDELETED(src))
-		linked_penis = (owner.getorganslot("penis"))
-		if(linked_penis)
-			linked_penis.linked_balls = src
+		linked_organ = (owner.getorganslot("penis"))
+		if(linked_organ)
+			linked_organ.linked_organ = src
 	else
-		if(linked_penis)
-			linked_penis.linked_balls = null
-		linked_penis = null
+		if(linked_organ)
+			linked_organ.linked_organ = null
+		linked_organ = null
 
 /obj/item/organ/genital/testicles/proc/send_full_message(msg = "Your balls finally feel full, again.")
 	if(owner && istext(msg))

code/citadel/organs/vagina.dm

@@ -1,12 +1,15 @@
 /obj/item/organ/genital/vagina
-	name 					= "Vagina"
+	name 					= "vagina"
 	desc 					= "A female reproductive organ."
 	icon					= 'code/citadel/icons/vagina.dmi'
 	icon_state 				= "vagina"
 	zone 					= "groin"
 	slot 					= "vagina"
 	size					= 1 //There is only 1 size right now
-	can_masturbate_with		= 1
+	can_masturbate_with		= TRUE
+	masturbation_verb 	= "finger"
+	can_climax 				= TRUE
+	fluid_transfer_factor = 0.1 //Yes, some amount is exposed to you, go get your AIDS
 	w_class 				= 3
 	var/cap_length		= 8//D   E   P   T   H (cap = capacity)
 	var/cap_girth		= 12
@@ -15,7 +18,6 @@
 	var/clit_diam 			= 0.25
 	var/clit_len			= 0.25
 	var/list/vag_types = list("tentacle", "dentata", "hairy")
-	var/obj/item/organ/genital/womb/linked_womb
 
 
 /obj/item/organ/genital/vagina/update_appearance()
@@ -56,15 +58,16 @@
 
 /obj/item/organ/genital/vagina/update_link()
 	if(owner)
-		linked_womb = (owner.getorganslot("womb"))
-		if(linked_womb)
-			linked_womb.linked_vag = src
+		linked_organ = (owner.getorganslot("womb"))
+		if(linked_organ)
+			linked_organ.linked_organ = src
 	else
-		if(linked_womb)
-			linked_womb.linked_vag = null
-		linked_womb = null
+		if(linked_organ)
+			linked_organ.linked_organ = null
+		linked_organ = null
 
-/obj/item/organ/genital/vagina/remove_ref()
-	if(linked_womb)
-		linked_womb.linked_vag = null
-		linked_womb = null
+/obj/item/organ/genital/vagina/is_exposed()
+	. = ..()
+	if(.)
+		return TRUE
+	return owner.is_groin_exposed()

code/citadel/organs/womb.dm

@@ -1,15 +1,15 @@
 /obj/item/organ/genital/womb
-	name 			= "Womb"
+	name 			= "womb"
 	desc 			= "A female reproductive organ."
 	icon			= 'code/citadel/icons/vagina.dmi'
 	icon_state 		= "womb"
 	zone 			= "groin"
 	slot 			= "womb"
 	w_class 		= 3
-	var/internal 	= FALSE
+	internal 		= TRUE
 	fluid_id 		= "femcum"
 	producing		= TRUE
-	var/obj/item/organ/genital/vagina/linked_vag
+
 
 /obj/item/organ/genital/womb/Initialize()
 	. = ..()
@@ -24,25 +24,20 @@
 /obj/item/organ/genital/womb/proc/generate_femcum()
 	reagents.maximum_volume = fluid_max_volume
 	update_link()
-	if(!linked_vag)
+	if(!linked_organ)
 		return FALSE
 	reagents.isolate_reagent(fluid_id)//remove old reagents if it changed and just clean up generally
 	reagents.add_reagent(fluid_id, (fluid_mult * fluid_rate))//generate the cum
 
 /obj/item/organ/genital/womb/update_link()
 	if(owner)
-		linked_vag = (owner.getorganslot("vagina"))
-		if(linked_vag)
-			linked_vag.linked_womb = src
+		linked_organ = (owner.getorganslot("vagina"))
+		if(linked_organ)
+			linked_organ.linked_organ = src
 	else
-		if(linked_vag)
-			linked_vag.linked_womb = null
-		linked_vag = null
-
-/obj/item/organ/genital/womb/remove_ref()
-	if(linked_vag)
-		linked_vag.linked_womb = null
-		linked_vag = null
+		if(linked_organ)
+			linked_organ.linked_organ = null
+		linked_organ = null
 
 /obj/item/organ/genital/womb/Destroy()
 	return ..()

code/controllers/subsystem/disease.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(disease)
 	name = "Disease"
-	flags = SS_NO_FIRE
+	flags = SS_NO_FIRE | SS_NO_INIT
 
 	var/list/active_diseases = list() //List of Active disease in all mobs; purely for quick referencing.
 	var/list/diseases
@@ -13,4 +13,4 @@ SUBSYSTEM_DEF(disease)
 		diseases = subtypesof(/datum/disease)
 
 /datum/controller/subsystem/disease/stat_entry(msg)
-	..("P:[active_diseases.len]")
+	..("P:[active_diseases.len]")

code/controllers/subsystem/ticker.dm

@@ -283,7 +283,7 @@ SUBSYSTEM_DEF(ticker)
 		SSshuttle.lockdown = TRUE
 
 	//initialise our cinematic screen object
-	cinematic = new /obj/screen{icon='icons/effects/station_explosion.dmi';icon_state="station_intact";layer=21;mouse_opacity=0;screen_loc="1,0";}(src)
+	cinematic = new /obj/screen{icon='icons/effects/station_explosion.dmi';icon_state="station_intact";layer=21;mouse_opacity = MOUSE_OPACITY_TRANSPARENT;screen_loc="1,0";}(src)
 
 	for(var/mob/M in GLOB.mob_list)
 		M.notransform = TRUE //stop everything moving
@@ -300,7 +300,7 @@ SUBSYSTEM_DEF(ticker)
 				if("nuclear emergency") //Nuke wasn't on station when it blew up
 					flick("intro_nuke",cinematic)
 					sleep(35)
-					SEND_SOUND(world, sound('sound/effects/explosionfar.ogg'))
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)
 					flick("station_intact_fade_red",cinematic)
 					cinematic.icon_state = "summary_nukefail"
@@ -329,13 +329,13 @@ SUBSYSTEM_DEF(ticker)
 				else
 					flick("intro_nuke",cinematic)
 					sleep(35)
-					SEND_SOUND(world, sound('sound/effects/explosionfar.ogg'))
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)
 
 
 		if(NUKE_MISS_STATION || NUKE_SYNDICATE_BASE)	//nuke was nowhere nearby	//TODO: a really distant explosion animation
 			sleep(50)
-			SEND_SOUND(world, sound('sound/effects/explosionfar.ogg'))
+			SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 			station_explosion_detonation(bomb)
 			actually_blew_up = station_missed == NUKE_SYNDICATE_BASE	//don't kill everyone on station if it detonated off station
 		else	//station was destroyed
@@ -346,28 +346,28 @@ SUBSYSTEM_DEF(ticker)
 					flick("intro_nuke",cinematic)
 					sleep(35)
 					flick("station_explode_fade_red",cinematic)
-					SEND_SOUND(world, sound('sound/effects/explosionfar.ogg'))
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)
 					cinematic.icon_state = "summary_nukewin"
 				if("AI malfunction") //Malf (screen,explosion,summary)
 					flick("intro_malf",cinematic)
 					sleep(76)
 					flick("station_explode_fade_red",cinematic)
-					SEND_SOUND(world, sound('sound/effects/explosionfar.ogg'))
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)	//TODO: If we ever decide to actually detonate the vault bomb
 					cinematic.icon_state = "summary_malf"
 				if("blob") //Station nuked (nuke,explosion,summary)
 					flick("intro_nuke",cinematic)
 					sleep(35)
 					flick("station_explode_fade_red",cinematic)
-					SEND_SOUND(world, sound('sound/effects/explosionfar.ogg'))
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)	//TODO: no idea what this case could be
 					cinematic.icon_state = "summary_selfdes"
 				if("cult") //Station nuked (nuke,explosion,summary)
 					flick("intro_nuke",cinematic)
 					sleep(35)
 					flick("station_explode_fade_red",cinematic)
-					SEND_SOUND(world, sound('sound/effects/explosionfar.ogg'))
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)	//TODO: no idea what this case could be
 					cinematic.icon_state = "summary_cult"
 				if("no_core") //Nuke failed to detonate as it had no core
@@ -381,7 +381,7 @@ SUBSYSTEM_DEF(ticker)
 					flick("intro_nuke",cinematic)
 					sleep(35)
 					flick("station_explode_fade_red", cinematic)
-					SEND_SOUND(world, sound('sound/effects/explosionfar.ogg'))
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)
 					cinematic.icon_state = "summary_selfdes"
 	//If its actually the end of the round, wait for it to end.

code/datums/beam.dm

@@ -141,7 +141,7 @@
 	afterDraw()
 
 /obj/effect/ebeam
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	anchored = TRUE
 	var/datum/beam/owner
 

code/datums/components/component.dm

@@ -1,25 +1,70 @@
 /datum/component
 	var/enabled = TRUE
 	var/dupe_mode = COMPONENT_DUPE_HIGHLANDER
+	var/dupe_type
 	var/list/signal_procs
 	var/datum/parent
 
 /datum/component/New(datum/P, ...)
+	parent = P
+	var/list/arguments = args.Copy()
+	arguments.Cut(1, 2)
+	Initialize(arglist(arguments))
+
 	var/dm = dupe_mode
 	if(dm != COMPONENT_DUPE_ALLOWED)
-		var/datum/component/old = P.GetExactComponent(type)
-		if(old)
-			switch(dm)
-				if(COMPONENT_DUPE_HIGHLANDER)
-					InheritComponent(old, FALSE)
-					qdel(old)
-				if(COMPONENT_DUPE_UNIQUE)
-					old.InheritComponent(src, TRUE)
-					qdel(src)
-					return
+		var/dt = dupe_type
+		var/datum/component/old 
+		if(!dt)
+			old = P.GetExactComponent(type)
+		else
+			old = P.GetComponent(dt)
+		switch(dm)
+			if(COMPONENT_DUPE_UNIQUE)
+				old.InheritComponent(src, TRUE)
+				parent = null	//prevent COMPONENT_REMOVING signal
+				qdel(src)
+				return
+			if(COMPONENT_DUPE_HIGHLANDER)
+				InheritComponent(old, FALSE)
+				qdel(old)
+	
+	//let the others know
 	P.SendSignal(COMSIG_COMPONENT_ADDED, src)
-	LAZYADD(P.datum_components, src)
-	parent = P
+	
+	//lazy init the parent's dc list
+	var/list/dc = P.datum_components
+	if(!dc)
+		P.datum_components = dc = list()
+	
+	//set up the typecache
+	var/our_type = type
+	for(var/I in _GetInverseTypeList(our_type))
+		var/test = dc[I]
+		if(test)	//already another component of this type here
+			var/list/components_of_type
+			if(!islist(test))
+				components_of_type = list(test)
+				dc[I] = components_of_type
+			else
+				components_of_type = test
+			if(I == our_type)	//exact match, take priority
+				var/inserted = FALSE
+				for(var/J in 1 to components_of_type.len)
+					var/datum/component/C = components_of_type[J]
+					if(C.type != our_type) //but not over other exact matches
+						components_of_type.Insert(J, I)
+						inserted = TRUE
+						break
+				if(!inserted)
+					components_of_type += src
+			else	//indirect match, back of the line with ya
+				components_of_type += src
+		else	//only component of this type, no list
+			dc[I] = src
+
+/datum/component/proc/Initialize(...)
+	return
 
 /datum/component/Destroy()
 	enabled = FALSE
@@ -33,7 +78,20 @@
 /datum/component/proc/_RemoveNoSignal()
 	var/datum/P = parent
 	if(P)
-		LAZYREMOVE(P.datum_components, src)
+		var/list/dc = P.datum_components
+		var/our_type = type
+		for(var/I in _GetInverseTypeList(our_type))
+			var/list/components_of_type = dc[I]
+			if(islist(components_of_type))	//
+				var/list/subtracted = components_of_type - src
+				if(subtracted.len == 1)	//only 1 guy left
+					dc[I] = subtracted[1]	//make him special
+				else
+					dc[I] = subtracted
+			else	//just us
+				dc -= I
+		if(!dc.len)
+			P.datum_components = null
 		parent = null
 
 /datum/component/proc/RegisterSignal(sig_type, proc_on_self, override = FALSE)
@@ -66,36 +124,66 @@
 /datum/component/proc/OnTransfer(datum/new_parent)
 	return
 
+/datum/component/proc/AfterComponentActivated()
+	return
+
+/datum/component/proc/_GetInverseTypeList(current_type)
+	. = list(current_type)
+	while (current_type != /datum/component)
+		current_type = type2parent(current_type)
+		. += current_type
+
 /datum/proc/SendSignal(sigtype, ...)
 	var/list/comps = datum_components
 	. = FALSE
-	for(var/I in comps)
-		var/datum/component/C = I
-		if(!C.enabled)
-			continue
-		if(C.ReceiveSignal(arglist(args)))
+	if(!comps)
+		return
+	var/target = comps[/datum/component]
+	if(!islist(target))
+		var/datum/component/C = target
+		if(C.enabled && C.ReceiveSignal(arglist(args)))
 			ComponentActivated(C)
-			. = TRUE
+			C.AfterComponentActivated()
+			return TRUE
+	else
+		for(var/I in target)
+			var/datum/component/C = I
+			if(!C.enabled)
+				continue
+			if(C.ReceiveSignal(arglist(args)))
+				ComponentActivated(C)
+				. = TRUE
 
 /datum/proc/ComponentActivated(datum/component/C)
 	return
 
 /datum/proc/GetComponent(c_type)
-	for(var/I in datum_components)
-		if(istype(I, c_type))
-			return I
+	var/list/dc = datum_components
+	if(!dc)
+		return null
+	. = dc[c_type]
+	if(islist(.))
+		return .[1]
 
 /datum/proc/GetExactComponent(c_type)
-	for(var/I in datum_components)
-		var/datum/component/C = I
+	var/list/dc = datum_components
+	if(!dc)
+		return null
+	var/datum/component/C = dc[c_type]
+	if(C)
+		if(islist(C))
+			C = C[1]
 		if(C.type == c_type)
-			return I
+			return C
+	return null
 
 /datum/proc/GetComponents(c_type)
-	. = list()
-	for(var/I in datum_components)
-		if(istype(I, c_type))
-			. += I
+	var/list/dc = datum_components
+	if(!dc)
+		return null
+	. = dc[c_type]
+	if(!islist(.))
+		return list(.)
 
 /datum/proc/AddComponent(new_type, ...)
 	var/nt = new_type
@@ -103,6 +191,11 @@
 	var/datum/component/C = new nt(arglist(args))
 	return QDELING(C) ? GetComponent(new_type) : C
 
+/datum/proc/LoadComponent(component_type, ...)
+	. = GetComponent(component_type)
+	if(!.)
+		return AddComponent(arglist(args))
+
 /datum/proc/TakeComponent(datum/component/C)
 	if(!C)
 		return

code/datums/components/component.dm.rej

@@ -0,0 +1 @@
+-

code/datums/diseases/_MobProcs.dm

@@ -43,7 +43,7 @@
 		SSdisease.active_diseases += DD //Add it to the active diseases list, now that it's actually in a mob and being processed.
 
 		//Copy properties over. This is so edited diseases persist.
-		var/list/skipped = list("affected_mob","holder","carrier","stage","type","parent_type","vars","transformed")
+		var/list/skipped = list("affected_mob","holder","carrier","stage","type","parent_type","vars","transformed","symptoms")
 		for(var/V in DD.vars)
 			if(V in skipped)
 				continue

code/datums/diseases/advance/advance.dm

@@ -57,9 +57,7 @@
 			symptoms = GenerateSymptoms(0, 2)
 		else
 			for(var/datum/symptom/S in D.symptoms)
-				var/datum/symptom/new_symp = new S.type
-				new_symp.name = S.name
-				new_symp.neutered = S.neutered
+				var/datum/symptom/new_symp = S.Copy()
 				symptoms += new_symp
 
 	Refresh()

code/datums/mind.dm

@@ -400,7 +400,15 @@
 		if (assigned_role in GLOB.command_positions)
 			text += "<b>HEAD</b>|loyal|employee|headrev|rev"
 		else if (src in SSticker.mode.head_revolutionaries)
-			text += "head|loyal|<a href='?src=\ref[src];revolution=clear'>employee</a>|<b>HEADREV</b>|<a href='?src=\ref[src];revolution=rev'>rev</a>"
+			var/last_healthy_headrev = TRUE
+			for(var/I in SSticker.mode.head_revolutionaries)
+				if(I == src)
+					continue
+				var/mob/M = I
+				if(M.z == ZLEVEL_STATION && !M.stat)
+					last_healthy_headrev = FALSE
+					break
+			text += "head|loyal|<a href='?src=\ref[src];revolution=clear'>employee</a>|<b>[last_healthy_headrev ? "<font color='red'>LAST </font> " : ""]HEADREV</b>|<a href='?src=\ref[src];revolution=rev'>rev</a>"
 			text += "<br>Flash: <a href='?src=\ref[src];revolution=flash'>give</a>"
 
 			var/list/L = current.get_contents()

code/game/area/areas.dm

@@ -7,7 +7,7 @@
 	icon = 'icons/turf/areas.dmi'
 	icon_state = "unknown"
 	layer = AREA_LAYER
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	invisibility = INVISIBILITY_LIGHTING
 
 	var/map_name // Set in New(); preserves the name set by the map maker, even if renamed by the Blueprints.
@@ -242,7 +242,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 	for(var/area/RA in related)
 		if (RA.fire)
 			RA.fire = 0
-			RA.mouse_opacity = 0
+			RA.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 			RA.updateicon()
 			RA.ModifyFiredoors(TRUE)
 			for(var/obj/machinery/firealarm/F in RA)
@@ -293,7 +293,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 /area/proc/set_fire_alarm_effect()
 	fire = 1
 	updateicon()
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /area/proc/readyalert()
 	if(name == "Space")
@@ -313,12 +313,12 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 	if (!( src.party ))
 		src.party = 1
 		src.updateicon()
-		src.mouse_opacity = 0
+		src.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /area/proc/partyreset()
 	if (src.party)
 		src.party = 0
-		src.mouse_opacity = 0
+		src.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 		src.updateicon()
 		for(var/obj/machinery/door/firedoor/D in src)
 			if(!D.welded)

code/game/gamemodes/blob/overmind.dm

@@ -4,7 +4,7 @@
 	desc = "The overmind. It controls the blob."
 	icon = 'icons/mob/blob.dmi'
 	icon_state = "marker"
-	mouse_opacity = 1
+	mouse_opacity = MOUSE_OPACITY_ICON
 	move_on_shuttle = 1
 	see_in_dark = 8
 	invisibility = INVISIBILITY_OBSERVER

code/game/gamemodes/blob/powers.dm

@@ -175,7 +175,7 @@
 		SEND_SOUND(blobber, sound('sound/effects/attackblob.ogg'))
 		to_chat(blobber, "<b>You are a blobbernaut!</b>")
 		to_chat(blobber, "You are powerful, hard to kill, and slowly regenerate near nodes and cores, but will slowly die if not near the blob or if the factory that made you is killed.")
-		to_chat(blobber, "You can communicate with other blobbernauts and GLOB.overminds via <b>:b</b>")
+		to_chat(blobber, "You can communicate with other blobbernauts and overminds via <b>:b</b>")
 		to_chat(blobber, "Your overmind's blob reagent is: <b><font color=\"[blob_reagent_datum.color]\">[blob_reagent_datum.name]</b></font>!")
 		to_chat(blobber, "The <b><font color=\"[blob_reagent_datum.color]\">[blob_reagent_datum.name]</b></font> reagent [blob_reagent_datum.shortdesc ? "[blob_reagent_datum.shortdesc]" : "[blob_reagent_datum.description]"]")
 	if(blobber)

code/game/gamemodes/blob/powers.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm	(rejected hunks)
+@@ -175,7 +175,7 @@
+ 		SEND_SOUND(blobber, sound('sound/effects/attackblob.ogg'))
+ 		to_chat(blobber, "<b>You are a blobbernaut!</b>")
+ 		to_chat(blobber, "You are powerful, hard to kill, and slowly regenerate near nodes and cores, but will slowly die if not near the blob or if the factory that made you is killed.")
+-		to_chat(blobber, "You can communicate with other blobbernauts and GLOB.overminds via <b>:b</b>")
++		to_chat(blobber, "You can communicate with other blobbernauts and overminds via <b>:b</b>")
+ 		to_chat(blobber, "Your overmind's blob reagent is: <b><font color=\"[blob_reagent_datum.color]\">[blob_reagent_datum.name]</b></font>!")
+ 		to_chat(blobber, "The <b><font color=\"[blob_reagent_datum.color]\">[blob_reagent_datum.name]</b></font> reagent [blob_reagent_datum.shortdesc ? "[blob_reagent_datum.shortdesc]" : "[blob_reagent_datum.description]"]")
+ 	if(blobber)

code/game/gamemodes/blob/theblob.dm

@@ -24,6 +24,7 @@
 	M.changeNext_move(CLICK_CD_MELEE)
 	var/a = pick("gently stroke", "nuzzle", "affectionatly pet", "cuddle")
 	M.visible_message("<span class='notice'>[M] [a]s [src]!</span>", "<span class='notice'>You [a] [src]!</span>")
+	to_chat(overmind, "<span class='notice'>[M] [a]s you!</span>")
 	playsound(src, 'sound/effects/blobattack.ogg', 50, 1) //SQUISH SQUISH
 	
 

code/game/gamemodes/clock_cult/clock_effects/clock_overlay.dm

@@ -1,6 +1,6 @@
 //an "overlay" used by clockwork walls and floors to appear normal to mesons.
 /obj/effect/clockwork/overlay
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	var/atom/linked
 
 /obj/effect/clockwork/overlay/examine(mob/user)

code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm

@@ -130,13 +130,19 @@
 	playsound(src, 'sound/effects/empulse.ogg', 50, 1)
 	playsound(linked_gateway, 'sound/effects/empulse.ogg', 50, 1)
 	transform = matrix() * 1.5
-	animate(src, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW)
 	linked_gateway.transform = matrix() * 1.5
-	animate(linked_gateway, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW)
 	A.forceMove(get_turf(linked_gateway))
 	if(!no_cost)
 		uses = max(0, uses - 1)
 		linked_gateway.uses = max(0, linked_gateway.uses - 1)
+	if(!uses)
+		animate(src, transform = matrix() * 0.1, time = 10, flags = ANIMATION_END_NOW)
+		animate(linked_gateway, transform = matrix() * 0.1, time = 10, flags = ANIMATION_END_NOW)
+		density = FALSE
+		linked_gateway.density = FALSE
+	else
+		animate(src, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW)
+		animate(linked_gateway, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW)
 	addtimer(CALLBACK(src, .proc/check_uses), 10)
 	return TRUE
 

code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm

@@ -4,7 +4,7 @@
 	desc = "A massive, thrumming rip in spacetime."
 	clockwork_desc = "A portal to the Celestial Derelict. Massive and intimidating, it is the only thing that can both transport Ratvar and withstand the massive amount of energy he emits."
 	max_integrity = 500
-	mouse_opacity = 2
+	mouse_opacity = MOUSE_OPACITY_OPAQUE
 	icon = 'icons/effects/clockwork_effects.dmi'
 	icon_state = "nothing"
 	density = FALSE
@@ -68,7 +68,7 @@
 	if(!purpose_fulfilled)
 		var/area/gate_area = get_area(src)
 		hierophant_message("<span class='large_brass'><b>An Ark of the Clockwork Justicar has fallen at [gate_area.map_name]!</b></span>")
-		send_to_playing_players(sound(null, 0, channel = CHANNEL_JUSTICAR_ARK))
+		sound_to_playing_players(channel = CHANNEL_JUSTICAR_ARK, S = sound(null, 0))
 	var/was_stranded = SSshuttle.emergency.mode == SHUTTLE_STRANDED
 	SSshuttle.clearHostileEnvironment(src)
 	if(!was_stranded && !purpose_fulfilled)
@@ -87,7 +87,7 @@
 			resistance_flags |= INDESTRUCTIBLE
 			countdown.stop()
 			visible_message("<span class='userdanger'>[src] begins to pulse uncontrollably... you might want to run!</span>")
-			send_to_playing_players(sound('sound/effects/clockcult_gateway_disrupted.ogg', 0, channel = CHANNEL_JUSTICAR_ARK, volume = 50))
+			sound_to_playing_players(volume = 50, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_disrupted.ogg', 0))
 			make_glow()
 			glow.icon_state = "clockwork_gateway_disrupted"
 			resistance_flags |= INDESTRUCTIBLE
@@ -208,7 +208,7 @@
 	if(still_needs_components())
 		if(!first_sound_played)
 			priority_announce("Massive energy anomaly detected on short-range scanners. Attempting to triangulate location...", "Anomaly Alert")
-			send_to_playing_players(sound('sound/effects/clockcult_gateway_charging.ogg', 1, channel = CHANNEL_JUSTICAR_ARK, volume = 10))
+			sound_to_playing_players(volume = 10, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_charging.ogg', 1))
 			first_sound_played = TRUE
 		make_glow()
 		glow.icon_state = "clockwork_gateway_components"
@@ -228,7 +228,8 @@
 	switch(progress_in_seconds)
 		if(-INFINITY to GATEWAY_REEBE_FOUND)
 			if(!second_sound_played)
-				send_to_playing_players(sound('sound/effects/clockcult_gateway_charging.ogg', 1, channel = CHANNEL_JUSTICAR_ARK, volume = 30))
+				new /obj/effect/temp_visual/decoy/fading/threesecond(loc, glow)
+				sound_to_playing_players(volume = 30, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_charging.ogg', 1))
 				second_sound_played = TRUE
 			make_glow()
 			glow.icon_state = "clockwork_gateway_charging"
@@ -236,13 +237,15 @@
 			if(!third_sound_played)
 				var/area/gate_area = get_area(src)
 				priority_announce("Location of massive energy anomaly has been triangulated. Location: [gate_area.map_name].", "Anomaly Alert")
-				send_to_playing_players(sound('sound/effects/clockcult_gateway_active.ogg', 1, channel = CHANNEL_JUSTICAR_ARK, volume = 35))
+				new /obj/effect/temp_visual/decoy/fading/threesecond(loc, glow)
+				sound_to_playing_players(volume = 35, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_active.ogg', 1))
 				third_sound_played = TRUE
 			make_glow()
 			glow.icon_state = "clockwork_gateway_active"
 		if(GATEWAY_RATVAR_COMING to GATEWAY_RATVAR_ARRIVAL)
 			if(!fourth_sound_played)
-				send_to_playing_players(sound('sound/effects/clockcult_gateway_closing.ogg', 1, channel = CHANNEL_JUSTICAR_ARK, volume = 40))
+				new /obj/effect/temp_visual/decoy/fading/threesecond(loc, glow)
+				sound_to_playing_players(volume = 40, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_closing.ogg', 1))
 				fourth_sound_played = TRUE
 			make_glow()
 			glow.icon_state = "clockwork_gateway_closing"
@@ -252,20 +255,20 @@
 				resistance_flags |= INDESTRUCTIBLE
 				purpose_fulfilled = TRUE
 				make_glow()
-				animate(glow, transform = matrix() * 1.5, alpha = 255, time = 125)
-				send_to_playing_players(sound('sound/effects/ratvar_rises.ogg', 0, channel = CHANNEL_JUSTICAR_ARK)) //End the sounds
+				animate(glow, transform = matrix() * 3, time = 125)
+				sound_to_playing_players('sound/effects/ratvar_rises.ogg', channel = CHANNEL_JUSTICAR_ARK) //End the sounds
 				sleep(125)
-				make_glow()
-				animate(glow, transform = matrix() * 3, alpha = 0, time = 5)
 				var/turf/startpoint = get_turf(src)
-				QDEL_IN(src, 3)
-				sleep(3)
+				make_glow()
+				glow.transform = matrix() * 4.5
+				animate(glow, transform = matrix() * 0.1, time = 10)
+				QDEL_IN(src, 10)
 				GLOB.clockwork_gateway_activated = TRUE
 				new/obj/structure/destructible/clockwork/massive/ratvar(startpoint)
 				send_to_playing_players("<span class='inathneq_large'>\"[text2ratvar("See Engine's mercy")]!\"</span>\n\
 				<span class='sevtug_large'>\"[text2ratvar("Observe Engine's design skills")]!\"</span>\n<span class='nezbere_large'>\"[text2ratvar("Behold Engine's light")]!!\"</span>\n\
 				<span class='nzcrentr_large'>\"[text2ratvar("Gaze upon Engine's power")].\"</span>")
-				send_to_playing_players('sound/magic/clockwork/invoke_general.ogg')
+				sound_to_playing_players('sound/effects/empulse.ogg')
 				var/x0 = startpoint.x
 				var/y0 = startpoint.y
 				for(var/I in spiral_range_turfs(255, startpoint))

code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm

@@ -130,6 +130,6 @@
 	if(hex_combo) //YOU BUILT A HEXAGON
 		hex_combo.pixel_x = -16
 		hex_combo.pixel_y = -16
-		hex_combo.mouse_opacity = 0
+		hex_combo.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 		hex_combo.plane = GAME_PLANE
 		new /obj/effect/temp_visual/ratvar/prolonging_prism(T, hex_combo)

code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm

@@ -23,12 +23,12 @@
 	for(var/obj/O in GLOB.all_clockwork_objects)
 		O.ratvar_act()
 	START_PROCESSING(SSobj, src)
+	INVOKE_ASYNC(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 0, null, FALSE, 0)
 	send_to_playing_players("<span class='ratvar'>\"[text2ratvar("ONCE AGAIN MY LIGHT SHALL SHINE ACROSS THIS PATHETIC REALM")]!!\"</span>")
 	sound_to_playing_players('sound/effects/ratvar_reveal.ogg')
 	var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/clockwork_effects.dmi', "ratvar_alert")
 	var/area/A = get_area(src)
 	notify_ghosts("The Justiciar's light calls to you! Reach out to Ratvar in [A.name] to be granted a shell to spread his glory!", null, source = src, alert_overlay = alert_overlay)
-	INVOKE_ASYNC(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 0, null, FALSE, 0)
 
 /obj/structure/destructible/clockwork/massive/ratvar/Destroy()
 	GLOB.ratvar_awakens--

code/game/gamemodes/cult/runes.dm

@@ -476,7 +476,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	//BEGIN THE SUMMONING
 	used = TRUE
 	..()
-	send_to_playing_players('sound/effects/dimensional_rend.ogg')
+	sound_to_playing_players('sound/effects/dimensional_rend.ogg')
 	var/turf/T = get_turf(src)
 	sleep(40)
 	if(src)

code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm

@@ -13,8 +13,8 @@
 	//TODO : replace with presets or spectrum
 	return rgb(rand(0,255),rand(0,255),rand(0,255))
 
-/obj/machinery/abductor/gland_dispenser/New()
-	..()
+/obj/machinery/abductor/gland_dispenser/Initialize()
+	. = ..()
 	gland_types = subtypesof(/obj/item/organ/heart/gland)
 	gland_types = shuffle(gland_types)
 	gland_colors = new/list(gland_types.len)

code/game/gamemodes/nuclear/nuclearbomb.dm

@@ -85,9 +85,8 @@
 	. = ..()
 	var/obj/machinery/nuclearbomb/existing = locate("syndienuke") in GLOB.nuke_list
 	if(existing)
-		qdel(src)
-		throw EXCEPTION("Attempted to spawn a syndicate nuke while one already exists at [existing.loc.x],[existing.loc.y],[existing.loc.z]")
-		return 0
+		stack_trace("Attempted to spawn a syndicate nuke while one already exists at [existing.loc.x],[existing.loc.y],[existing.loc.z]")
+		return INITIALIZE_HINT_QDEL
 	tag = "syndienuke"
 
 /obj/machinery/nuclearbomb/attackby(obj/item/I, mob/user, params)

code/game/machinery/Beacon.dm

@@ -11,8 +11,8 @@
 	idle_power_usage = 0
 	var/obj/item/device/radio/beacon/Beacon
 
-/obj/machinery/bluespace_beacon/New()
-	..()
+/obj/machinery/bluespace_beacon/Initialize()
+	. = ..()
 	var/turf/T = loc
 	Beacon = new /obj/item/device/radio/beacon
 	Beacon.invisibility = INVISIBILITY_MAXIMUM
@@ -21,9 +21,7 @@
 	hide(T.intact)
 
 /obj/machinery/bluespace_beacon/Destroy()
-	if(Beacon)
-		qdel(Beacon)
-	Beacon = null
+	QDEL_NULL(Beacon)
 	return ..()
 
 // update the invisibility and icon

code/game/machinery/PDApainter.dm

@@ -27,12 +27,16 @@
 
 	return
 
-/obj/machinery/pdapainter/New()
-	..()
-	var/blocked = list(/obj/item/device/pda/ai/pai, /obj/item/device/pda/ai, /obj/item/device/pda/heads,
-						/obj/item/device/pda/clear, /obj/item/device/pda/syndicate)
-
-	for(var/P in typesof(/obj/item/device/pda)-blocked)
+/obj/machinery/pdapainter/Initialize()
+	. = ..()
+	var/list/blocked = list(
+		/obj/item/device/pda/ai/pai,
+		/obj/item/device/pda/ai,
+		/obj/item/device/pda/heads,
+		/obj/item/device/pda/clear,
+		/obj/item/device/pda/syndicate)
+
+	for(var/P in typesof(/obj/item/device/pda) - blocked)
 		var/obj/item/device/pda/D = new P
 
 		//D.name = "PDA Style [colorlist.len+1]" //Gotta set the name, otherwise it all comes up as "PDA"
@@ -41,9 +45,7 @@
 		src.colorlist += D
 
 /obj/machinery/pdapainter/Destroy()
-	if(storedpda)
-		qdel(storedpda)
-		storedpda = null
+	QDEL_NULL(storedpda)
 	return ..()
 
 /obj/machinery/pdapainter/on_deconstruction()

code/game/machinery/Sleeper.dm

@@ -13,6 +13,7 @@
 	density = FALSE
 	anchored = TRUE
 	state_open = TRUE
+	circuit = /obj/item/weapon/circuitboard/machine/sleeper
 	var/efficiency = 1
 	var/min_health = -25
 	var/list/available_chems
@@ -26,24 +27,11 @@
 	var/list/chem_buttons	//Used when emagged to scramble which chem is used, eg: antitoxin -> morphine
 	var/scrambled_chems = FALSE //Are chem buttons scrambled? used as a warning
 
-/obj/machinery/sleeper/New()
-	..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/sleeper(null)
-	B.apply_default_parts(src)
+/obj/machinery/sleeper/Initialize()
+	. = ..()
 	update_icon()
 	reset_chem_buttons()
 
-/obj/item/weapon/circuitboard/machine/sleeper
-	name = "Sleeper (Machine Board)"
-	build_path = /obj/machinery/sleeper
-	origin_tech = "programming=3;biotech=2;engineering=3"
-	req_components = list(
-							/obj/item/weapon/stock_parts/matter_bin = 1,
-							/obj/item/weapon/stock_parts/manipulator = 1,
-							/obj/item/stack/cable_coil = 1,
-							/obj/item/weapon/stock_parts/console_screen = 1,
-							/obj/item/stack/sheet/glass = 1)
-
 /obj/machinery/sleeper/RefreshParts()
 	var/E
 	for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)

code/game/machinery/_machinery.dm

@@ -123,12 +123,18 @@ Class Procs:
 	var/interact_open = FALSE // Can the machine be interacted with when in maint/when the panel is open.
 	var/interact_offline = 0 // Can the machine be interacted with while de-powered.
 	var/speed_process = 0 // Process as fast as possible?
+	var/obj/item/weapon/circuitboard/circuit // Circuit to be created and inserted when the machinery is created
 
 /obj/machinery/Initialize()
 	if(!armor)
 		armor = list(melee = 25, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70)
 	. = ..()
 	GLOB.machines += src
+
+	if(ispath(circuit, /obj/item/weapon/circuitboard))
+		circuit = new circuit
+		circuit.apply_default_parts(src)
+
 	if(!speed_process)
 		START_PROCESSING(SSmachines, src)
 	else

code/game/machinery/announcement_system.dm

@@ -7,7 +7,6 @@ GLOBAL_LIST_EMPTY(announcement_systems)
 	desc = "An automated announcement system that handles minor announcements over the radio."
 	icon = 'icons/obj/machines/telecomms.dmi'
 	icon_state = "AAS_On"
-	var/obj/item/device/radio/headset/radio
 
 	verb_say = "coldly states"
 	verb_ask = "queries"
@@ -16,6 +15,9 @@ GLOBAL_LIST_EMPTY(announcement_systems)
 	idle_power_usage = 20
 	active_power_usage = 50
 
+	circuit = /obj/item/weapon/circuitboard/machine/announcement_system
+
+	var/obj/item/device/radio/headset/radio
 	var/arrival = "%PERSON has signed up as %RANK"
 	var/arrivalToggle = 1
 	var/newhead = "%PERSON, %RANK, is the department head."
@@ -25,24 +27,12 @@ GLOBAL_LIST_EMPTY(announcement_systems)
 	var/pinklight = "Light_Pink"
 	var/errorlight = "Error_Red"
 
-/obj/machinery/announcement_system/New()
-	..()
+/obj/machinery/announcement_system/Initialize()
+	. = ..()
 	GLOB.announcement_systems += src
 	radio = new /obj/item/device/radio/headset/ai(src)
-
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/announcement_system(null)
-	B.apply_default_parts(src)
-
 	update_icon()
 
-/obj/item/weapon/circuitboard/machine/announcement_system
-	name = "Announcement System (Machine Board)"
-	build_path = /obj/machinery/announcement_system
-	origin_tech = "programming=3;bluespace=3;magnets=2"
-	req_components = list(
-							/obj/item/stack/cable_coil = 2,
-							/obj/item/weapon/stock_parts/console_screen = 1)
-
 /obj/machinery/announcement_system/update_icon()
 	if(is_operational())
 		icon_state = (panel_open ? "AAS_On_Open" : "AAS_On")

code/game/machinery/autolathe.dm

@@ -7,9 +7,13 @@
 	desc = "It produces items using metal and glass."
 	icon_state = "autolathe"
 	density = TRUE
+	anchored = TRUE
+	use_power = IDLE_POWER_USE
+	idle_power_usage = 10
+	active_power_usage = 100
+	circuit = /obj/item/weapon/circuitboard/machine/autolathe
 
 	var/operating = FALSE
-	anchored = TRUE
 	var/list/L = list()
 	var/list/LL = list()
 	var/hacked = FALSE
@@ -18,9 +22,7 @@
 	var/hack_wire
 	var/disable_wire
 	var/shock_wire
-	use_power = IDLE_POWER_USE
-	idle_power_usage = 10
-	active_power_usage = 100
+
 	var/busy = FALSE
 	var/prod_coeff = 1
 
@@ -45,30 +47,16 @@
 							"Imported"
 							)
 
-/obj/machinery/autolathe/New()
-	..()
+/obj/machinery/autolathe/Initialize()
 	materials = new /datum/material_container(src, list(MAT_METAL, MAT_GLASS))
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/autolathe(null)
-	B.apply_default_parts(src)
-
 	wires = new /datum/wires/autolathe(src)
 	files = new /datum/research/autolathe(src)
 	matching_designs = list()
-
-/obj/item/weapon/circuitboard/machine/autolathe
-	name = "Autolathe (Machine Board)"
-	build_path = /obj/machinery/autolathe
-	origin_tech = "engineering=2;programming=2"
-	req_components = list(
-							/obj/item/weapon/stock_parts/matter_bin = 3,
-							/obj/item/weapon/stock_parts/manipulator = 1,
-							/obj/item/weapon/stock_parts/console_screen = 1)
+	return ..()
 
 /obj/machinery/autolathe/Destroy()
-	qdel(wires)
-	wires = null
-	qdel(materials)
-	materials = null
+	QDEL_NULL(wires)
+	QDEL_NULL(materials)
 	return ..()
 
 /obj/machinery/autolathe/interact(mob/user)

code/game/machinery/bank_machine.dm

@@ -9,8 +9,8 @@
 	var/radio_channel = "Common"
 	var/minimum_time_between_warnings = 400
 
-/obj/machinery/computer/bank_machine/Initialize(mapload)
-	..()
+/obj/machinery/computer/bank_machine/Initialize()
+	. = ..()
 	radio = new(src)
 	radio.subspace_transmission = TRUE
 	radio.canhear_range = 0

code/game/machinery/cloning.dm

@@ -17,6 +17,8 @@
 	icon_state = "pod_0"
 	req_access = list(ACCESS_CLONING) //FOR PREMATURE UNLOCKING.
 	verb_say = "states"
+	circuit = /obj/item/weapon/circuitboard/machine/clonepod
+
 	var/heal_level //The clone is released once its health reaches this level.
 	var/obj/machinery/computer/cloning/connected = null //So we remember the connected clone machine.
 	var/mess = FALSE //Need to clean out it if it's full of exploded clone.
@@ -46,8 +48,6 @@
 
 /obj/machinery/clonepod/Initialize()
 	. = ..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/clonepod(null)
-	B.apply_default_parts(src)
 
 	countdown = new(src)
 
@@ -59,16 +59,11 @@
 
 /obj/machinery/clonepod/Destroy()
 	go_out()
-	qdel(radio)
-	radio = null
-	qdel(countdown)
-	countdown = null
+	QDEL_NULL(radio)
+	QDEL_NULL(countdown)
 	if(connected)
 		connected.DetachCloner(src)
-	for(var/i in unattached_flesh)
-		qdel(i)
-	LAZYCLEARLIST(unattached_flesh)
-	unattached_flesh = null
+	QDEL_LIST(unattached_flesh)
 	. = ..()
 
 /obj/machinery/clonepod/RefreshParts()
@@ -84,16 +79,6 @@
 	if(heal_level > 100)
 		heal_level = 100
 
-/obj/item/weapon/circuitboard/machine/clonepod
-	name = "Clone Pod (Machine Board)"
-	build_path = /obj/machinery/clonepod
-	origin_tech = "programming=2;biotech=2"
-	req_components = list(
-							/obj/item/stack/cable_coil = 2,
-							/obj/item/weapon/stock_parts/scanning_module = 2,
-							/obj/item/weapon/stock_parts/manipulator = 2,
-							/obj/item/stack/sheet/glass = 1)
-
 //The return of data disks?? Just for transferring between genetics machine/cloning machine.
 //TO-DO: Make the genetics machine accept them.
 /obj/item/weapon/disk/data

code/game/machinery/computer/Operating.dm

@@ -4,8 +4,8 @@
 	icon_screen = "crew"
 	icon_keyboard = "med_key"
 	circuit = /obj/item/weapon/circuitboard/computer/operating
-	var/mob/living/carbon/human/patient = null
-	var/obj/structure/table/optable/table = null
+	var/mob/living/carbon/human/patient
+	var/obj/structure/table/optable/table
 
 	light_color = LIGHT_COLOR_BLUE
 

code/game/machinery/computer/_computer.dm

@@ -1,142 +1,129 @@
-/obj/machinery/computer
-	name = "computer"
-	icon = 'icons/obj/computer.dmi'
-	icon_state = "computer"
-	density = TRUE
-	anchored = TRUE
-	use_power = IDLE_POWER_USE
-	idle_power_usage = 300
-	active_power_usage = 300
-	max_integrity = 200
-	integrity_failure = 100
-	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 40, acid = 20)
-	var/obj/item/weapon/circuitboard/computer/circuit = null // if circuit==null, computer can't disassembly
-	var/processing = FALSE
-	var/brightness_on = 2
-	var/icon_keyboard = "generic_key"
-	var/icon_screen = "generic"
-	var/clockwork = FALSE
-
-/obj/machinery/computer/New(location, obj/item/weapon/circuitboard/C)
-	..(location)
-	if(C && istype(C))
-		circuit = C
-	//Some machines, oldcode arcades mostly, new themselves, so circuit
-	//can already be an instance of a type and trying to new that will
-	//cause a runtime
-	else if(ispath(circuit))
-		circuit = new circuit(null)
-
-/obj/machinery/computer/Destroy()
-	if(circuit)
-		qdel(circuit)
-		circuit = null
-	return ..()
-
-/obj/machinery/computer/Initialize()
-	. = ..()
-	power_change()
-
-/obj/machinery/computer/process()
-	if(stat & (NOPOWER|BROKEN))
-		return 0
-	return 1
-
-/obj/machinery/computer/ratvar_act()
-	if(!clockwork)
-		clockwork = TRUE
-		icon_screen = "ratvar[rand(1, 4)]"
-		icon_keyboard = "ratvar_key[rand(1, 6)]"
-		icon_state = "ratvarcomputer[rand(1, 4)]"
-		update_icon()
-
-/obj/machinery/computer/narsie_act()
-	if(clockwork && clockwork != initial(clockwork)) //if it's clockwork but isn't normally clockwork
-		clockwork = FALSE
-		icon_screen = initial(icon_screen)
-		icon_keyboard = initial(icon_keyboard)
-		icon_state = initial(icon_state)
-		update_icon()
-
-/obj/machinery/computer/update_icon()
-	cut_overlays()
-	if(stat & NOPOWER)
-		add_overlay("[icon_keyboard]_off")
-		return
-	add_overlay(icon_keyboard)
-	if(stat & BROKEN)
-		add_overlay("[icon_state]_broken")
-	else
-		add_overlay(icon_screen)
-
-/obj/machinery/computer/power_change()
-	..()
-	if(stat & NOPOWER)
-		set_light(0)
-	else
-		set_light(brightness_on)
-	update_icon()
-	return
-
-/obj/machinery/computer/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/screwdriver) && circuit && !(flags&NODECONSTRUCT))
-		playsound(src.loc, I.usesound, 50, 1)
-		to_chat(user, "<span class='notice'> You start to disconnect the monitor...</span>")
-		if(do_after(user, 20*I.toolspeed, target = src))
-			deconstruct(TRUE, user)
-	else
-		return ..()
-
-/obj/machinery/computer/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
-	switch(damage_type)
-		if(BRUTE)
-			if(stat & BROKEN)
-				playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
-			else
-				playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
-		if(BURN)
-			playsound(src.loc, 'sound/items/welder.ogg', 100, 1)
-
-/obj/machinery/computer/obj_break(damage_flag)
-	if(circuit && !(flags & NODECONSTRUCT)) //no circuit, no breaking
-		if(!(stat & BROKEN))
-			playsound(loc, 'sound/effects/glassbr3.ogg', 100, 1)
-			stat |= BROKEN
-			update_icon()
-
-/obj/machinery/computer/emp_act(severity)
-	switch(severity)
-		if(1)
-			if(prob(50))
-				obj_break("energy")
-		if(2)
-			if(prob(10))
-				obj_break("energy")
-	..()
-
-/obj/machinery/computer/deconstruct(disassembled = TRUE, mob/user)
-	on_deconstruction()
-	if(!(flags & NODECONSTRUCT))
-		if(circuit) //no circuit, no computer frame
-			var/obj/structure/frame/computer/A = new /obj/structure/frame/computer(src.loc)
-			A.circuit = circuit
-			A.anchored = TRUE
-			if(stat & BROKEN)
-				if(user)
-					to_chat(user, "<span class='notice'>The broken glass falls out.</span>")
-				else
-					playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
-				new /obj/item/weapon/shard(src.loc)
-				new /obj/item/weapon/shard(src.loc)
-				A.state = 3
-				A.icon_state = "3"
-			else
-				if(user)
-					to_chat(user, "<span class='notice'>You disconnect the monitor.</span>")
-				A.state = 4
-				A.icon_state = "4"
-			circuit = null
-		for(var/obj/C in src)
-			C.forceMove(loc)
-
-	qdel(src)
+/obj/machinery/computer
+	name = "computer"
+	icon = 'icons/obj/computer.dmi'
+	icon_state = "computer"
+	density = TRUE
+	anchored = TRUE
+	use_power = IDLE_POWER_USE
+	idle_power_usage = 300
+	active_power_usage = 300
+	max_integrity = 200
+	integrity_failure = 100
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 40, acid = 20)
+	var/processing = FALSE
+	var/brightness_on = 2
+	var/icon_keyboard = "generic_key"
+	var/icon_screen = "generic"
+	var/clockwork = FALSE
+
+/obj/machinery/computer/Initialize(mapload, obj/item/weapon/circuitboard/C)
+	. = ..()
+	power_change()
+
+/obj/machinery/computer/Destroy()
+	QDEL_NULL(circuit)
+	return ..()
+
+/obj/machinery/computer/process()
+	if(stat & (NOPOWER|BROKEN))
+		return 0
+	return 1
+
+/obj/machinery/computer/ratvar_act()
+	if(!clockwork)
+		clockwork = TRUE
+		icon_screen = "ratvar[rand(1, 4)]"
+		icon_keyboard = "ratvar_key[rand(1, 6)]"
+		icon_state = "ratvarcomputer[rand(1, 4)]"
+		update_icon()
+
+/obj/machinery/computer/narsie_act()
+	if(clockwork && clockwork != initial(clockwork)) //if it's clockwork but isn't normally clockwork
+		clockwork = FALSE
+		icon_screen = initial(icon_screen)
+		icon_keyboard = initial(icon_keyboard)
+		icon_state = initial(icon_state)
+		update_icon()
+
+/obj/machinery/computer/update_icon()
+	cut_overlays()
+	if(stat & NOPOWER)
+		add_overlay("[icon_keyboard]_off")
+		return
+	add_overlay(icon_keyboard)
+	if(stat & BROKEN)
+		add_overlay("[icon_state]_broken")
+	else
+		add_overlay(icon_screen)
+
+/obj/machinery/computer/power_change()
+	..()
+	if(stat & NOPOWER)
+		set_light(0)
+	else
+		set_light(brightness_on)
+	update_icon()
+	return
+
+/obj/machinery/computer/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/weapon/screwdriver) && circuit && !(flags&NODECONSTRUCT))
+		playsound(src.loc, I.usesound, 50, 1)
+		to_chat(user, "<span class='notice'> You start to disconnect the monitor...</span>")
+		if(do_after(user, 20*I.toolspeed, target = src))
+			deconstruct(TRUE, user)
+	else
+		return ..()
+
+/obj/machinery/computer/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+	switch(damage_type)
+		if(BRUTE)
+			if(stat & BROKEN)
+				playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+			else
+				playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
+		if(BURN)
+			playsound(src.loc, 'sound/items/welder.ogg', 100, 1)
+
+/obj/machinery/computer/obj_break(damage_flag)
+	if(circuit && !(flags & NODECONSTRUCT)) //no circuit, no breaking
+		if(!(stat & BROKEN))
+			playsound(loc, 'sound/effects/glassbr3.ogg', 100, 1)
+			stat |= BROKEN
+			update_icon()
+
+/obj/machinery/computer/emp_act(severity)
+	switch(severity)
+		if(1)
+			if(prob(50))
+				obj_break("energy")
+		if(2)
+			if(prob(10))
+				obj_break("energy")
+	..()
+
+/obj/machinery/computer/deconstruct(disassembled = TRUE, mob/user)
+	on_deconstruction()
+	if(!(flags & NODECONSTRUCT))
+		if(circuit) //no circuit, no computer frame
+			var/obj/structure/frame/computer/A = new /obj/structure/frame/computer(src.loc)
+			A.circuit = circuit
+			A.anchored = TRUE
+			if(stat & BROKEN)
+				if(user)
+					to_chat(user, "<span class='notice'>The broken glass falls out.</span>")
+				else
+					playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+				new /obj/item/weapon/shard(src.loc)
+				new /obj/item/weapon/shard(src.loc)
+				A.state = 3
+				A.icon_state = "3"
+			else
+				if(user)
+					to_chat(user, "<span class='notice'>You disconnect the monitor.</span>")
+				A.state = 4
+				A.icon_state = "4"
+			circuit = null
+		for(var/obj/C in src)
+			C.forceMove(loc)
+
+	qdel(src)

code/game/machinery/computer/apc_control.dm

@@ -16,9 +16,9 @@
 	var/auth_id = "\[NULL\]"
 
 /obj/machinery/computer/apc_control/Initialize()
+	. = ..()
 	apcs = list() //To avoid BYOND making the list run through a ton of procs
 	filters = list("Name" = null, "Charge Above" = null, "Charge Below" = null, "Responsive" = null)
-	..()
 
 /obj/machinery/computer/apc_control/process()
 	apcs = list() //Clear the list every tick

code/game/machinery/computer/arcade.dm

@@ -51,21 +51,17 @@
 /obj/machinery/computer/arcade/proc/Reset()
 	return
 
-/obj/machinery/computer/arcade/New()
-	..()
+/obj/machinery/computer/arcade/Initialize()
+	. = ..()
 	// If it's a generic arcade machine, pick a random arcade
 	// circuit board for it and make the new machine
 	if(!circuit)
 		var/choice = pick(subtypesof(/obj/item/weapon/circuitboard/computer/arcade))
 		var/obj/item/weapon/circuitboard/CB = new choice()
 		new CB.build_path(loc, CB)
-		qdel(src)
-
-/obj/machinery/computer/arcade/Initialize()
-	. = ..()
+		return INITIALIZE_HINT_QDEL
 	Reset()
 
-
 #define PULSE_MEDAL "Jackpot"
 
 /obj/machinery/computer/arcade/proc/prizevend()
@@ -78,11 +74,9 @@
 		new prizeselect(src)
 
 	var/atom/movable/prize = pick(contents)
-	visible_message(
-		"<span class='notice'>[src] dispenses a [prize]!</span>",
-		"<span class='notice'>You hear a chime and a clunk.</span>")
+	visible_message("<span class='notice'>[src] dispenses a [prize]!</span>", "<span class='notice'>You hear a chime and a clunk.</span>")
 
-	prize.loc = loc
+	prize.forceMove(get_turf(src))
 #undef PULSE_MEDAL
 
 /obj/machinery/computer/arcade/emp_act(severity)
@@ -157,7 +151,6 @@
 	popup.set_content(dat)
 	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
 	popup.open()
-	return
 
 /obj/machinery/computer/arcade/battle/Topic(href, href_list)
 	if(..())

code/game/machinery/computer/buildandrepair.dm

@@ -142,320 +142,4 @@
 			new /obj/item/weapon/shard(loc)
 		if(state >= 3)
 			new /obj/item/stack/cable_coil(loc , 5)
-	..()
-
-
-/obj/item/weapon/circuitboard
-	name = "circuit board"
-	icon = 'icons/obj/module.dmi'
-	icon_state = "id_mod"
-	item_state = "electronic"
-	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	origin_tech = "programming=2"
-	materials = list(MAT_GLASS=1000)
-	w_class = WEIGHT_CLASS_SMALL
-	var/build_path = null
-
-/obj/item/weapon/circuitboard/computer/turbine_computer
-	name = "Turbine Computer (Computer Board)"
-	build_path = /obj/machinery/computer/turbine_computer
-	origin_tech = "programming=4;engineering=4;powerstorage=4"
-/obj/item/weapon/circuitboard/computer/launchpad_console
-	name = "Launchpad Control Console (Computer Board)"
-	build_path = /obj/machinery/computer/launchpad
-	origin_tech = "programming=3;bluespace=3;plasmatech=2"
-/obj/item/weapon/circuitboard/computer/message_monitor
-	name = "Message Monitor (Computer Board)"
-	build_path = /obj/machinery/computer/message_monitor
-	origin_tech = "programming=2"
-/obj/item/weapon/circuitboard/computer/security
-	name = "Security Cameras (Computer Board)"
-	build_path = /obj/machinery/computer/security
-	origin_tech = "programming=2;combat=2"
-/obj/item/weapon/circuitboard/computer/xenobiology
-	name = "circuit board (Xenobiology Console)"
-	build_path = /obj/machinery/computer/camera_advanced/xenobio
-	origin_tech = "programming=3;biotech=3"
-/obj/item/weapon/circuitboard/computer/base_construction
-	name = "circuit board (Aux Mining Base Construction Console)"
-	build_path = /obj/machinery/computer/camera_advanced/base_construction
-	origin_tech = "programming=3;engineering=3"
-/obj/item/weapon/circuitboard/computer/aiupload
-	name = "AI Upload (Computer Board)"
-	build_path = /obj/machinery/computer/upload/ai
-	origin_tech = "programming=4;engineering=4"
-/obj/item/weapon/circuitboard/computer/borgupload
-	name = "Cyborg Upload (Computer Board)"
-	build_path = /obj/machinery/computer/upload/borg
-	origin_tech = "programming=4;engineering=4"
-/obj/item/weapon/circuitboard/computer/med_data
-	name = "Medical Records Console (Computer Board)"
-	build_path = /obj/machinery/computer/med_data
-	origin_tech = "programming=2;biotech=2"
-/obj/item/weapon/circuitboard/computer/pandemic
-	name = "PanD.E.M.I.C. 2200 (Computer Board)"
-	build_path = /obj/machinery/computer/pandemic
-	origin_tech = "programming=2;biotech=2"
-/obj/item/weapon/circuitboard/computer/scan_consolenew
-	name = "DNA Machine (Computer Board)"
-	build_path = /obj/machinery/computer/scan_consolenew
-	origin_tech = "programming=2;biotech=2"
-/obj/item/weapon/circuitboard/computer/communications
-	name = "Communications (Computer Board)"
-	build_path = /obj/machinery/computer/communications
-	origin_tech = "programming=3;magnets=3"
-	var/lastTimeUsed = 0
-
-/obj/item/weapon/circuitboard/computer/card
-	name = "ID Console (Computer Board)"
-	build_path = /obj/machinery/computer/card
-	origin_tech = "programming=3"
-/obj/item/weapon/circuitboard/computer/card/centcom
-	name = "CentCom ID Console (Computer Board)"
-	build_path = /obj/machinery/computer/card/centcom
-
-/obj/item/weapon/circuitboard/computer/card/minor
-	name = "Department Management Console (Computer Board)"
-	build_path = /obj/machinery/computer/card/minor
-	var/target_dept = 1
-	var/list/dept_list = list("General","Security","Medical","Science","Engineering")
-
-/obj/item/weapon/circuitboard/computer/card/minor/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		target_dept = (target_dept == dept_list.len) ? 1 : (target_dept + 1)
-		to_chat(user, "<span class='notice'>You set the board to \"[dept_list[target_dept]]\".</span>")
-	else
-		return ..()
-
-/obj/item/weapon/circuitboard/computer/card/minor/examine(user)
-	..()
-	to_chat(user, "Currently set to \"[dept_list[target_dept]]\".")
-
-//obj/item/weapon/circuitboard/computer/shield
-//	name = "Shield Control (Computer Board)"
-//	build_path = /obj/machinery/computer/stationshield
-/obj/item/weapon/circuitboard/computer/teleporter
-	name = "Teleporter (Computer Board)"
-	build_path = /obj/machinery/computer/teleporter
-	origin_tech = "programming=3;bluespace=3;plasmatech=3"
-/obj/item/weapon/circuitboard/computer/secure_data
-	name = "Security Records Console (Computer Board)"
-	build_path = /obj/machinery/computer/secure_data
-	origin_tech = "programming=2;combat=2"
-/obj/item/weapon/circuitboard/computer/stationalert
-	name = "Station Alerts (Computer Board)"
-	build_path = /obj/machinery/computer/station_alert
-/*/obj/item/weapon/circuitboard/computer/atmospheresiphonswitch
-	name = "Atmosphere siphon control (Computer Board)"
-	build_path = /obj/machinery/computer/atmosphere/siphonswitch*/
-/obj/item/weapon/circuitboard/computer/atmos_control
-	name = "Atmospheric Monitor (Computer Board)"
-	build_path = /obj/machinery/computer/atmos_control
-/obj/item/weapon/circuitboard/computer/atmos_control/tank
-	name = "Tank Control (Computer Board)"
-	build_path = /obj/machinery/computer/atmos_control/tank
-	origin_tech = "programming=2;engineering=3;materials=2"
-/obj/item/weapon/circuitboard/computer/atmos_alert
-	name = "Atmospheric Alert (Computer Board)"
-	build_path = /obj/machinery/computer/atmos_alert
-/obj/item/weapon/circuitboard/computer/pod
-	name = "Massdriver control (Computer Board)"
-	build_path = /obj/machinery/computer/pod
-/obj/item/weapon/circuitboard/computer/robotics
-	name = "Robotics Control (Computer Board)"
-	build_path = /obj/machinery/computer/robotics
-	origin_tech = "programming=3"
-/obj/item/weapon/circuitboard/computer/cloning
-	name = "Cloning (Computer Board)"
-	build_path = /obj/machinery/computer/cloning
-	origin_tech = "programming=2;biotech=2"
-/obj/item/weapon/circuitboard/computer/arcade/battle
-	name = "Arcade Battle (Computer Board)"
-	build_path = /obj/machinery/computer/arcade/battle
-	origin_tech = "programming=1"
-/obj/item/weapon/circuitboard/computer/arcade/orion_trail
-	name = "Orion Trail (Computer Board)"
-	build_path = /obj/machinery/computer/arcade/orion_trail
-	origin_tech = "programming=1"
-/obj/item/weapon/circuitboard/computer/turbine_control
-	name = "Turbine control (Computer Board)"
-	build_path = /obj/machinery/computer/turbine_computer
-/obj/item/weapon/circuitboard/computer/solar_control
-	name = "Solar Control (Computer Board)"  //name fixed 250810
-	build_path = /obj/machinery/power/solar_control
-	origin_tech = "programming=2;powerstorage=2"
-/obj/item/weapon/circuitboard/computer/powermonitor
-	name = "Power Monitor (Computer Board)"  //name fixed 250810
-	build_path = /obj/machinery/computer/monitor
-	origin_tech = "programming=2;powerstorage=2"
-/obj/item/weapon/circuitboard/computer/olddoor
-	name = "DoorMex (Computer Board)"
-	build_path = /obj/machinery/computer/pod/old
-/obj/item/weapon/circuitboard/computer/syndicatedoor
-	name = "ProComp Executive (Computer Board)"
-	build_path = /obj/machinery/computer/pod/old/syndicate
-/obj/item/weapon/circuitboard/computer/swfdoor
-	name = "Magix (Computer Board)"
-	build_path = /obj/machinery/computer/pod/old/swf
-/obj/item/weapon/circuitboard/computer/prisoner
-	name = "Prisoner Management Console (Computer Board)"
-	build_path = /obj/machinery/computer/prisoner
-/obj/item/weapon/circuitboard/computer/gulag_teleporter_console
-	name = "Labor Camp teleporter console (Computer Board)"
-	build_path = /obj/machinery/computer/gulag_teleporter_computer
-
-/obj/item/weapon/circuitboard/computer/rdconsole
-	name = "R&D Console (Computer Board)"
-	build_path = /obj/machinery/computer/rdconsole/core
-
-/obj/item/weapon/circuitboard/computer/rdconsole/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		if(build_path == /obj/machinery/computer/rdconsole/core)
-			name = "R&D Console - Robotics (Computer Board)"
-			build_path = /obj/machinery/computer/rdconsole/robotics
-			to_chat(user, "<span class='notice'>Access protocols successfully updated.</span>")
-		else
-			name = "R&D Console (Computer Board)"
-			build_path = /obj/machinery/computer/rdconsole/core
-			to_chat(user, "<span class='notice'>Defaulting access protocols.</span>")
-	else
-		return ..()
-
-/obj/item/weapon/circuitboard/computer/mecha_control
-	name = "Exosuit Control Console (Computer Board)"
-	build_path = /obj/machinery/computer/mecha
-/obj/item/weapon/circuitboard/computer/rdservercontrol
-	name = "R&D Server Control (Computer Board)"
-	build_path = /obj/machinery/computer/rdservercontrol
-/obj/item/weapon/circuitboard/computer/crew
-	name = "Crew Monitoring Console (Computer Board)"
-	build_path = /obj/machinery/computer/crew
-	origin_tech = "programming=2;biotech=2"
-/obj/item/weapon/circuitboard/computer/mech_bay_power_console
-	name = "Mech Bay Power Control Console (Computer Board)"
-	build_path = /obj/machinery/computer/mech_bay_power_console
-	origin_tech = "programming=3;powerstorage=3"
-
-/obj/item/weapon/circuitboard/computer/cargo
-	name = "Supply Console (Computer Board)"
-	build_path = /obj/machinery/computer/cargo
-	origin_tech = "programming=3"
-	var/contraband = FALSE
-	var/emagged = FALSE
-
-/obj/item/weapon/circuitboard/computer/cargo/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/device/multitool))
-		if(!emagged)
-			contraband = !contraband
-			to_chat(user, "<span class='notice'>Receiver spectrum set to [contraband ? "Broad" : "Standard"].</span>")
-		else
-			to_chat(user, "<span class='notice'>The spectrum chip is unresponsive.</span>")
-	else if(istype(I, /obj/item/weapon/card/emag))
-		if(!emagged)
-			contraband = TRUE
-			emagged = TRUE
-			to_chat(user, "<span class='notice'>You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.</span>")
-	else
-		return ..()
-
-
-/obj/item/weapon/circuitboard/computer/cargo/request
-	name = "Supply Request Console (Computer Board)"
-	build_path = /obj/machinery/computer/cargo/request
-/obj/item/weapon/circuitboard/computer/stockexchange
-	name = "circuit board (Stock Exchange Console)"
-	build_path = /obj/machinery/computer/stockexchange
-	origin_tech = "programming=3"
-
-/obj/item/weapon/circuitboard/computer/operating
-	name = "Operating Computer (Computer Board)"
-	build_path = /obj/machinery/computer/operating
-	origin_tech = "programming=2;biotech=3"
-/obj/item/weapon/circuitboard/computer/mining
-	name = "Outpost Status Display (Computer Board)"
-	build_path = /obj/machinery/computer/security/mining
-/obj/item/weapon/circuitboard/computer/comm_monitor
-	name = "Telecommunications Monitor (Computer Board)"
-	build_path = /obj/machinery/computer/telecomms/monitor
-	origin_tech = "programming=3;magnets=3;bluespace=2"
-/obj/item/weapon/circuitboard/computer/comm_server
-	name = "Telecommunications Server Monitor (Computer Board)"
-	build_path = /obj/machinery/computer/telecomms/server
-	origin_tech = "programming=3;magnets=3;bluespace=2"
-
-/obj/item/weapon/circuitboard/computer/shuttle
-	name = "Shuttle (Computer Board)"
-	build_path = /obj/machinery/computer/shuttle
-	var/shuttleId
-	var/possible_destinations = ""
-
-/obj/item/weapon/circuitboard/computer/shuttle/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/device/multitool))
-		var/chosen_id = round(input(usr, "Choose an ID number (-1 for reset):", "Input an Integer", null) as num|null)
-		if(chosen_id >= 0)
-			shuttleId = chosen_id
-		else
-			shuttleId = initial(shuttleId)
-	else
-		return ..()
-
-/obj/item/weapon/circuitboard/computer/labor_shuttle
-	name = "Labor Shuttle (Computer Board)"
-	build_path = /obj/machinery/computer/shuttle/labor
-/obj/item/weapon/circuitboard/computer/labor_shuttle/one_way
-	name = "Prisoner Shuttle Console (Computer Board)"
-	build_path = /obj/machinery/computer/shuttle/labor/one_way
-/obj/item/weapon/circuitboard/computer/ferry
-	name = "Transport Ferry (Computer Board)"
-	build_path = /obj/machinery/computer/shuttle/ferry
-/obj/item/weapon/circuitboard/computer/ferry/request
-	name = "Transport Ferry Console (Computer Board)"
-	build_path = /obj/machinery/computer/shuttle/ferry/request
-/obj/item/weapon/circuitboard/computer/mining_shuttle
-	name = "Mining Shuttle (Computer Board)"
-	build_path = /obj/machinery/computer/shuttle/mining
-/obj/item/weapon/circuitboard/computer/white_ship
-	name = "White Ship (Computer Board)"
-	build_path = /obj/machinery/computer/shuttle/white_ship
-/obj/item/weapon/circuitboard/computer/auxillary_base
-	name = "Auxillary Base Management Console (Computer Board)"
-	build_path = /obj/machinery/computer/auxillary_base
-/obj/item/weapon/circuitboard/computer/holodeck// Not going to let people get this, but it's just here for future
-	name = "Holodeck Control (Computer Board)"
-	build_path = /obj/machinery/computer/holodeck
-	origin_tech = "programming=4"
-/obj/item/weapon/circuitboard/computer/aifixer
-	name = "AI Integrity Restorer (Computer Board)"
-	build_path = /obj/machinery/computer/aifixer
-	origin_tech = "programming=2;biotech=2"
-/*/obj/item/weapon/circuitboard/computer/prison_shuttle
-	name = "Prison Shuttle (Computer Board)"
-	build_path = /obj/machinery/computer/prison_shuttle*/
-/obj/item/weapon/circuitboard/computer/slot_machine
-	name = "Slot Machine (Computer Board)"
-	build_path = /obj/machinery/computer/slot_machine
-	origin_tech = "programming=1"
-
-/obj/item/weapon/circuitboard/computer/libraryconsole
-	name = "Library Visitor Console (Computer Board)"
-	build_path = /obj/machinery/computer/libraryconsole
-	origin_tech = "programming=1"
-
-/obj/item/weapon/circuitboard/computer/libraryconsole/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		if(build_path == /obj/machinery/computer/libraryconsole/bookmanagement)
-			name = "Library Visitor Console (Computer Board)"
-			build_path = /obj/machinery/computer/libraryconsole
-			to_chat(user, "<span class='notice'>Defaulting access protocols.</span>")
-		else
-			name = "Book Inventory Management Console (Computer Board)"
-			build_path = /obj/machinery/computer/libraryconsole/bookmanagement
-			to_chat(user, "<span class='notice'>Access protocols successfully updated.</span>")
-	else
-		return ..()
-
-/obj/item/weapon/circuitboard/computer/apc_control
-	name = "\improper Power Flow Control Console (Computer Board)"
-	build_path = /obj/machinery/computer/apc_control
-	origin_tech = "programming=3;engineering=3;powerstorage=2"
+	..()

code/game/machinery/computer/card.dm

@@ -571,8 +571,8 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 	icon_screen = "idminor"
 	circuit = /obj/item/weapon/circuitboard/computer/card/minor
 
-/obj/machinery/computer/card/minor/New()
-	..()
+/obj/machinery/computer/card/minor/Initialize()
+	. = ..()
 	var/obj/item/weapon/circuitboard/computer/card/minor/typed_circuit = circuit
 	if(target_dept)
 		typed_circuit.target_dept = target_dept

code/game/machinery/computer/cloning.dm

@@ -20,7 +20,7 @@
 	light_color = LIGHT_COLOR_BLUE
 
 /obj/machinery/computer/cloning/Initialize()
-	..()
+	. = ..()
 	updatemodules(TRUE)
 
 /obj/machinery/computer/cloning/Destroy()

code/game/machinery/computer/communications.dm

@@ -41,9 +41,9 @@
 		return FALSE
 	return TRUE
 
-/obj/machinery/computer/communications/New()
+/obj/machinery/computer/communications/Initialize()
+	. = ..()
 	GLOB.shuttle_caller_list += src
-	..()
 
 /obj/machinery/computer/communications/process()
 	if(..())

code/game/machinery/computer/dna_console.dm

@@ -53,17 +53,13 @@
 	else
 		return ..()
 
-/obj/machinery/computer/scan_consolenew/New()
-	..()
-
-	spawn(5)
-		for(dir in list(NORTH,EAST,SOUTH,WEST))
-			connected = locate(/obj/machinery/dna_scannernew, get_step(src, dir))
-			if(!isnull(connected))
-				break
-		injectorready = world.time + INJECTOR_TIMEOUT
-		return
-	return
+/obj/machinery/computer/scan_consolenew/Initialize()
+	. = ..()
+	for(dir in list(NORTH,EAST,SOUTH,WEST))
+		connected = locate(/obj/machinery/dna_scannernew, get_step(src, dir))
+		if(!isnull(connected))
+			break
+	injectorready = world.time + INJECTOR_TIMEOUT
 
 /obj/machinery/computer/scan_consolenew/attack_hand(mob/user)
 	if(..())

code/game/machinery/computer/gulag_teleporter.dm

@@ -15,9 +15,9 @@
 
 	light_color = LIGHT_COLOR_RED
 
-/obj/machinery/computer/gulag_teleporter_computer/New()
-	..()
-	addtimer(CALLBACK(src, .proc/scan_machinery), 5)
+/obj/machinery/computer/gulag_teleporter_computer/Initialize()
+	. = ..()
+	scan_machinery()
 
 /obj/machinery/computer/gulag_teleporter_computer/Destroy()
 	if(id)

code/game/machinery/computer/monastery_shuttle.dm

@@ -5,7 +5,3 @@
 	shuttleId = "pod1"
 	possible_destinations = "monastery_shuttle_asteroid;monastery_shuttle_station"
 	no_destination_swap = TRUE
-
-/obj/item/weapon/circuitboard/computer/shuttle/monastery_shuttle
-	name = "Monastery Shuttle (Computer Board)"
-	build_path = /obj/machinery/computer/shuttle/monastery_shuttle

code/game/machinery/computer/teleporter.dm

@@ -0,0 +1,212 @@
+/obj/machinery/computer/teleporter
+	name = "teleporter control console"
+	desc = "Used to control a linked teleportation Hub and Station."
+	icon_screen = "teleport"
+	icon_keyboard = "teleport_key"
+	light_color = LIGHT_COLOR_BLUE
+	circuit = /obj/item/weapon/circuitboard/computer/teleporter
+	var/obj/item/device/gps/locked
+	var/regime_set = "Teleporter"
+	var/id
+	var/obj/machinery/teleport/station/power_station
+	var/calibrating
+	var/turf/target //Used for one-time-use teleport cards (such as clown planet coordinates.)
+					//Setting this to 1 will set src.locked to null after a player enters the portal and will not allow hand-teles to open portals to that location.
+
+/obj/machinery/computer/teleporter/Initialize()
+	. = ..()
+	id = "[rand(1000, 9999)]"
+	link_power_station()
+
+/obj/machinery/computer/teleporter/Destroy()
+	if (power_station)
+		power_station.teleporter_console = null
+		power_station = null
+	return ..()
+
+/obj/machinery/computer/teleporter/proc/link_power_station()
+	if(power_station)
+		return
+	for(dir in GLOB.cardinals)
+		power_station = locate(/obj/machinery/teleport/station, get_step(src, dir))
+		if(power_station)
+			break
+	return power_station
+
+/obj/machinery/computer/teleporter/attackby(obj/I, mob/living/user, params)
+	if(istype(I, /obj/item/device/gps))
+		var/obj/item/device/gps/L = I
+		if(L.locked_location && !(stat & (NOPOWER|BROKEN)))
+			if(!user.transferItemToLoc(L, src))
+				to_chat(user, "<span class='warning'>\the [I] is stuck to your hand, you cannot put it in \the [src]!</span>")
+				return
+			locked = L
+			to_chat(user, "<span class='caution'>You insert the GPS device into the [name]'s slot.</span>")
+	else
+		return ..()
+
+/obj/machinery/computer/teleporter/attack_ai(mob/user)
+	return attack_hand(user)
+
+/obj/machinery/computer/teleporter/attack_hand(mob/user)
+	if(..())
+		return
+	interact(user)
+
+/obj/machinery/computer/teleporter/interact(mob/user)
+	var/data = "<h3>Teleporter Status</h3>"
+	if(!power_station)
+		data += "<div class='statusDisplay'>No power station linked.</div>"
+	else if(!power_station.teleporter_hub)
+		data += "<div class='statusDisplay'>No hub linked.</div>"
+	else
+		data += "<div class='statusDisplay'>Current regime: [regime_set]<BR>"
+		data += "Current target: [(!target) ? "None" : "[get_area(target)] [(regime_set != "Gate") ? "" : "Teleporter"]"]<BR>"
+		if(calibrating)
+			data += "Calibration: <font color='yellow'>In Progress</font>"
+		else if(power_station.teleporter_hub.calibrated || power_station.teleporter_hub.accurate >= 3)
+			data += "Calibration: <font color='green'>Optimal</font>"
+		else
+			data += "Calibration: <font color='red'>Sub-Optimal</font>"
+		data += "</div><BR>"
+
+		data += "<A href='?src=\ref[src];regimeset=1'>Change regime</A><BR>"
+		data += "<A href='?src=\ref[src];settarget=1'>Set target</A><BR>"
+		if(locked)
+			data += "<BR><A href='?src=\ref[src];locked=1'>Get target from memory</A><BR>"
+			data += "<A href='?src=\ref[src];eject=1'>Eject GPS device</A><BR>"
+		else
+			data += "<BR><span class='linkOff'>Get target from memory</span><BR>"
+			data += "<span class='linkOff'>Eject GPS device</span><BR>"
+
+		data += "<BR><A href='?src=\ref[src];calibrate=1'>Calibrate Hub</A>"
+
+	var/datum/browser/popup = new(user, "teleporter", name, 400, 400)
+	popup.set_content(data)
+	popup.open()
+
+/obj/machinery/computer/teleporter/Topic(href, href_list)
+	if(..())
+		return
+
+	if(href_list["eject"])
+		eject()
+		updateDialog()
+		return
+
+	if(!check_hub_connection())
+		say("Error: Unable to detect hub.")
+		return
+	if(calibrating)
+		say("Error: Calibration in progress. Stand by.")
+		return
+
+	if(href_list["regimeset"])
+		power_station.engaged = 0
+		power_station.teleporter_hub.update_icon()
+		power_station.teleporter_hub.calibrated = 0
+		reset_regime()
+	if(href_list["settarget"])
+		power_station.engaged = 0
+		power_station.teleporter_hub.update_icon()
+		power_station.teleporter_hub.calibrated = 0
+		set_target(usr)
+	if(href_list["locked"])
+		power_station.engaged = 0
+		power_station.teleporter_hub.update_icon()
+		power_station.teleporter_hub.calibrated = 0
+		target = get_turf(locked.locked_location)
+	if(href_list["calibrate"])
+		if(!target)
+			say("Error: No target set to calibrate to.")
+			return
+		if(power_station.teleporter_hub.calibrated || power_station.teleporter_hub.accurate >= 3)
+			say("Hub is already calibrated!")
+			return
+		say("Processing hub calibration to target...")
+
+		calibrating = 1
+		spawn(50 * (3 - power_station.teleporter_hub.accurate)) //Better parts mean faster calibration
+			calibrating = 0
+			if(check_hub_connection())
+				power_station.teleporter_hub.calibrated = 1
+				say("Calibration complete.")
+			else
+				say("Error: Unable to detect hub.")
+			updateDialog()
+
+	updateDialog()
+
+/obj/machinery/computer/teleporter/proc/check_hub_connection()
+	if(!power_station)
+		return FALSE
+	if(!power_station.teleporter_hub)
+		return FALSE
+	return TRUE
+
+/obj/machinery/computer/teleporter/proc/reset_regime()
+	target = null
+	if(regime_set == "Teleporter")
+		regime_set = "Gate"
+	else
+		regime_set = "Teleporter"
+
+/obj/machinery/computer/teleporter/proc/eject()
+	if(locked)
+		locked.forceMove(get_turf(src))
+		locked = null
+
+/obj/machinery/computer/teleporter/proc/set_target(mob/user)
+	var/list/L = list()
+	var/list/areaindex = list()
+	if(regime_set == "Teleporter")
+		for(var/obj/item/device/radio/beacon/R in GLOB.teleportbeacons)
+			var/turf/T = get_turf(R)
+			if(!T)
+				continue
+			if(T.z == ZLEVEL_CENTCOM || T.z > ZLEVEL_SPACEMAX)
+				continue
+			L[avoid_assoc_duplicate_keys(T.loc.name, areaindex)] = R
+
+		for(var/obj/item/weapon/implant/tracking/I in GLOB.tracked_implants)
+			if(!I.imp_in || !ismob(I.loc))
+				continue
+			else
+				var/mob/M = I.loc
+				if(M.stat == DEAD)
+					if(M.timeofdeath + 6000 < world.time)
+						continue
+				var/turf/T = get_turf(M)
+				if(!T)
+					continue
+				if(T.z == ZLEVEL_CENTCOM)
+					continue
+				L[avoid_assoc_duplicate_keys(M.real_name, areaindex)] = I
+
+		var/desc = input("Please select a location to lock in.", "Locking Computer") as null|anything in L
+		target = L[desc]
+
+	else
+		var/list/S = power_station.linked_stations
+		if(!S.len)
+			to_chat(user, "<span class='alert'>No connected stations located.</span>")
+			return
+		for(var/obj/machinery/teleport/station/R in S)
+			var/turf/T = get_turf(R)
+			if(!T || !R.teleporter_hub || !R.teleporter_console)
+				continue
+			if(T.z == ZLEVEL_CENTCOM || T.z > ZLEVEL_SPACEMAX)
+				continue
+			L[avoid_assoc_duplicate_keys(T.loc.name, areaindex)] = R
+		var/desc = input("Please select a station to lock in.", "Locking Computer") as null|anything in L
+		target = L[desc]
+		if(target)
+			var/obj/machinery/teleport/station/trg = target
+			trg.linked_stations |= power_station
+			trg.stat &= ~NOPOWER
+			if(trg.teleporter_hub)
+				trg.teleporter_hub.stat &= ~NOPOWER
+				trg.teleporter_hub.update_icon()
+			if(trg.teleporter_console)
+				trg.teleporter_console.stat &= ~NOPOWER
+				trg.teleporter_console.update_icon()

code/game/machinery/constructable_frame.dm

@@ -259,52 +259,4 @@
 		for(var/X in components)
 			var/obj/item/I = X
 			I.forceMove(loc)
-	..()
-
-
-
-//Machine Frame Circuit Boards
-/*Common Parts: Parts List: Ignitor, Timer, Infra-red laser, Infra-red sensor, t_scanner, Capacitor, Valve, sensor unit,
-micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells.
-*/
-
-/obj/item/weapon/circuitboard/machine
-	var/list/req_components = null
-	// Components required by the machine.
-	// Example: list(/obj/item/weapon/stock_parts/matter_bin = 5)
-	var/list/def_components = null
-	// Default replacements for req_components, to be used in apply_default_parts instead of req_components types
-	// Example: list(/obj/item/weapon/stock_parts/matter_bin = /obj/item/weapon/stock_parts/matter_bin/super)
-
-/obj/item/weapon/circuitboard/machine/proc/apply_default_parts(obj/machinery/M)
-	if(!req_components)
-		return
-
-	M.component_parts = list(src) // List of components always contains a board
-	loc = null
-
-	for(var/comp_path in req_components)
-		var/comp_amt = req_components[comp_path]
-		if(!comp_amt)
-			continue
-
-		if(def_components && def_components[comp_path])
-			comp_path = def_components[comp_path]
-
-		if(ispath(comp_path, /obj/item/stack))
-			M.component_parts += new comp_path(null, comp_amt)
-		else
-			for(var/i in 1 to comp_amt)
-				M.component_parts += new comp_path(null)
-
-	M.RefreshParts()
-
-
-/obj/item/weapon/circuitboard/machine/abductor
-	name = "alien board (Report This)"
-	icon_state = "abductor_mod"
-	origin_tech = "programming=5;abductor=3"
-
-/obj/item/weapon/circuitboard/machine/clockwork
-	name = "clockwork board (Report This)"
-	icon_state = "clock_mod"
+	..()

code/game/machinery/dance_machine.dm

@@ -50,7 +50,7 @@
 	songs += T
 
 /obj/machinery/disco/Initialize()
-	..()
+	. = ..()
 	selection = songs[1]
 
 

code/game/machinery/dna_scanner.dm

@@ -4,32 +4,17 @@
 	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "scanner"
 	density = TRUE
-	var/locked = FALSE
 	anchored = TRUE
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 50
 	active_power_usage = 300
 	occupant_typecache = list(/mob/living, /obj/item/bodypart/head, /obj/item/organ/brain)
+	circuit = /obj/item/weapon/circuitboard/machine/clonescanner
+	var/locked = FALSE
 	var/damage_coeff
 	var/scan_level
 	var/precision_coeff
 
-/obj/machinery/dna_scannernew/New()
-	..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/clonescanner(null)
-	B.apply_default_parts(src)
-
-/obj/item/weapon/circuitboard/machine/clonescanner
-	name = "Cloning Scanner (Machine Board)"
-	build_path = /obj/machinery/dna_scannernew
-	origin_tech = "programming=2;biotech=2"
-	req_components = list(
-							/obj/item/weapon/stock_parts/scanning_module = 1,
-							/obj/item/weapon/stock_parts/manipulator = 1,
-							/obj/item/weapon/stock_parts/micro_laser = 1,
-							/obj/item/stack/sheet/glass = 1,
-							/obj/item/stack/cable_coil = 2)
-
 /obj/machinery/dna_scannernew/RefreshParts()
 	scan_level = 0
 	damage_coeff = 0

code/game/machinery/doors/alarmlock.dm

@@ -21,7 +21,7 @@
 	return ..()
 
 /obj/machinery/door/airlock/alarmlock/Initialize()
-	..()
+	. = ..()
 	SSradio.remove_object(src, air_frequency)
 	air_connection = SSradio.add_object(src, air_frequency, GLOB.RADIO_TO_AIRALARM)
 	open()

code/game/machinery/doors/brigdoors.dm

@@ -45,7 +45,7 @@
 	Radio.listening = 0
 
 /obj/machinery/door_timer/Initialize()
-	..()
+	. = ..()
 	if(id != null)
 		for(var/obj/machinery/door/window/brigdoor/M in urange(20, src))
 			if (M.id == id)

code/game/machinery/doors/firedoor.dm

@@ -26,7 +26,7 @@
 	var/list/affecting_areas
 
 /obj/machinery/door/firedoor/Initialize()
-	..()
+	. = ..()
 	CalculateAffectingAreas()
 
 /obj/machinery/door/firedoor/examine(mob/user)

code/game/machinery/doppler_array.dm

@@ -11,8 +11,8 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
 	var/max_dist = 100
 	verb_say = "states coldly"
 
-/obj/machinery/doppler_array/New()
-	..()
+/obj/machinery/doppler_array/Initialize()
+	. = ..()
 	GLOB.doppler_arrays += src
 
 /obj/machinery/doppler_array/Destroy()

code/game/machinery/droneDispenser.dm

@@ -24,6 +24,7 @@
 
 	var/datum/material_container/materials
 	var/list/using_materials
+	var/starting_amount = 0
 	var/metal_cost = 1000
 	var/glass_cost = 1000
 	var/power_used = 1000
@@ -52,34 +53,27 @@
 	var/break_message = "lets out a tinny alarm before falling dark."
 	var/break_sound = 'sound/machines/warning-buzzer.ogg'
 
-/obj/machinery/droneDispenser/New()
-	..()
-	obj_integrity = max_integrity
-	materials = new(src, list(MAT_METAL, MAT_GLASS),
-		MINERAL_MATERIAL_AMOUNT*MAX_STACK_SIZE*2)
-
+/obj/machinery/droneDispenser/Initialize()
+	. = ..()
+	materials = new(src, list(MAT_METAL, MAT_GLASS), MINERAL_MATERIAL_AMOUNT*MAX_STACK_SIZE*2)
+	materials.insert_amount(starting_amount)
 	using_materials = list(MAT_METAL=metal_cost, MAT_GLASS=glass_cost)
 
 /obj/machinery/droneDispenser/Destroy()
-	qdel(materials)
-	. = ..()
+	QDEL_NULL(materials)
+	return ..()
 
-/obj/machinery/droneDispenser/preloaded/New()
-	..()
-	materials.insert_amount(5000)
+/obj/machinery/droneDispenser/preloaded
+	starting_amount = 5000
 
 /obj/machinery/droneDispenser/syndrone //Please forgive me
 	name = "syndrone shell dispenser"
-	desc = "A suspicious machine that will create Syndicate \
-		exterminator drones when supplied with metal and glass. Disgusting."
+	desc = "A suspicious machine that will create Syndicate exterminator drones when supplied with metal and glass. Disgusting."
 	dispense_type = /obj/item/drone_shell/syndrone
 	//If we're gonna be a jackass, go the full mile - 10 second recharge timer
 	cooldownTime = 100
 	end_create_message = "dispenses a suspicious drone shell."
-
-/obj/machinery/droneDispenser/syndrone/New()
-	..()
-	materials.insert_amount(25000)
+	starting_amount = 25000
 
 /obj/machinery/droneDispenser/syndrone/badass //Please forgive me
 	name = "badass syndrone shell dispenser"
@@ -101,10 +95,7 @@
 	metal_cost = 2000
 	glass_cost = 2000
 	power_used = 2000
-
-/obj/machinery/droneDispenser/snowflake/preloaded/New()
-	..()
-	materials.insert_amount(10000)
+	starting_amount = 10000
 
 // An example of a custom drone dispenser.
 // This one requires no materials and creates basic hivebots

code/game/machinery/embedded_controller/airlock_controller.dm

@@ -220,7 +220,7 @@
 	var/sanitize_external
 
 /obj/machinery/embedded_controller/radio/airlock_controller/Initialize(mapload)
-	..()
+	. = ..()
 	if(!mapload)
 		return
 

code/game/machinery/embedded_controller/embedded_controller_base.dm

@@ -77,7 +77,7 @@
 	return ..()
 
 /obj/machinery/embedded_controller/radio/Initialize()
-	..()
+	. = ..()
 	set_frequency(frequency)
 
 /obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal)

code/game/machinery/embedded_controller/simple_vent_controller.dm

@@ -52,8 +52,7 @@
 	var/airpump_tag
 
 /obj/machinery/embedded_controller/radio/simple_vent_controller/Initialize(mapload)
-	..()
-
+	. = ..()
 	if(!mapload)
 		return
 	var/datum/computer/file/embedded_program/simple_vent_controller/new_prog = new

code/game/machinery/flasher.dm

@@ -5,15 +5,15 @@
 	desc = "A wall-mounted flashbulb device."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "mflash1"
-	var/obj/item/device/assembly/flash/handheld/bulb = null
+	max_integrity = 250
+	integrity_failure = 100
+	anchored = TRUE
+	var/obj/item/device/assembly/flash/handheld/bulb
 	var/id = null
 	var/range = 2 //this is roughly the size of brig cell
 	var/last_flash = 0 //Don't want it getting spammed like regular flashes
 	var/strength = 100 //How knocked down targets are when flashed.
 	var/base_state = "mflash"
-	max_integrity = 250
-	integrity_failure = 100
-	anchored = TRUE
 
 /obj/machinery/flasher/portable //Portable version of the flasher. Only flashes when anchored
 	name = "portable flasher"
@@ -24,19 +24,17 @@
 	base_state = "pflash"
 	density = TRUE
 
-/obj/machinery/flasher/New(loc, ndir = 0, built = 0)
-	..() // ..() is EXTREMELY IMPORTANT, never forget to add it
+/obj/machinery/flasher/Initialize(mapload, ndir = 0, built = 0)
+	. = ..() // ..() is EXTREMELY IMPORTANT, never forget to add it
 	if(built)
 		setDir(ndir)
 		pixel_x = (dir & 3)? 0 : (dir == 4 ? -28 : 28)
 		pixel_y = (dir & 3)? (dir ==1 ? -28 : 28) : 0
 	else
-		bulb = new /obj/item/device/assembly/flash/handheld(src)
+		bulb = new(src)
 
 /obj/machinery/flasher/Destroy()
-	if(bulb)
-		qdel(bulb)
-		bulb = null
+	QDEL_NULL(bulb)
 	return ..()
 
 /obj/machinery/flasher/power_change()

code/game/machinery/gulag_teleporter.dm

@@ -17,25 +17,23 @@ The console is located at computer/gulag_teleporter.dm
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 200
 	active_power_usage = 5000
+	circuit = /obj/item/weapon/circuitboard/machine/gulag_teleporter
 	var/locked = FALSE
 	var/jumpsuit_type = /obj/item/clothing/under/rank/prisoner
 	var/shoes_type = /obj/item/clothing/shoes/sneakers/orange
-	var/obj/machinery/gulag_item_reclaimer/linked_reclaimer = null
-	var/list/required_items
+	var/obj/machinery/gulag_item_reclaimer/linked_reclaimer
+	var/static/list/telegulag_required_items = typecacheof(list(
+		/obj/item/weapon/implant,
+		/obj/item/clothing/suit/space/eva/plasmaman,
+		/obj/item/clothing/under/plasmaman,
+		/obj/item/clothing/head/helmet/space/plasmaman,
+		/obj/item/weapon/tank/internals,
+		/obj/item/clothing/mask/breath,
+		/obj/item/clothing/mask/gas))
 
-/obj/machinery/gulag_teleporter/New()
-	..()
-	required_items = typecacheof(list(
-				/obj/item/weapon/implant,
-				/obj/item/clothing/suit/space/eva/plasmaman,
-				/obj/item/clothing/under/plasmaman,
-				/obj/item/clothing/head/helmet/space/plasmaman,
-				/obj/item/weapon/tank/internals,
-				/obj/item/clothing/mask/breath,
-				/obj/item/clothing/mask/gas))
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/gulag_teleporter(null)
-	B.apply_default_parts(src)
-	addtimer(CALLBACK(src, .proc/locate_reclaimer), 5)
+/obj/machinery/gulag_teleporter/Initialize()
+	. = ..()
+	locate_reclaimer()
 
 /obj/machinery/gulag_teleporter/Destroy()
 	if(linked_reclaimer)
@@ -46,7 +44,6 @@ The console is located at computer/gulag_teleporter.dm
 	..()
 	update_icon()
 
-
 /obj/machinery/gulag_teleporter/interact(mob/user)
 	if(locked)
 		to_chat(user, "[src] is locked.")
@@ -138,7 +135,7 @@ The console is located at computer/gulag_teleporter.dm
 		linked_reclaimer.stored_items[occupant] = list()
 	var/mob/living/mob_occupant = occupant
 	for(var/obj/item/W in mob_occupant)
-		if(!is_type_in_typecache(W, required_items) && mob_occupant.temporarilyRemoveItemFromInventory(W))
+		if(!is_type_in_typecache(W, telegulag_required_items) && mob_occupant.temporarilyRemoveItemFromInventory(W))
 			if(istype(W, /obj/item/weapon/restraints/handcuffs))
 				W.forceMove(get_turf(src))
 				continue

code/game/machinery/hologram.dm

@@ -40,6 +40,7 @@ Possible to do for anyone motivated enough:
 	active_power_usage = 100
 	max_integrity = 300
 	armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 0)
+	circuit = /obj/item/weapon/circuitboard/machine/holopad
 	var/list/masters = list()//List of living mobs that use the holopad
 	var/last_request = 0 //to prevent request spam. ~Carn
 	var/holo_range = 5 // Change to change how far the AI can move away from the holopad before deactivating.
@@ -51,8 +52,6 @@ Possible to do for anyone motivated enough:
 
 /obj/machinery/holopad/Initialize()
 	. = ..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/holopad(null)
-	B.apply_default_parts(src)
 	holopads += src
 
 /obj/machinery/holopad/Destroy()
@@ -293,7 +292,7 @@ Possible to do for anyone motivated enough:
 			Hologram.Impersonation = user
 
 		Hologram.copy_known_languages_from(user,replace = TRUE)
-		Hologram.mouse_opacity = 0//So you can't click on it.
+		Hologram.mouse_opacity = MOUSE_OPACITY_TRANSPARENT//So you can't click on it.
 		Hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them.
 		Hologram.anchored = TRUE//So space wind cannot drag it.
 		Hologram.name = "[user.name] (Hologram)"//If someone decides to right click.
@@ -384,11 +383,5 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 		return Impersonation.examine(user)
 	return ..()
 
-/obj/item/weapon/circuitboard/machine/holopad
-	name = "AI Holopad (Machine Board)"
-	build_path = /obj/machinery/holopad
-	origin_tech = "programming=1"
-	req_components = list(/obj/item/weapon/stock_parts/capacitor = 1)
-
 #undef HOLOPAD_PASSIVE_POWER_USAGE
 #undef HOLOGRAM_POWER_USAGE

code/game/machinery/igniter.dm

@@ -36,8 +36,8 @@
 			location.hotspot_expose(1000,500,1)
 	return 1
 
-/obj/machinery/igniter/New()
-	..()
+/obj/machinery/igniter/Initialize()
+	. = ..()
 	icon_state = "igniter[on]"
 
 /obj/machinery/igniter/power_change()
@@ -61,15 +61,14 @@
 	anchored = TRUE
 	resistance_flags = FIRE_PROOF
 
-/obj/machinery/sparker/New()
-	..()
+/obj/machinery/sparker/Initialize()
+	. = ..()
 	spark_system = new /datum/effect_system/spark_spread
 	spark_system.set_up(2, 1, src)
 	spark_system.attach(src)
 
 /obj/machinery/sparker/Destroy()
-	qdel(spark_system)
-	spark_system = null
+	QDEL_NULL(spark_system)
 	return ..()
 
 /obj/machinery/sparker/power_change()

code/game/machinery/iv_drip.dm

@@ -15,7 +15,7 @@
 											/obj/item/weapon/reagent_containers/glass)
 
 /obj/machinery/iv_drip/Initialize()
-	..()
+	. = ..()
 	update_icon()
 	drip_containers = typecacheof(drip_containers)
 	

code/game/machinery/iv_drip.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm	(rejected hunks)
+@@ -15,7 +15,7 @@
+ 									/obj/item/weapon/reagent_containers/glass)
+ 
+ /obj/machinery/iv_drip/Initialize()
+-	..()
++	. = ..()
+ 	update_icon()
+ 	drip_containers = typecacheof(drip_containers)
+ 

code/game/machinery/launch_pad.dm

@@ -8,6 +8,7 @@
 	use_power = TRUE
 	idle_power_usage = 200
 	active_power_usage = 2500
+	circuit = /obj/item/weapon/circuitboard/machine/launchpad
 	var/stationary = TRUE //to prevent briefcase pad deconstruction and such
 	var/display_name = "Launchpad"
 	var/teleport_speed = 35
@@ -17,20 +18,6 @@
 	var/x_offset = 0
 	var/y_offset = 0
 
-/obj/machinery/launchpad/Initialize()
-	. = ..()
-	var/obj/item/weapon/circuitboard/machine/launchpad/B = new
-	B.apply_default_parts(src)
-
-/obj/item/weapon/circuitboard/machine/launchpad
-	name = "Bluespace Launchpad (Machine Board)"
-	build_path = /obj/machinery/launchpad
-	origin_tech = "programming=3;engineering=3;plasmatech=2;bluespace=3"
-	req_components = list(
-							/obj/item/weapon/ore/bluespace_crystal = 1,
-							/obj/item/weapon/stock_parts/manipulator = 1)
-	def_components = list(/obj/item/weapon/ore/bluespace_crystal = /obj/item/weapon/ore/bluespace_crystal/artificial)
-
 /obj/machinery/launchpad/RefreshParts()
 	var/E = -1 //to make default parts have the base value
 	for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
@@ -171,9 +158,7 @@
 		qdel(src)
 
 /obj/machinery/launchpad/briefcase/Destroy()
-	if(!QDELETED(briefcase))
-		qdel(briefcase)
-	briefcase = null
+	QDEL_NULL(briefcase)
 	return ..()
 
 /obj/machinery/launchpad/briefcase/isAvailable()

code/game/machinery/lightswitch.dm

@@ -12,7 +12,7 @@
 	//	luminosity = 1
 
 /obj/machinery/light_switch/Initialize()
-	..()
+	. = ..()
 	area = get_area(src)
 
 	if(otherarea)

code/game/machinery/limbgrower.dm

@@ -11,21 +11,20 @@
 	icon_state = "limbgrower_idleoff"
 	density = TRUE
 	container_type = OPENCONTAINER
-
-	var/operating = FALSE
 	anchored = TRUE
 	use_power = IDLE_POWER_USE
-	var/disabled = 0
 	idle_power_usage = 10
 	active_power_usage = 100
+	circuit = /obj/item/weapon/circuitboard/machine/limbgrower
+
+	var/operating = FALSE
+	var/disabled = FALSE
 	var/busy = FALSE
 	var/prod_coeff = 1
-
 	var/datum/design/being_built
 	var/datum/research/files
 	var/selected_category
 	var/screen = 1
-
 	var/list/categories = list(
 							"human",
 							"lizard",
@@ -33,22 +32,11 @@
 							"special"
 							)
 
-/obj/machinery/limbgrower/New()
-	..()
+/obj/machinery/limbgrower/Initialize()
+	. = ..()
 	create_reagents(0)
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/limbgrower(null)
-	B.apply_default_parts(src)
 	files = new /datum/research/limbgrower(src)
 
-/obj/item/weapon/circuitboard/machine/limbgrower
-	name = "Limb Grower (Machine Board)"
-	build_path = /obj/machinery/limbgrower
-	origin_tech = "programming=2;biotech=2"
-	req_components = list(
-							/obj/item/weapon/stock_parts/manipulator = 1,
-							/obj/item/weapon/reagent_containers/glass/beaker = 2,
-							/obj/item/weapon/stock_parts/console_screen = 1)
-
 /obj/machinery/limbgrower/interact(mob/user)
 	if(!is_operational())
 		return

code/game/machinery/magnet.dm

@@ -5,7 +5,6 @@
 // This was created for firing ranges, but I suppose this could have other applications - Doohl
 
 /obj/machinery/magnetic_module
-
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "floor_magnet-f"
 	name = "electromagnetic generator"
@@ -29,22 +28,21 @@
 	var/center_y = 0
 	var/max_dist = 20 // absolute value of center_x,y cannot exceed this integer
 
-/obj/machinery/magnetic_module/New()
+/obj/machinery/magnetic_module/Initialize()
 	..()
 	var/turf/T = loc
 	hide(T.intact)
 	center = T
+	SSradio.add_object(src, freq, GLOB.RADIO_MAGNETS)
+	return INITIALIZE_HINT_LATELOAD
 
-	spawn(10)	// must wait for map loading to finish
-		SSradio.add_object(src, freq, GLOB.RADIO_MAGNETS)
-
-	spawn()
-		magnetic_process()
+/obj/machinery/magnetic_module/LateInitialize()
+	magnetic_process()
 
 /obj/machinery/magnetic_module/Destroy()
 	SSradio.remove_object(src, freq)
-	. = ..()
 	center = null
+	return ..()
 
 // update the invisibility and icon
 /obj/machinery/magnetic_module/hide(intact)
@@ -216,27 +214,22 @@
 	var/datum/radio_frequency/radio_connection
 
 
-/obj/machinery/magnetic_controller/New()
+/obj/machinery/magnetic_controller/Initialize()
 	..()
-
 	if(autolink)
 		for(var/obj/machinery/magnetic_module/M in GLOB.machines)
 			if(M.freq == frequency && M.code == code)
 				magnets.Add(M)
 
-
-	spawn(45)	// must wait for map loading to finish
-		radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_MAGNETS)
-
-
 	if(path) // check for default path
 		filter_path() // renders rpath
+	radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_MAGNETS)
 
 /obj/machinery/magnetic_controller/Destroy()
 	SSradio.remove_object(src, frequency)
 	magnets = null
 	rpath = null
-	. = ..()
+	return ..()
 
 /obj/machinery/magnetic_controller/process()
 	if(magnets.len == 0 && autolink)

code/game/machinery/navbeacon.dm

@@ -22,8 +22,8 @@
 
 	req_access = list(ACCESS_ENGINE, ACCESS_ROBOTICS)
 
-/obj/machinery/navbeacon/New()
-	..()
+/obj/machinery/navbeacon/Initialize()
+	. = ..()
 
 	set_codes()
 

code/game/machinery/newscaster.dm

@@ -197,16 +197,15 @@ GLOBAL_LIST_EMPTY(allCasters)
 	name = "security newscaster"
 	securityCaster = 1
 
-/obj/machinery/newscaster/New(loc, ndir, building)
-	..()
+/obj/machinery/newscaster/Initialize(mapload, ndir, building)
+	. = ..()
 	if(building)
 		setDir(ndir)
 		pixel_x = (dir & 3)? 0 : (dir == 4 ? -32 : 32)
 		pixel_y = (dir & 3)? (dir ==1 ? -32 : 32) : 0
 
 	GLOB.allCasters += src
-	for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allCasters)
-		unit_no++
+	unit_no = GLOB.allCasters.len
 	update_icon()
 
 /obj/machinery/newscaster/Destroy()

code/game/machinery/porta_turret/portable_turret.dm

@@ -72,8 +72,8 @@
 
 	var/obj/machinery/turretid/cp = null
 
-/obj/machinery/porta_turret/New(loc)
-	..()
+/obj/machinery/porta_turret/Initialize()
+	. = ..()
 	if(!base)
 		base = src
 	update_icon()
@@ -143,18 +143,13 @@
 
 /obj/machinery/porta_turret/Destroy()
 	//deletes its own cover with it
-	if(cover)
-		qdel(cover)
-		cover = null
+	QDEL_NULL(cover)
 	base = null
 	if(cp)
 		cp.turrets -= src
 		cp = null
-	if(stored_gun)
-		qdel(stored_gun)
-		stored_gun = null
-	qdel(spark_system)
-	spark_system = null
+	QDEL_NULL(stored_gun)
+	QDEL_NULL(spark_system)
 	return ..()
 
 
@@ -602,8 +597,8 @@
 /obj/machinery/porta_turret/aux_base/interact(mob/user) //Controlled solely from the base console.
 	return
 
-/obj/machinery/porta_turret/aux_base/New()
-	..()
+/obj/machinery/porta_turret/aux_base/Initialize()
+	. = ..()
 	cover.name = name
 	cover.desc = desc
 
@@ -650,8 +645,8 @@
 	var/list/obj/machinery/porta_turret/turrets = list()
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 
-/obj/machinery/turretid/New(loc, ndir = 0, built = 0)
-	..()
+/obj/machinery/turretid/Initialize(mapload, ndir = 0, built = 0)
+	. = ..()
 	if(built)
 		setDir(ndir)
 		locked = FALSE
@@ -664,7 +659,7 @@
 	return ..()
 
 /obj/machinery/turretid/Initialize(mapload) //map-placed turrets autolink turrets
-	..()
+	. = ..()
 	if(!mapload)
 		return
 	if(control_area && istext(control_area))
@@ -682,7 +677,8 @@
 		T.cp = src
 
 /obj/machinery/turretid/attackby(obj/item/I, mob/user, params)
-	if(stat & BROKEN) return
+	if(stat & BROKEN)
+		return
 
 	if (istype(I, /obj/item/device/multitool))
 		var/obj/item/device/multitool/M = I

code/game/machinery/porta_turret/portable_turret.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm	(rejected hunks)
+@@ -664,7 +659,7 @@
+ 	return ..()
+ 
+ /obj/machinery/turretid/Initialize(mapload) //map-placed turrets autolink turrets
+-	..()
++	. = ..()
+ 	if(!mapload)
+ 		return
+ 

code/game/machinery/quantum_pad.dm

@@ -8,28 +8,13 @@
 	idle_power_usage = 200
 	active_power_usage = 5000
 	unique_rename = 1
+	circuit = /obj/item/weapon/circuitboard/machine/quantumpad
 	var/teleport_cooldown = 400 //30 seconds base due to base parts
 	var/teleport_speed = 50
 	var/last_teleport //to handle the cooldown
 	var/teleporting = 0 //if it's in the process of teleporting
 	var/power_efficiency = 1
-	var/obj/machinery/quantumpad/linked_pad = null
-
-/obj/machinery/quantumpad/New()
-	..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/quantumpad(null)
-	B.apply_default_parts(src)
-
-/obj/item/weapon/circuitboard/machine/quantumpad
-	name = "Quantum Pad (Machine Board)"
-	build_path = /obj/machinery/quantumpad
-	origin_tech = "programming=3;engineering=3;plasmatech=3;bluespace=4"
-	req_components = list(
-							/obj/item/weapon/ore/bluespace_crystal = 1,
-							/obj/item/weapon/stock_parts/capacitor = 1,
-							/obj/item/weapon/stock_parts/manipulator = 1,
-							/obj/item/stack/cable_coil = 1)
-	def_components = list(/obj/item/weapon/ore/bluespace_crystal = /obj/item/weapon/ore/bluespace_crystal/artificial)
+	var/obj/machinery/quantumpad/linked_pad
 
 /obj/machinery/quantumpad/RefreshParts()
 	var/E = 0

code/game/machinery/recharger.dm

@@ -7,20 +7,14 @@
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 4
 	active_power_usage = 250
+	circuit = /obj/item/weapon/circuitboard/machine/recharger
 	var/obj/item/charging = null
-	var/static/list/allowed_devices = typecacheof(list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/ammo_box/magazine/recharge, /obj/item/device/modular_computer))
 	var/recharge_coeff = 1
-
-/obj/machinery/recharger/Initialize()
-	. = ..()
-	var/obj/item/weapon/circuitboard/machine/recharger/B = new()
-	B.apply_default_parts(src)
-
-/obj/item/weapon/circuitboard/machine/recharger
-	name = "Weapon Recharger (Machine Board)"
-	build_path = /obj/machinery/recharger
-	origin_tech = "powerstorage=4;engineering=3;materials=4"
-	req_components = list(/obj/item/weapon/stock_parts/capacitor = 1)
+	var/static/list/allowed_devices = typecacheof(list(
+		/obj/item/weapon/gun/energy,
+		/obj/item/weapon/melee/baton,
+		/obj/item/ammo_box/magazine/recharge,
+		/obj/item/device/modular_computer))
 
 /obj/machinery/recharger/RefreshParts()
 	for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts)

code/game/machinery/rechargestation.dm

@@ -8,27 +8,15 @@
 	idle_power_usage = 5
 	active_power_usage = 1000
 	req_access = list(ACCESS_ROBOTICS)
+	state_open = TRUE
+	circuit = /obj/item/weapon/circuitboard/machine/cyborgrecharger
 	var/recharge_speed
 	var/repairs
-	state_open = TRUE
 
-/obj/machinery/recharge_station/New()
-	..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/cyborgrecharger(null)
-	B.apply_default_parts(src)
+/obj/machinery/recharge_station/Initialize()
+	. = ..()
 	update_icon()
 
-/obj/item/weapon/circuitboard/machine/cyborgrecharger
-	name = "Cyborg Recharger (Machine Board)"
-	build_path = /obj/machinery/recharge_station
-	origin_tech = "powerstorage=3;engineering=3"
-	req_components = list(
-							/obj/item/weapon/stock_parts/capacitor = 2,
-							/obj/item/weapon/stock_parts/cell = 1,
-							/obj/item/weapon/stock_parts/manipulator = 1)
-	def_components = list(
-		/obj/item/weapon/stock_parts/cell = /obj/item/weapon/stock_parts/cell/high)
-
 /obj/machinery/recharge_station/RefreshParts()
 	recharge_speed = 0
 	repairs = 0

code/game/machinery/recycler.dm

@@ -8,6 +8,7 @@
 	layer = ABOVE_ALL_MOB_LAYER // Overhead
 	anchored = TRUE
 	density = TRUE
+	circuit = /obj/item/weapon/circuitboard/machine/recycler
 	var/safety_mode = FALSE // Temporarily stops machine if it detects a mob
 	var/icon_name = "grinder-o"
 	var/blood = 0
@@ -18,20 +19,10 @@
 	var/eat_victim_items = TRUE
 	var/item_recycle_sound = 'sound/items/welder.ogg'
 
-/obj/machinery/recycler/New()
-	..()
+/obj/machinery/recycler/Initialize()
 	materials = new /datum/material_container(src, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM))
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/recycler(null)
-	B.apply_default_parts(src)
 	update_icon()
-
-/obj/item/weapon/circuitboard/machine/recycler
-	name = "Recycler (Machine Board)"
-	build_path = /obj/machinery/recycler
-	origin_tech = "programming=2;engineering=2"
-	req_components = list(
-							/obj/item/weapon/stock_parts/matter_bin = 1,
-							/obj/item/weapon/stock_parts/manipulator = 1)
+	return ..()
 
 /obj/machinery/recycler/RefreshParts()
 	var/amt_made = 0

code/game/machinery/requests_console.dm

@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(allConsoles)
 			icon_state = "req_comp0"
 
 /obj/machinery/requests_console/Initialize()
-	..()
+	. = ..()
 	name = "\improper [department] requests console"
 	GLOB.allConsoles += src
 	switch(departmentType)

code/game/machinery/shieldgen.dm

@@ -58,7 +58,7 @@
 	desc = "A weak shield summoned by cultists to protect them while they carry out delicate rituals"
 	color = "#FF0000"
 	max_integrity = 20
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/structure/emergency_shield/invoker/emp_act(severity)
 	return

code/game/machinery/slotmachine.dm

@@ -34,7 +34,7 @@
 	light_color = LIGHT_COLOR_BROWN
 
 /obj/machinery/computer/slot_machine/Initialize()
-	..()
+	. = ..()
 	jackpots = rand(1, 4) //false hope
 	plays = rand(75, 200)
 

code/game/machinery/spaceheater.dm

@@ -12,6 +12,7 @@
 	desc = "Made by Space Amish using traditional space techniques, this heater/cooler is guaranteed not to set the station on fire."
 	max_integrity = 250
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100, fire = 80, acid = 10)
+	circuit = /obj/item/weapon/circuitboard/machine/space_heater
 	var/obj/item/weapon/stock_parts/cell/cell
 	var/on = FALSE
 	var/mode = HEATER_MODE_STANDBY
@@ -26,22 +27,11 @@
 /obj/machinery/space_heater/get_cell()
 	return cell
 
-/obj/machinery/space_heater/New()
-	..()
+/obj/machinery/space_heater/Initialize()
+	. = ..()
 	cell = new(src)
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/space_heater(null)
-	B.apply_default_parts(src)
 	update_icon()
 
-/obj/item/weapon/circuitboard/machine/space_heater
-	name = "Space Heater (Machine Board)"
-	build_path = /obj/machinery/space_heater
-	origin_tech = "programming=2;engineering=2;plasmatech=2"
-	req_components = list(
-							/obj/item/weapon/stock_parts/micro_laser = 1,
-							/obj/item/weapon/stock_parts/capacitor = 1,
-							/obj/item/stack/cable_coil = 3)
-
 /obj/machinery/space_heater/on_construction()
 	qdel(cell)
 	cell = null

code/game/machinery/suit_storage_unit.dm

@@ -101,8 +101,8 @@
 	mask_type = /obj/item/clothing/mask/breath
 	storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double
 
-/obj/machinery/suit_storage_unit/New()
-	..()
+/obj/machinery/suit_storage_unit/Initialize()
+	. = ..()
 	wires = new /datum/wires/suit_storage_unit(src)
 	if(suit_type)
 		suit = new suit_type(src)
@@ -115,18 +115,10 @@
 	update_icon()
 
 /obj/machinery/suit_storage_unit/Destroy()
-	if(suit)
-		qdel(suit)
-		suit = null
-	if(helmet)
-		qdel(helmet)
-		helmet = null
-	if(mask)
-		qdel(mask)
-		mask = null
-	if(storage)
-		qdel(storage)
-		storage = null
+	QDEL_NULL(suit)
+	QDEL_NULL(helmet)
+	QDEL_NULL(mask)
+	QDEL_NULL(storage)
 	return ..()
 
 /obj/machinery/suit_storage_unit/update_icon()

code/game/machinery/syndicatebomb.dm

@@ -82,22 +82,19 @@
 			countdown.stop()
 			STOP_PROCESSING(SSfastprocess, src)
 
-/obj/machinery/syndicatebomb/New()
+/obj/machinery/syndicatebomb/Initialize()
+	. = ..()
 	wires = new /datum/wires/syndicatebomb(src)
-	if(src.payload)
+	if(payload)
 		payload = new payload(src)
 	update_icon()
 	countdown = new(src)
-	..()
 
 /obj/machinery/syndicatebomb/Destroy()
-	qdel(wires)
-	wires = null
-	if(countdown)
-		qdel(countdown)
-		countdown = null
+	QDEL_NULL(wires)
+	QDEL_NULL(countdown)
 	STOP_PROCESSING(SSfastprocess, src)
-	. = ..()
+	return ..()
 
 /obj/machinery/syndicatebomb/examine(mob/user)
 	..()

code/game/machinery/telecomms/machines/broadcaster.dm

@@ -17,8 +17,7 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 25
 	machinetype = 5
-	/*heatgen = 0
-	delay = 7*/
+	circuit = /obj/item/weapon/circuitboard/machine/telecomms/broadcaster
 
 /obj/machinery/telecomms/broadcaster/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
 	// Don't broadcast rejected signals
@@ -82,22 +81,6 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages
 		/* --- Do a snazzy animation! --- */
 		flick("broadcaster_send", src)
 
-/obj/machinery/telecomms/broadcaster/New()
-	..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/telecomms/broadcaster(null)
-	B.apply_default_parts(src)
-
-/obj/item/weapon/circuitboard/machine/telecomms/broadcaster
-	name = "Subspace Broadcaster (Machine Board)"
-	build_path = /obj/machinery/telecomms/broadcaster
-	origin_tech = "programming=2;engineering=2;bluespace=1"
-	req_components = list(
-							/obj/item/weapon/stock_parts/manipulator = 2,
-							/obj/item/stack/cable_coil = 1,
-							/obj/item/weapon/stock_parts/subspace/filter = 1,
-							/obj/item/weapon/stock_parts/subspace/crystal = 1,
-							/obj/item/weapon/stock_parts/micro_laser = 2)
-
 /obj/machinery/telecomms/broadcaster/Destroy()
 	// In case message_delay is left on 1, otherwise it won't reset the list and people can't say the same thing twice anymore.
 	if(GLOB.message_delay)

code/game/machinery/telecomms/machines/bus.dm

@@ -17,8 +17,8 @@
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 50
 	machinetype = 2
-	//heatgen = 20
 	netspeed = 40
+	circuit = /obj/item/weapon/circuitboard/machine/telecomms/bus
 	var/change_frequency = 0
 
 /obj/machinery/telecomms/bus/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
@@ -49,24 +49,6 @@
 			if(can_send)
 				break
 
-/obj/machinery/telecomms/bus/New()
-	..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/telecomms/bus(null)
-	B.apply_default_parts(src)
-
-/obj/item/weapon/circuitboard/machine/telecomms/bus
-	name = "Bus Mainframe (Machine Board)"
-	build_path = /obj/machinery/telecomms/bus
-	origin_tech = "programming=2;engineering=2"
-	req_components = list(
-							/obj/item/weapon/stock_parts/manipulator = 2,
-							/obj/item/stack/cable_coil = 1,
-							/obj/item/weapon/stock_parts/subspace/filter = 1)
-
-
-
-
-
 //Preset Buses
 
 /obj/machinery/telecomms/bus/preset_one
@@ -93,10 +75,10 @@
 	freq_listening = list(GLOB.ENG_FREQ)
 	autolinkers = list("processor4", "engineering", "common")
 
-/obj/machinery/telecomms/bus/preset_four/New()
+/obj/machinery/telecomms/bus/preset_four/Initialize()
+	. = ..()
 	for(var/i = 1441, i < 1489, i += 2)
 		freq_listening |= i
-	..()
 
 /obj/machinery/telecomms/bus/preset_one/birdstation
 	name = "Bus"