Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891

2017-06-08 03:33:56 -05:00
parent d53044aa10 ad97147dfe
commit 3563459d15
251 changed files with 4967 additions and 9496 deletions
@@ -1435,8 +1435,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "AI Satellite Atmos"
 	icon_state = "ai"
 	
-	/area/ai_monitored/turret_protected/aisat/atmos
-	name = "AI Satellite Atmos"
+/area/ai_monitored/turret_protected/aisat/foyer
+	name = "AI Satellite Foyer"
 	icon_state = "ai"
 	
 /area/ai_monitored/turret_protected/aisat/service
@@ -37,6 +37,7 @@
 	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
 	requires_power = 0
 	has_gravity = 1
+	flags = NONE

 /area/tdome/arena
 	name = "Thunderdome Arena"
@@ -75,6 +76,7 @@
 	requires_power = 0
 	has_gravity = 1
 	noteleport = 1
+	flags = NONE

 //Abductors
 /area/abductor_ship
@@ -83,6 +85,7 @@
 	requires_power = 0
 	noteleport = 1
 	has_gravity = 1
+	flags = NONE

 //Syndicates
 /area/syndicate_mothership
@@ -92,6 +95,7 @@
 	has_gravity = 1
 	noteleport = 1
 	blob_allowed = 0 //Not... entirely sure this will ever come up... but if the bus makes blobs AND ops, it shouldn't aim for the ops to win.
+	flags = NONE

 /area/syndicate_mothership/control
 	name = "Syndicate Control Room"
@@ -1,9 +0,0 @@
-diff a/code/game/atoms.dm b/code/game/atoms.dm	(rejected hunks)
-@@ -274,6 +274,7 @@
- 	return
- 
- /atom/proc/ex_act(severity, target)
-+	set waitfor = FALSE
- 	contents_explosion(severity, target)
- 
- /atom/proc/blob_act(obj/structure/blob/B)
@@ -225,7 +225,10 @@ This file contains the arcane tome files.
 						 "<span class='cult'>You [user.blood_volume ? "slice open your arm and ":""]begin drawing a sigil of the Geometer.</span>")
 	if(user.blood_volume)
 		user.apply_damage(initial(rune_to_scribe.scribe_damage), BRUTE, pick("l_arm", "r_arm"))
-	if(!do_after(user, initial(rune_to_scribe.scribe_delay), target = get_turf(user)))
+	var/scribe_mod = initial(rune_to_scribe.scribe_delay)
+	if(istype(get_turf(user), /turf/open/floor/engine/cult))
+		scribe_mod *= 0.5
+	if(!do_after(user, scribe_mod, target = get_turf(user)))
 		for(var/V in shields)
 			var/obj/structure/emergency_shield/sanguine/S = V
 			if(S && !QDELETED(S))
@@ -46,7 +46,10 @@
 	if(damage_interrupt && isliving(owner))
 		var/mob/living/L = owner
 		health = list("health" = L.health)
-	if(do_after(owner, scribe_time, target = owner, extra_checks = CALLBACK(owner, /mob.proc/break_do_after_checks, health, action_interrupt)))
+	var/scribe_mod = scribe_time
+	if(istype(get_turf(owner), /turf/open/floor/engine/cult))
+		scribe_mod *= 0.5
+	if(do_after(owner, scribe_mod, target = owner, extra_checks = CALLBACK(owner, /mob.proc/break_do_after_checks, health, action_interrupt)))
 		var/obj/effect/rune/new_rune = new rune_type(owner.loc)
 		new_rune.keyword = chosen_keyword
 	else
@@ -1,5 +1,6 @@
 #define DOM_BLOCKED_SPAM_CAP 6
 #define DOM_REQUIRED_TURFS 30
+#define DOM_HULK_HITS_REQUIRED 10

 /obj/machinery/dominator
 	name = "dominator"
@@ -20,6 +21,9 @@
 	var/datum/effect_system/spark_spread/spark_system
 	var/obj/effect/countdown/dominator/countdown

+/obj/machinery/dominator/hulk_damage()
+	return (max_integrity - integrity_failure) / DOM_HULK_HITS_REQUIRED
+
 /proc/dominator_excessive_walls(atom/A)
 	var/open = 0
 	for(var/turf/T in view(3, A))
@@ -33,13 +37,14 @@
 /obj/machinery/dominator/tesla_act()
 	qdel(src)

-/obj/machinery/dominator/New()
-	..()
+/obj/machinery/dominator/Initialize()
+	. = ..()
 	set_light(2)
 	GLOB.poi_list |= src
 	spark_system = new
 	spark_system.set_up(5, TRUE, src)
 	countdown = new(src)
+	update_icon()

 /obj/machinery/dominator/examine(mob/user)
 	..()
@@ -103,8 +108,23 @@
 				spark_system.start()
 		else if(!(stat & BROKEN))
 			spark_system.start()
-			cut_overlays()
+			update_icon()
+
+/obj/machinery/dominator/update_icon()
+	cut_overlays()
+	if(!(stat & BROKEN))
+		icon_state = "dominator-active"
+		if(operating)
+			var/mutable_appearance/dominator_overlay = mutable_appearance('icons/obj/machines/dominator.dmi', "dominator-overlay")
+			if(gang)
+				dominator_overlay.color = gang.color_hex
+			add_overlay(dominator_overlay)
+		else
+			icon_state = "dominator"
+		if(obj_integrity/max_integrity < 0.66)
 			add_overlay("damage")
+	else
+		icon_state = "dominator-broken"

 /obj/machinery/dominator/obj_break(damage_flag)
 	if(!(stat & BROKEN) && !(flags & NODECONSTRUCT))
@@ -142,10 +162,9 @@
 		gang.message_gangtools("Hostile takeover cancelled: Dominator is no longer operational.[gang.dom_attempts ? " You have [gang.dom_attempts] attempt remaining." : " The station network will have likely blocked any more attempts by us."]",1,1)

 	set_light(0)
-	icon_state = "dominator-broken"
-	cut_overlays()
 	operating = 0
 	stat |= BROKEN
+	update_icon()
 	STOP_PROCESSING(SSmachines, src)

 /obj/machinery/dominator/Destroy()
@@ -196,9 +215,9 @@
 		priority_announce("Network breach detected in [locname]. The [gang.name] Gang is attempting to seize control of the station!","Network Alert")
 		gang.domination()
 		SSshuttle.registerHostileEnvironment(src)
-		src.name = "[gang.name] Gang [src.name]"
+		name = "[gang.name] Gang [name]"
 		operating = 1
-		icon_state = "dominator-[gang.color]"
+		update_icon()

 		countdown.color = gang.color_hex
 		countdown.start()
@@ -75,7 +75,7 @@
 		/datum/gang_item/clothing/hands,
 		/datum/gang_item/clothing/belt,

-  	/datum/gang_item/weapon/shuriken,
+		/datum/gang_item/weapon/shuriken,
 		/datum/gang_item/weapon/switchblade,
 		/datum/gang_item/weapon/improvised,
 		/datum/gang_item/weapon/ammo/improvised_ammo,
@@ -111,7 +111,7 @@
 /datum/gang_item/clothing/hat
 	name = "Pimp Hat"
 	id = "hat"
-	cost = 18
+	cost = 16
 	item_path = /obj/item/clothing/head/collectable/petehat/gang

 /obj/item/clothing/head/collectable/petehat/gang
@@ -121,7 +121,7 @@
 /datum/gang_item/clothing/mask
 	name = "Golden Death Mask"
 	id = "mask"
-	cost = 20
+	cost = 18
 	item_path = /obj/item/clothing/mask/gskull

 /obj/item/clothing/mask/gskull
@@ -133,7 +133,7 @@
 /datum/gang_item/clothing/shoes
 	name = "Bling Boots"
 	id = "boots"
-	cost = 25
+	cost = 22
 	item_path = /obj/item/clothing/shoes/gang

 /obj/item/clothing/shoes/gang
@@ -144,14 +144,14 @@
 /datum/gang_item/clothing/neck
 	name = "Gold Necklace"
 	id = "necklace"
-	cost = 10
+	cost = 9
 	item_path = /obj/item/clothing/neck/necklace/dope


 /datum/gang_item/clothing/hands
 	name = "Decorative Brass Knuckles"
 	id = "hand"
-	cost = 12
+	cost = 11
 	item_path = /obj/item/clothing/gloves/gang

 /obj/item/clothing/gloves/gang
@@ -163,7 +163,7 @@
 /datum/gang_item/clothing/belt
 	name = "Badass Belt"
 	id = "belt"
-	cost = 15
+	cost = 13
 	item_path = /obj/item/weapon/storage/belt/military/gang

 /obj/item/weapon/storage/belt/military/gang
@@ -215,7 +215,6 @@
 	name = "Sawn-Off Improvised Shotgun"
 	id = "sawn"
 	cost = 6
-	item_path = /obj/item/weapon/gun/ballistic/revolver/doublebarrel/improvised/sawn

 /datum/gang_item/weapon/ammo/improvised_ammo
 	name = "Box of Buckshot"
@@ -236,16 +235,24 @@
 	item_path = /obj/item/ammo_box/magazine/m10mm

 /datum/gang_item/weapon/sniper
-	name = ".50cal Sniper Rifle"
+	name = "Black Market .50cal Sniper Rifle"
 	id = "sniper"
 	cost = 40
 	item_path = /obj/item/weapon/gun/ballistic/automatic/sniper_rifle

 /datum/gang_item/weapon/ammo/sniper_ammo
-	name = "Standard .50cal Sniper Rounds"
+	name = "Smuggled .50cal Sniper Rounds"
 	id = "sniper_ammo"
 	cost = 15
-	item_path = /obj/item/ammo_box/magazine/sniper_rounds
+	item_path = /obj/item/ammo_box/magazine/sniper_rounds/gang
+
+
+/datum/gang_item/weapon/ammo/sleeper_ammo
+	name = "Illicit Tranquilizer Cartridges"
+	id = "sniper_ammo"
+	cost = 15
+	item_path = /obj/item/ammo_box/magazine/sniper_rounds/gang/sleeper
+

 /datum/gang_item/weapon/machinegun
 	name = "Mounted Machine Gun"
@@ -194,7 +194,7 @@
 	set desc = "Detonate all RCDs on the station, while sparing onboard cyborg RCDs."
 	set waitfor = FALSE

-	if(!canUseTopic() || malf_cooldown)
+	if(!canUseTopic() || malf_cooldown > world.time)
 		return

 	for(var/I in GLOB.rcd_list)
@@ -203,9 +203,7 @@
 			RCD.detonate_pulse()

 	to_chat(src, "<span class='warning'>RCD detonation pulse emitted.</span>")
-	malf_cooldown = TRUE
-	sleep(100)
-	malf_cooldown = FALSE
+	malf_cooldown = world.time + 100

 /datum/AI_Module/large/mecha_domination
 	module_name = "Viral Mech Domination"
@@ -446,7 +444,7 @@
 	set name = "Reactivate Cameranet"
 	set category = "Malfunction"

-	if(!canUseTopic() || malf_cooldown)
+	if(!canUseTopic() || malf_cooldown > world.time)
 		return
 	var/fixedcams = 0 //Tells the AI how many cams it fixed. Stats are fun.

@@ -469,9 +467,7 @@
 				break
 	to_chat(src, "<span class='notice'>Diagnostic complete! Operations completed: [fixedcams].</span>")

-	malf_cooldown = 1
-	spawn(30) //Lag protection
-		malf_cooldown = 0
+	malf_cooldown = world.time + 30

 /datum/AI_Module/large/upgrade_cameras
 	module_name = "Upgrade Camera Network"
@@ -31,15 +31,15 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 	var/max_i = 10//number of tries to spawn meteor.
 	while(!isspaceturf(pickedstart))
 		var/startSide = pick(GLOB.cardinal)
-		pickedstart = spaceDebrisStartLoc(startSide, 1)
-		pickedgoal = spaceDebrisFinishLoc(startSide, 1)
+		pickedstart = spaceDebrisStartLoc(startSide, ZLEVEL_STATION)
+		pickedgoal = spaceDebrisFinishLoc(startSide, ZLEVEL_STATION)
 		max_i--
 		if(max_i<=0)
 			return
 	var/Me = pickweight(meteortypes)
 	var/obj/effect/meteor/M = new Me(pickedstart)
 	M.dest = pickedgoal
-	M.z_original = 1
+	M.z_original = ZLEVEL_STATION
 	spawn(0)
 		walk_towards(M, M.dest, 1)

@@ -96,7 +96,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 	pass_flags = PASSTABLE
 	var/heavy = 0
 	var/meteorsound = 'sound/effects/meteorimpact.ogg'
-	var/z_original = 1
+	var/z_original = ZLEVEL_STATION
 	var/threat = 0 // used for determining which meteors are most interesting
 	var/lifetime = DEFAULT_METEOR_LIFETIME

@@ -212,13 +212,12 @@

 /obj/machinery/abductor/experiment/proc/SendBack(mob/living/carbon/human/H)
 	H.Sleeping(8)
+	H.uncuff()
 	if(console && console.pad && console.pad.teleport_target)
 		H.forceMove(console.pad.teleport_target)
-		H.uncuff()
 		return
 	//Area not chosen / It's not safe area - teleport to arrivals
-	H.forceMove(pick(GLOB.latejoin))
-	H.uncuff()
+	SSjob.SendToLateJoin(H, FALSE)
 	return


@@ -142,7 +142,8 @@
 		return

 	//First we spawn a dude.
-	var/mob/living/carbon/human/new_character = new(pick(GLOB.latejoin))//The mob being spawned.
+	var/mob/living/carbon/human/new_character = new//The mob being spawned.
+	SSjob.SendToLateJoin(new_character)

 	G_found.client.prefs.copy_to(new_character)
 	new_character.dna.update_dna_identity()
@@ -5,7 +5,7 @@
 	start_active = 1

 /obj/machinery/camera/emp_proof/Initialize()
-	..()
+	. = ..()
 	upgradeEmpProof()

 // X-RAY
@@ -15,7 +15,7 @@
 	icon_state = "xraycam" // Thanks to Krutchen for the icons.

 /obj/machinery/camera/xray/Initialize()
-	..()
+	. = ..()
 	upgradeXRay()

 // MOTION
@@ -32,7 +32,7 @@
 	start_active = 1

 /obj/machinery/camera/all/Initialize()
-	..()
+	. = ..()
 	upgradeEmpProof()
 	upgradeXRay()
 	upgradeMotion()
@@ -43,23 +43,22 @@
 	var/number = 0 //camera number in area

 //This camera type automatically sets it's name to whatever the area that it's in is called.
-/obj/machinery/camera/autoname/Initialize(mapload)
-	if(mapload)
-		..()
-		return TRUE
-	else
-		if(!initialized)
-			..()
-		number = 1
-		var/area/A = get_area(src)
-		if(A)
-			for(var/obj/machinery/camera/autoname/C in GLOB.machines)
-				if(C == src) continue
-				var/area/CA = get_area(C)
-				if(CA.type == A.type)
-					if(C.number)
-						number = max(number, C.number+1)
-			c_tag = "[A.name] #[number]"
+/obj/machinery/camera/autoname/Initialize()
+	..()
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/camera/autoname/LateInitialize()
+	. = ..()
+	number = 1
+	var/area/A = get_area(src)
+	if(A)
+		for(var/obj/machinery/camera/autoname/C in GLOB.machines)
+			if(C == src) continue
+			var/area/CA = get_area(C)
+			if(CA.type == A.type)
+				if(C.number)
+					number = max(number, C.number+1)
+		c_tag = "[A.name] #[number]"

 // CHECKS

@@ -331,8 +331,8 @@
 			to_chat(user, "<span class='danger'>Error: Pod has no occupant.</span>")
 			return
 		else
-			connected_message("Authorized Ejection")
-			SPEAK("An authorized ejection of [clonemind.name] has occurred.")
+			connected_message("Emergency Ejection")
+			SPEAK("An emergency ejection of [clonemind.name] has occurred. Survival not guaranteed.")
 			to_chat(user, "<span class='notice'>You force an emergency ejection. </span>")
 			go_out()
 	else
@@ -134,12 +134,10 @@
 	D["Cancel"] = "Cancel"
 	for(var/obj/machinery/camera/C in L)
 		if(!C.network)
-			spawn(0)
-				throw EXCEPTION("Camera in a cameranet has no camera network")
+			stack_trace("Camera in a cameranet has no camera network")
 			continue
 		if(!(istype(C.network,/list)))
-			spawn(0)
-				throw EXCEPTION("Camera in a cameranet has a non-list camera network")
+			stack_trace("Camera in a cameranet has a non-list camera network")
 			continue
 		var/list/tempnetwork = C.network&network
 		if(tempnetwork.len)
@@ -24,7 +24,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 	//Cooldown for closing positions in seconds
 	//if set to -1: No cooldown... probably a bad idea
 	//if set to 0: Not able to close "original" positions. You can only close positions that you have opened before
-	var/change_position_cooldown = 60
+	var/change_position_cooldown = 30
 	//Jobs you cannot open new positions for
 	var/list/blacklisted = list(
 		"AI",
@@ -46,6 +46,11 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)

 	light_color = LIGHT_COLOR_BLUE

+/obj/machinery/computer/card/Initialize()
+	. = ..()
+	change_position_cooldown = config.id_console_jobslot_delay
+
+
 /obj/machinery/computer/card/attackby(obj/O, mob/user, params)//TODO:SANITY
 	if(istype(O, /obj/item/weapon/card/id))
 		var/obj/item/weapon/card/id/idcard = O
@@ -532,7 +537,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 				else
 					SSjob.prioritized_jobs += j
 					prioritycount++
-				to_chat(usr, "<span class='notice'>[j.title] has been successfully [priority ?  "prioritized" : "unprioritized"]. Potential employees will notice your request.</span>")
+				to_chat(usr, "<span class='notice'>[j.title] has been successfully [priority ?  "prioritized" : "unprioritized"]. Potential employees will notice your request.</span>")
 				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)

 		if ("print")
@@ -28,7 +28,7 @@

 	var/list/buffer[NUMBER_OF_BUFFERS]

-	var/injectorready = 0	//Quick fix for issue 286 (screwdriver the screen twice to restore injector)	-Pete
+	var/injectorready = 0	//world timer cooldown var
 	var/current_screen = "mainmenu"
 	var/obj/machinery/dna_scannernew/connected = null
 	var/obj/item/weapon/disk/data/diskette = null
@@ -61,8 +61,7 @@
 			connected = locate(/obj/machinery/dna_scannernew, get_step(src, dir))
 			if(!isnull(connected))
 				break
-		spawn(250)
-			injectorready = 1
+		injectorready = world.time + INJECTOR_TIMEOUT
 		return
 	return

@@ -213,7 +212,7 @@
 							else
 								temp_html += "<span class='linkOff'>Occupant</span>"
 							temp_html += "<a href='?src=\ref[src];task=setdelayed;num=[i];delayaction=[SCANNER_ACTION_UE]'>Occupant:Delayed</a> "
-							if(injectorready)
+							if(injectorready < world.time)
 								temp_html += "<a href='?src=\ref[src];task=injector;num=[i];text=ue'>Injector</a>"
 							else
 								temp_html += "<span class='linkOff'>Injector</span>"
@@ -227,7 +226,7 @@
 							else
 								temp_html += "<span class='linkOff'>Occupant</span>"
 							temp_html += "<a href='?src=\ref[src];task=setdelayed;num=[i];delayaction=[SCANNER_ACTION_UI]'>Occupant:Delayed</a> "
-							if(injectorready)
+							if(injectorready < world.time)
 								temp_html += "<a href='?src=\ref[src];task=injector;num=[i];text=ui'>Injector</a>"
 							else
 								temp_html += "<span class='linkOff'>Injector</span>"
@@ -240,7 +239,7 @@
 							else
 								temp_html += "<span class='linkOff'>Occupant</span>"
 							temp_html += "<a href='?src=\ref[src];task=setdelayed;num=[i];delayaction=[SCANNER_ACTION_MIXED]'>Occupant:Delayed</a> "
-							if(injectorready)
+							if(injectorready < world.time)
 								temp_html += "<a href='?src=\ref[src];task=injector;num=[i];text=mixed'>UI+UE Injector</a>"
 							else
 								temp_html += "<span class='linkOff'>UI+UE Injector</span>"
@@ -251,7 +250,7 @@
 							else
 								temp_html += "<span class='linkOff'>Occupant</span> "
 							temp_html += "<a href='?src=\ref[src];task=setdelayed;num=[i];delayaction=[SCANNER_ACTION_SE]'>Occupant:Delayed</a> "
-							if(injectorready)
+							if(injectorready < world.time )
 								temp_html += "<a href='?src=\ref[src];task=injector;num=[i];text=se'>Injector</a>"
 							else
 								temp_html += "<span class='linkOff'>Injector</span>"
@@ -391,7 +390,7 @@
 					if("mixed")
 						apply_buffer(SCANNER_ACTION_MIXED,num)
 		if("injector")
-			if(num && injectorready)
+			if(num && injectorready < world.time)
 				num = Clamp(num, 1, NUMBER_OF_BUFFERS)
 				var/list/buffer_slot = buffer[num]
 				if(istype(buffer_slot))
@@ -439,9 +438,7 @@
 								if(connected)
 									I.damage_coeff = connected.damage_coeff
 					if(I)
-						injectorready = 0
-						spawn(INJECTOR_TIMEOUT)
-							injectorready = 1
+						injectorready = world.time + INJECTOR_TIMEOUT
 		if("loaddisk")
 			if(num && diskette && diskette.fields)
 				num = Clamp(num, 1, NUMBER_OF_BUFFERS)
@@ -98,20 +98,14 @@

 /obj/machinery/door/airlock/Initialize()
 	. = ..()
-	
+	wires = new /datum/wires/airlock(src)
 	if (cyclelinkeddir)
 		cyclelinkairlock()
 	if(frequency)
 		set_frequency(frequency)
-	update_icon()
-	
-	wires = new /datum/wires/airlock(src)
-	if(src.closeOtherId != null)
-		spawn (5)
-			for (var/obj/machinery/door/airlock/A in GLOB.airlocks)
-				if(A.closeOtherId == src.closeOtherId && A != src)
-					src.closeOther = A
-					break
+
+	if(closeOtherId != null)
+		addtimer(CALLBACK(.proc/update_other_id), 5)
 	if(glass)
 		airlock_material = "glass"
 	if(security_level > AIRLOCK_SECURITY_METAL)
@@ -127,6 +121,15 @@
 	diag_hud.add_to_hud(src)
 	diag_hud_set_electrified()

+
+	update_icon()
+
+/obj/machinery/door/airlock/proc/update_other_id()
+	for(var/obj/machinery/door/airlock/A in GLOB.airlocks)
+		if(A.closeOtherId == closeOtherId && A != src)
+			closeOther = A
+			break
+
 /obj/machinery/door/airlock/proc/cyclelinkairlock()
 	if (cyclelinkedairlock)
 		cyclelinkedairlock.cyclelinkedairlock = null
@@ -330,16 +333,14 @@
 /obj/machinery/door/airlock/proc/shock(mob/user, prb)
 	if(!hasPower())		// unpowered, no shock
 		return FALSE
-	if(hasShocked)
+	if(hasShocked > world.time)
 		return FALSE	//Already shocked someone recently?
 	if(!prob(prb))
 		return FALSE //you lucked out, no shock for you
 	do_sparks(5, TRUE, src)
 	var/tmp/check_range = TRUE
 	if(electrocute_mob(user, get_area(src), src, 1, check_range))
-		hasShocked = TRUE
-		spawn(10)
-			hasShocked = FALSE
+		hasShocked = world.time + 10
 		return TRUE
 	else
 		return FALSE
@@ -58,12 +58,11 @@ Possible to do for anyone motivated enough:

 /obj/machinery/holopad/Destroy()
 	if(outgoing_call)
-		LAZYADD(holo_calls, outgoing_call)
+		outgoing_call.ConnectionFailure(src)

 	for(var/I in holo_calls)
 		var/datum/holocall/HC = I
 		HC.ConnectionFailure(src)
-	LAZYCLEARLIST(holo_calls)

 	for (var/I in masters)
 		clear_holo(I)
@@ -74,7 +73,14 @@ Possible to do for anyone motivated enough:
 	if (powered())
 		stat &= ~NOPOWER
 	else
-		stat |= ~NOPOWER
+		stat |= NOPOWER
+		if(outgoing_call)
+			outgoing_call.ConnectionFailure(src)
+
+/obj/machinery/holopad/obj_break()
+	. = ..()
+	if(outgoing_call)
+		outgoing_call.ConnectionFailure(src)

 /obj/machinery/holopad/RefreshParts()
 	var/holograph_range = 4
@@ -99,26 +105,11 @@ Possible to do for anyone motivated enough:
 		return
 	return ..()

-/obj/machinery/holopad/proc/CheckCallClose()
-	for(var/I in holo_calls)
-		var/datum/holocall/HC = I
-		if(usr == HC.eye)
-			HC.Disconnect(HC.calling_holopad)	//disconnect via clicking the called holopad
-			return TRUE
-	return FALSE
-
-/obj/machinery/holopad/Click(location,control,params)
-	if(!CheckCallClose())
-		return ..()
-
 /obj/machinery/holopad/AltClick(mob/living/carbon/human/user)
 	if(isAI(user))
 		hangup_all_calls()
 		return

-	if(!CheckCallClose())
-		interact(user)
-
 /obj/machinery/holopad/interact(mob/living/carbon/human/user) //Carn: Hologram requests.
 	if(!istype(user))
 		return
@@ -402,4 +393,4 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	req_components = list(/obj/item/weapon/stock_parts/capacitor = 1)

 #undef HOLOPAD_PASSIVE_POWER_USAGE
-#undef HOLOGRAM_POWER_USAGE
+#undef HOLOGRAM_POWER_USAGE
@@ -58,15 +58,11 @@
 			var/p_dir = text2num(href_list["dir"])
 			var/obj/item/pipe/P = new (src.loc, pipe_type=p_type, dir=p_dir)
 			P.add_fingerprint(usr)
-			wait = 1
-			spawn(10)
-				wait = 0
+			wait = world.time + 10
 	if(href_list["makemeter"])
-		if(!wait)
+		if(wait < world.time )
 			new /obj/item/pipe_meter(src.loc)
-			wait = 1
-			spawn(15)
-				wait = 0
+			wait = world.time + 15
 	return

 /obj/machinery/pipedispenser/attackby(obj/item/W, mob/user, params)
@@ -165,7 +161,7 @@ Nah
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
 	if(href_list["dmake"])
-		if(!wait)
+		if(wait < world.time)
 			var/p_type = text2num(href_list["dmake"])
 			var/obj/structure/disposalconstruct/C = new (src.loc,p_type)

@@ -176,9 +172,7 @@ Nah

 			C.add_fingerprint(usr)
 			C.update_icon()
-			wait = 1
-			spawn(15)
-				wait = 0
+			wait = world.time + 15
 	return

 //transit tube dispenser
@@ -216,7 +210,7 @@ Nah
 		return 1
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
-	if(!wait)
+	if(wait < world.time)
 		if(href_list["tube"])
 			var/tube_type = text2num(href_list["tube"])
 			var/obj/structure/C
@@ -241,7 +235,5 @@ Nah
 					C = new /obj/structure/c_transit_tube_pod(loc)
 			if(C)
 				C.add_fingerprint(usr)
-			wait = 1
-			spawn(15)
-				wait = 0
+			wait = world.time + 15
 	return
@@ -1102,4 +1102,4 @@
 	if(target == user || target == get_turf(src))
 		return
 	target_turf = get_turf(target)
-	fire_helper(target_turf)
+	fire_helper(user)
@@ -49,9 +49,7 @@
 /obj/structure/emergency_shield/take_damage(damage, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
 	. = ..()
 	if(.) //damage was dealt
-		set_opacity(1)
-		spawn(20)
-			set_opacity(0)
+		new /obj/effect/temp_visual/impact_effect/ion(loc)

 /obj/structure/emergency_shield/sanguine
 	name = "sanguine barrier"
@@ -86,23 +84,24 @@
 	req_access = list(GLOB.access_engine)
 	max_integrity = 100
 	obj_integrity = 100
-	var/active = 0
-	var/list/deployed_shields = list()
+	var/active = FALSE
+	var/list/deployed_shields
 	var/locked = 0
 	var/shield_range = 4

-/obj/machinery/shieldgen/Destroy()
-	for(var/obj/structure/emergency_shield/ES in deployed_shields)
-		qdel(ES)
+/obj/machinery/shieldgen/Initialize(mapload)
+	. = ..()
 	deployed_shields = list()
+	if(mapload && active && anchored)
+		shields_up()
+
+/obj/machinery/shieldgen/Destroy()
+	QDEL_LIST(deployed_shields)
 	return ..()


 /obj/machinery/shieldgen/proc/shields_up()
-	if(active)
-		return 0 //If it's already turned on, how did this get called?
-
-	active = 1
+	active = TRUE
 	update_icon()

 	for(var/turf/target_tile in range(shield_range, src))
@@ -111,15 +110,9 @@
 				deployed_shields += new /obj/structure/emergency_shield(target_tile)

 /obj/machinery/shieldgen/proc/shields_down()
-	if(!active)
-		return 0 //If it's already off, how did this get called?
-
-	active = 0
+	active = FALSE
 	update_icon()
-
-	for(var/obj/structure/emergency_shield/ES in deployed_shields)
-		qdel(ES)
-	deployed_shields.Cut()
+	QDEL_LIST(deployed_shields)

 /obj/machinery/shieldgen/process()
 	if((stat & BROKEN) && active)
@@ -45,12 +45,14 @@
 	// register for radio system

 /obj/machinery/status_display/Initialize()
-	..()
+	. = ..()
+	GLOB.ai_status_displays.Add(src)
 	SSradio.add_object(src, frequency)

 /obj/machinery/status_display/Destroy()
 	if(SSradio)
 		SSradio.remove_object(src,frequency)
+	GLOB.ai_status_displays.Remove(src)
 	return ..()

 // timed process
@@ -68,8 +68,7 @@
 	message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] used a Wormhole Generator in [ADMIN_COORDJMP(T)]",0,1)
 	log_game("[key_name(chassis.occupant)] used a Wormhole Generator in [COORD(T)]")
 	src = null
-	spawn(rand(150,300))
-		qdel(P)
+	QDEL_IN(P, rand(150,300))
 	return 1


@@ -12,8 +12,8 @@
 	var/poster_type
 	var/obj/structure/sign/poster/poster_structure

-/obj/item/weapon/poster/New(loc, obj/structure/sign/poster/new_poster_structure)
-	..()
+/obj/item/weapon/poster/Initialize(mapload, obj/structure/sign/poster/new_poster_structure)
+	. = ..()
 	poster_structure = new_poster_structure
 	if(!new_poster_structure && poster_type)
 		poster_structure = new poster_type(src)
@@ -58,8 +58,8 @@
 	var/poster_item_desc = "This hypothetical poster item should not exist, let's be honest here."
 	var/poster_item_icon_state = "rolled_poster"

-/obj/structure/sign/poster/New()
-	..()
+/obj/structure/sign/poster/Initialize()
+	. = ..()
 	if(random_basetype)
 		randomise(random_basetype)
 	if(!ruined)
@@ -182,7 +182,7 @@

 /obj/effect/landmark/latejoin/Initialize(mapload)
 	..()
-	GLOB.latejoin += loc
+	SSjob.latejoin_trackers += loc
 	qdel(src)

 // carp.
@@ -127,8 +127,8 @@
 	var/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0)

 	spawn(0)
-		new /obj/effect/hallucination/delusion(victim.loc,victim,force_kind="demon",duration=duration,skip_nearby=0)
-
+		new /obj/effect/hallucination/delusion(victim.loc,victim,"demon",duration,0)
+		
 	var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc)
 	chainsaw.flags |= NODROP
 	victim.drop_all_held_items()
@@ -85,7 +85,7 @@
 		/obj/item/organ/heart/gland/spiderman = 5,
 		/obj/item/organ/heart/gland/ventcrawling = 1,
 		/obj/item/organ/body_egg/alien_embryo = 1,
-		/obj/item/organ/hivelord_core = 2)
+		/obj/item/organ/regenerative_core = 2)
 	lootcount = 3

 /obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner
@@ -169,7 +169,9 @@
 /obj/effect/temp_visual/fire
 	icon = 'icons/effects/fire.dmi'
 	icon_state = "3"
-	duration = 20
+	light_range = 3
+	light_color = LIGHT_COLOR_FIRE
+	duration = 10

 /obj/effect/temp_visual/revenant
 	name = "spooky lights"
@@ -1,19 +1,18 @@
 /obj/item/weapon/poster/wanted
 	icon_state = "rolled_poster"

-/obj/item/weapon/poster/wanted/New(turf/loc, icon/person_icon, wanted_name, description)
-	var/obj/structure/sign/poster/wanted/wanted_poster = new(person_icon, wanted_name, description)
-	..(loc, wanted_poster)
+/obj/item/weapon/poster/wanted/Initialize(mapload, icon/person_icon, wanted_name, description)
+	. = ..(mapload, new /obj/structure/sign/poster/wanted(src, person_icon, wanted_name, description))
 	name = "wanted poster ([wanted_name])"
 	desc = "A wanted poster for [wanted_name]."

 /obj/structure/sign/poster/wanted
 	var/wanted_name

-/obj/structure/sign/poster/wanted/New(var/icon/person_icon, var/person_name, var/description)
+/obj/structure/sign/poster/wanted/Initialize(mapload, icon/person_icon, person_name, description)
+	. = ..()
 	if(!person_icon)
-		qdel(src)
-		return
+		return INITIALIZE_HINT_QDEL
 	name = "wanted poster ([person_name])"
 	wanted_name = person_name
 	desc = description
@@ -12,7 +12,7 @@
 		"Traitor", "Nuke Op", "Cultist", "Clockwork Cultist",
 		"Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer",
 		"Ash Walker", "Deathsquad Officer", "Ian", "Slaughter Demon",
-		"Laughter Demon")
+		"Laughter Demon", "Private Security Officer")
 	var/pushed_over = FALSE //If the cutout is pushed over and has to be righted
 	var/deceptive = FALSE //If the cutout actually appears as what it portray and not a discolored version

@@ -168,6 +168,11 @@
 			desc = "A cardboard cutout of a laughter demon."
 			icon = 'icons/mob/mob.dmi'
 			icon_state = "bowmon"
+		if("Private Security Officer")
+			name = "Private Security Officer"
+			desc = "A cardboard cutout of a private security officer."
+			icon = 'icons/mob/mob.dmi'
+			icon_state = "cutout_ntsec"
 	return 1

 /obj/item/cardboard_cutout/setDir(newdir)
@@ -90,7 +90,7 @@
 	name = ""
 	desc = ""
 	density = 0
-	var/can_move = 1
+	var/can_move = 0
 	var/obj/item/device/chameleon/master = null

 /obj/effect/dummy/chameleon/proc/activate(mob/M, saved_appearance, obj/item/device/chameleon/C)
@@ -126,19 +126,21 @@
 	if(isspaceturf(loc) || !direction)
 		return //No magical space movement!

-	if(can_move)
-		can_move = 0
+	if(can_move < world.time)
+		var/amount
 		switch(user.bodytemperature)
 			if(300 to INFINITY)
-				spawn(10) can_move = 1
+				amount = 10
 			if(295 to 300)
-				spawn(13) can_move = 1
+				amount = 13
 			if(280 to 295)
-				spawn(16) can_move = 1
+				amount = 16
 			if(260 to 280)
-				spawn(20) can_move = 1
+				amount = 20
 			else
-				spawn(25) can_move = 1
+				amount = 25
+
+		can_move = world.time + amount
 		step(src, direction)
 	return

@@ -111,7 +111,7 @@
 							"<span class='warning'>You bop [M] on the head!</span>")
 				playsound(loc, 'sound/weapons/tap.ogg', 50, 1, -1)
 		if(2)
-			if(!scooldown)
+			if(scooldown < world.time)
 				if(M.health >= 0)
 					if(ishuman(M)||ismonkey(M))
 						M.electrocute_act(5, "[user]", safety = 1)
@@ -128,11 +128,9 @@
 								"<span class='danger'>You shock [M] to no effect.</span>")
 					playsound(loc, 'sound/effects/sparks2.ogg', 50, 1, -1)
 					user.cell.charge -= 500
-					scooldown = TRUE
-					spawn(20)
-					scooldown = FALSE
+					scooldown = world.time + 20
 		if(3)
-			if(!ccooldown)
+			if(ccooldown < world.time)
 				if(M.health >= 0)
 					if(ishuman(M))
 						user.visible_message("<span class='userdanger'>[user] crushes [M] in their grip!</span>", \
@@ -143,9 +141,7 @@
 					playsound(loc, 'sound/weapons/smash.ogg', 50, 1, -1)
 					M.adjustBruteLoss(15)
 					user.cell.charge -= 300
-					ccooldown = TRUE
-					spawn(10)
-					ccooldown = FALSE
+					ccooldown = world.time + 10

 /obj/item/borg/cyborghug/peacekeeper
 	shockallowed = TRUE
@@ -60,6 +60,7 @@
 	origin_tech = "bluespace=6;materials=3"
 	materials = list(MAT_BLUESPACE=MINERAL_MATERIAL_AMOUNT)
 	attack_verb = list("bluespace polybashed", "bluespace polybattered", "bluespace polybludgeoned", "bluespace polythrashed", "bluespace polysmashed")
+	novariants = TRUE
 	var/crystal_type = /obj/item/weapon/ore/bluespace_crystal/refined

 /obj/item/stack/sheet/bluespace_crystal/attack_self(mob/user)// to prevent the construction menu from ever happening
@@ -5,11 +5,13 @@
 	amount = 6
 	max_amount = 6
 	w_class = WEIGHT_CLASS_TINY
+	full_w_class = WEIGHT_CLASS_TINY
 	throw_speed = 3
 	throw_range = 7
 	resistance_flags = FLAMMABLE
 	obj_integrity = 40
 	max_integrity = 40
+	novariants = FALSE
 	var/heal_brute = 0
 	var/heal_burn = 0
 	var/stop_bleeding = 0
@@ -20,6 +20,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
 	max_amount = 50
 	attack_verb = list("hit", "bludgeoned", "whacked")
 	hitsound = 'sound/weapons/grenadelaunch.ogg'
+	novariants = TRUE

 /obj/item/stack/rods/Initialize(mapload, new_amount, merge = TRUE)
 	..()
@@ -2,12 +2,14 @@
 	name = "hide"
 	desc = "Something went wrong."
 	origin_tech = "biotech=3"
+	novariants = TRUE

 /obj/item/stack/sheet/animalhide/human
 	name = "human skin"
 	desc = "The by-product of human farming."
 	singular_name = "human skin piece"
 	icon_state = "sheet-hide"
+	novariants = FALSE

 GLOBAL_LIST_INIT(human_recipes, list( \
 	new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/hooded/bloated_human, 5, on_floor = 1), \
@@ -22,6 +24,7 @@ GLOBAL_LIST_INIT(human_recipes, list( \
 	desc = "A piece of skin."
 	singular_name = "skin piece"
 	icon_state = "sheet-hide"
+	novariants = FALSE

 /obj/item/stack/sheet/animalhide/corgi
 	name = "corgi hide"
@@ -87,6 +90,7 @@ GLOBAL_LIST_INIT(xeno_recipes, list ( \
 	icon = 'icons/mob/alien.dmi'
 	icon_state = "chitin"
 	origin_tech = null
+	novariants = TRUE

 /obj/item/xenos_claw
 	name = "alien claw"
@@ -153,6 +157,7 @@ GLOBAL_LIST_INIT(leather_recipes, list ( \
 	singular_name = "watcher sinew"
 	icon_state = "sinew"
 	origin_tech = "biotech=4"
+	novariants = TRUE


 GLOBAL_LIST_INIT(sinew_recipes, list ( \
@@ -166,23 +171,27 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 		/*
 * Plates
 		*/
-
 /obj/item/stack/sheet/animalhide/goliath_hide
 	name = "goliath hide plates"
 	desc = "Pieces of a goliath's rocky hide, these might be able to make your suit a bit more durable to attack from the local fauna."
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "goliath_hide"
 	singular_name = "hide plate"
+	max_amount = 6
+	novariants = FALSE
 	flags = NOBLUDGEON
 	w_class = WEIGHT_CLASS_NORMAL
 	layer = MOB_LAYER

+
 /obj/item/stack/sheet/animalhide/ashdrake
 	name = "ash drake hide"
 	desc = "The strong, scaled hide of an ash drake."
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "dragon_hide"
 	singular_name = "drake plate"
+	max_amount = 10
+	novariants = FALSE
 	flags = NOBLUDGEON
 	w_class = WEIGHT_CLASS_NORMAL
 	layer = MOB_LAYER
@@ -68,6 +68,7 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \
 	singular_name = "sandbag"
 	layer = LOW_ITEM_LAYER
 	origin_tech = "materials=2"
+	novariants = TRUE

 GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 	new/datum/stack_recipe("sandbags", /obj/structure/barricade/sandbags, 1, time = 25, one_per_turf = 1, on_floor = 1), \
@@ -104,6 +105,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 	origin_tech = "materials=6"
 	sheettype = "diamond"
 	materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
+	novariants = TRUE

 GLOBAL_LIST_INIT(diamond_recipes, list ( \
 	new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1), \
@@ -127,6 +129,7 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \
 	origin_tech = "materials=5"
 	sheettype = "uranium"
 	materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
+	novariants = TRUE

 GLOBAL_LIST_INIT(uranium_recipes, list ( \
 	new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1), \
@@ -237,6 +240,7 @@ GLOBAL_LIST_INIT(silver_recipes, list ( \
 	origin_tech = "materials=4"
 	sheettype = "clown"
 	materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
+	novariants = TRUE

 GLOBAL_LIST_INIT(clown_recipes, list ( \
 	new/datum/stack_recipe("bananium tile", /obj/item/stack/tile/mineral/bananium, 1, 4, 20), \
@@ -355,6 +359,7 @@ GLOBAL_LIST_INIT(adamantine_recipes, list(
 	icon_state = "sheet-mythril"
 	singular_name = "mythril sheet"
 	origin_tech = "materials=4"
+	novariants = TRUE

 /*
 * Alien Alloy
@@ -162,6 +162,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 0)
 	resistance_flags = FLAMMABLE
 	merge_type = /obj/item/stack/sheet/mineral/wood
+	novariants = TRUE

 /obj/item/stack/sheet/mineral/wood/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.wood_recipes
@@ -239,6 +240,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
 	origin_tech = "materials=1"
 	resistance_flags = FLAMMABLE
 	merge_type = /obj/item/stack/sheet/cardboard
+	novariants = TRUE

 /obj/item/stack/sheet/cardboard/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.cardboard_recipes
@@ -268,6 +270,7 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \
 	icon = 'icons/obj/items.dmi'
 	sheettype = "runed"
 	merge_type = /obj/item/stack/sheet/runed_metal
+	novariants = TRUE

 /obj/item/stack/sheet/runed_metal/ratvar_act()
 	new /obj/item/stack/tile/brass(loc, amount)
@@ -322,6 +325,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
 	throw_speed = 1
 	throw_range = 3
 	turf_type = /turf/open/floor/clockwork
+	novariants = FALSE

 /obj/item/stack/tile/brass/narsie_act()
 	new /obj/item/stack/sheet/runed_metal(loc, amount)
@@ -339,6 +343,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
 	singular_name = "lesser gem"
 	icon_state = "sheet-lessergem"
 	origin_tech = "materials=4"
+	novariants = TRUE


 /obj/item/stack/sheet/greatergem
@@ -347,6 +352,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
 	singular_name = "greater gem"
 	icon_state = "sheet-greatergem"
 	origin_tech = "materials=7"
+	novariants = TRUE

 	/*
 * Bones
@@ -359,6 +365,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
 	desc = "Someone's been drinking their milk."
 	force = 7
 	throwforce = 5
+	max_amount = 12
 	w_class = WEIGHT_CLASS_NORMAL
 	throw_speed = 1
 	throw_range = 3
@@ -1,11 +1,12 @@
 /obj/item/stack/sheet
 	name = "sheet"
-	w_class = WEIGHT_CLASS_NORMAL
+	full_w_class = WEIGHT_CLASS_NORMAL
 	force = 5
 	throwforce = 5
 	max_amount = 50
 	throw_speed = 1
 	throw_range = 3
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
+	novariants = FALSE
 	var/perunit = MINERAL_MATERIAL_AMOUNT
 	var/sheettype = null //this is used for girders in the creation of walls/false walls
@@ -18,6 +18,8 @@
 	var/datum/robot_energy_storage/source
 	var/cost = 1 // How much energy from storage it costs
 	var/merge_type = null // This path and its children should merge with this stack, defaults to src.type
+	var/full_w_class = WEIGHT_CLASS_NORMAL //The weight class the stack should have at amount > 2/3rds max_amount
+	var/novariants = TRUE //Determines whether the item should update it's sprites based on amount.

 /obj/item/stack/Initialize(mapload, new_amount=null , merge = TRUE)
 	..()
@@ -29,6 +31,28 @@
 		for(var/obj/item/stack/S in loc)
 			if(S.merge_type == merge_type)
 				merge(S)
+	update_weight()
+	update_icon()
+
+/obj/item/stack/proc/update_weight()
+	if(amount <= (max_amount * (1/3)))
+		w_class = Clamp(full_w_class-2, WEIGHT_CLASS_TINY, full_w_class)
+	else if (amount <= (max_amount * (2/3)))
+		w_class = Clamp(full_w_class-1, WEIGHT_CLASS_TINY, full_w_class)
+	else
+		w_class = full_w_class
+
+/obj/item/stack/update_icon()
+	if(novariants)
+		return ..()
+	if(amount <= (max_amount * (1/3)))
+		icon_state = initial(icon_state)
+	else if (amount <= (max_amount * (2/3)))
+		icon_state = "[initial(icon_state)]_2"
+	else
+		icon_state = "[initial(icon_state)]_3"
+	..()
+

 /obj/item/stack/Destroy()
 	if (usr && usr.machine==src)
@@ -188,6 +212,7 @@
 	amount -= used
 	zero_amount()
 	update_icon()
+	update_weight()
 	return 1

 /obj/item/stack/proc/zero_amount()
@@ -204,6 +229,7 @@
 	else
 		src.amount += amount
 	update_icon()
+	update_weight()

 /obj/item/stack/proc/merge(obj/item/stack/S) //Merge src into S, as much as possible
 	if(QDELETED(S) || QDELETED(src) || S == src) //amusingly this can cause a stack to consume itself, let's not allow that.
@@ -12,6 +12,7 @@
 	origin_tech = "materials=1"
 	var/turf_type = null
 	var/mineralType = null
+	novariants = TRUE

 /obj/item/stack/tile/Initialize(mapload, amount)
 	. = ..()
@@ -103,7 +103,7 @@
 			to_chat(user, "<span class='warning'>You need one length of coil to wire the assembly!</span>")
 			return

-	else if(stage == READY && istype(I, /obj/item/weapon/wirecutters))
+	else if(stage == READY && istype(I, /obj/item/weapon/wirecutters) && !active)
 		stage_change(WIRED)
 		to_chat(user, "<span class='notice'>You unlock the [initial(name)] assembly.</span>")

@@ -185,17 +185,6 @@
 	maxWeightClass = 7
 	gasPerThrow = 5

-/datum/crafting_recipe/improvised_pneumatic_cannon //Pretty easy to obtain but
-	name = "Pneumatic Cannon"
-	result = /obj/item/weapon/pneumatic_cannon/ghetto
-	tools = list(/obj/item/weapon/weldingtool,
-				 /obj/item/weapon/wrench)
-	reqs = list(/obj/item/stack/sheet/metal = 4,
-				/obj/item/stack/packageWrap = 8,
-				/obj/item/pipe = 2)
-	time = 300
-	category = CAT_WEAPON
-
 /obj/item/weapon/pneumatic_cannon/proc/updateTank(obj/item/weapon/tank/internals/thetank, removing = 0, mob/living/carbon/human/user)
 	if(removing)
 		if(!src.tank)
@@ -200,10 +200,10 @@
 		/obj/item/weapon/storage/pill_bottle,
 		/obj/item/weapon/ore,
 		/obj/item/weapon/reagent_containers/food/drinks,
-		/obj/item/organ/hivelord_core,
+		/obj/item/organ/regenerative_core,
 		/obj/item/device/wormhole_jaunter,
 		/obj/item/weapon/storage/bag/plants,
-
+		/obj/item/stack/marker_beacon
 		)


@@ -247,10 +247,10 @@
 		)

 /obj/item/weapon/storage/belt/military
-	name = "chest rig"
-	desc = "A set of tactical webbing worn by Syndicate boarding parties."
-	icon_state = "explorer1"
-	item_state = "explorer1"
+	name = "chest rig"
+	desc = "A set of tactical webbing worn by Syndicate boarding parties."
+	icon_state = "militarywebbing"
+	item_state = "militarywebbing"
 	max_w_class = WEIGHT_CLASS_SMALL

 /obj/item/weapon/storage/belt/military/abductor
@@ -405,10 +405,9 @@
 	if(iscyborg(user))
 		return	//Robots can't interact with storage items.

-	if(contents.len >= storage_slots) //don't use items on the backpack if they don't fit
-		return 1
-
 	if(!can_be_inserted(W, 0 , user))
+		if(contents.len >= storage_slots) //don't use items on the backpack if they don't fit
+			return 1
 		return 0

 	handle_item_insertion(W, 0 , user)
@@ -698,56 +698,4 @@
 	sharpness = IS_SHARP

 /obj/item/weapon/twohanded/bonespear/update_icon()
-	icon_state = "bone_spear[wielded]"
-
-/*
- * Sky Bulge (Gae Bolg, tradtional dragoon lance from many FF games.)
- */
-/obj/item/weapon/twohanded/skybulge	//Copy+paste job from bonespear because no explosions.
-	icon_state = "sky_bulge0"
-	name = "Sky Bulge"
-	desc = "A legendary stick with a very pointy tip. Looks to be used for throwing. And jumping. Can be stubborn if you throw too much." //TODO: Be funnier.
-	force = 10 //This thing aint for robusting.
-	w_class = WEIGHT_CLASS_BULKY
-	slot_flags = SLOT_BACK
-	force_unwielded = 10
-	force_wielded = 18					//Same as regular spear. This is a utility weapon.
-	throwforce = 24						//And that utility is throwing. 24 so it takes 5 hits instead of 4.
-	throw_speed = 4
-	embedded_impact_pain_multiplier = 0	//If you somehow embed this, it's not going to hurt.
-	armour_penetration = 15				//Same as Bone Spear
-	embed_chance = 0					//Would ruin the whole theme of the thing.
-	hitsound = 'sound/weapons/bladeslice.ogg'
-	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored", "lanced") //Added lanced for flavour.
-	sharpness = IS_SHARP
-	var/maxdist = 16
-	var/throw_cooldown = 0				//Should equate to half a second. Not supposed to be varedited.
-
-/obj/item/weapon/twohanded/skybulge/update_icon()
-	icon_state = "sky_bulge[wielded]"
-
-/obj/item/weapon/twohanded/skybulge/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback)  //Throw cooldown and offhand-proofing.
-	if(throw_cooldown > world.time)
-		var/mob/user = thrownby
-		user.put_in_hands(src)
-		return
-	unwield(src)
-	..()
-
-/obj/item/weapon/twohanded/skybulge/throw_impact(atom/target) //Praise be the ratvar spear for showing me how to use this proc.
-	var/turf/turfhit = get_turf(target)
-	var/mob/user = thrownby
-	var/turf/source = get_turf(thrownby)
-
-	if(source.z == ZLEVEL_STATION && get_dist(turfhit, source) < maxdist || source.z != ZLEVEL_STATION)
-		..()
-		if(do_after_mob(user, src, 5, uninterruptible = 1, progress = 0))
-			if(QDELETED(src))
-				return
-			var/turf/landing = get_turf(src)
-			if (loc != landing)
-				return
-			user.forceMove(landing)
-	throw_cooldown = world.time + 5				//Half a second between throws.
-	user.put_in_hands(src)
-	playsound(src, 'sound/weapons/laser2.ogg', 20, 1)
+	icon_state = "bone_spear[wielded]"
@@ -25,7 +25,7 @@
 	return ..()

 /obj/structure/chair/proc/RemoveFromLatejoin()
-	GLOB.latejoin -= src	//These may be here due to the arrivals shuttle
+	SSjob.latejoin_trackers -= src	//These may be here due to the arrivals shuttle

 /obj/structure/chair/deconstruct()
 	// If we have materials, and don't have the NOCONSTRUCT flag
@@ -64,6 +64,7 @@
 	new /obj/item/clothing/gloves/color/black(src)
 	new /obj/item/clothing/head/soft/purple(src)
 	new /obj/item/weapon/paint/paint_remover(src)
+	new /obj/item/weapon/melee/flyswatter(src)
 	new /obj/item/device/flashlight(src)
 	for(var/i in 1 to 3)
 		new /obj/item/weapon/caution(src)
@@ -3,6 +3,7 @@
 *		Morgue
 *		Morgue tray
 *		Crematorium
+ *		Creamatorium
 *		Crematorium tray
 *		Crematorium button
 */
@@ -223,6 +224,20 @@ GLOBAL_LIST_EMPTY(crematoriums)
 			update_icon()
 			playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) //you horrible people

+/obj/structure/bodycontainer/crematorium/creamatorium
+	name = "creamatorium"
+	desc = "A human incinerator. Works well during ice cream socials."
+
+/obj/structure/bodycontainer/crematorium/creamatorium/cremate(mob/user)
+	var/list/icecreams = new()
+	for(var/mob/living/i_scream in GetAllContents())
+		var/obj/item/weapon/reagent_containers/food/snacks/icecream/IC = new()
+		IC.set_cone_type("waffle")
+		IC.add_mob_flavor(i_scream)
+		icecreams += IC
+	. = ..()
+	for(var/obj/IC in icecreams)
+		IC.forceMove(src)

 /*
 * Generic Tray
@@ -151,18 +151,14 @@
 		honk()

 /turf/open/floor/mineral/bananium/proc/honk()
-	if(!spam_flag)
-		spam_flag = 1
+	if(spam_flag < world.time)
 		playsound(src, 'sound/items/bikehorn.ogg', 50, 1)
-		spawn(20)
-			spam_flag = 0
+		spam_flag = world.time + 20

 /turf/open/floor/mineral/bananium/proc/squeek()
-	if(!spam_flag)
-		spam_flag = 1
+	if(spam_flag < world.time)
 		playsound(src, "clownstep", 50, 1)
-		spawn(10)
-			spam_flag = 0
+		spam_flag = world.time + 10

 /turf/open/floor/mineral/bananium/airless
 	initial_gas_mix = "TEMP=2.7"
@@ -322,6 +322,7 @@
 	slowdown = 2
 	environment_type = "snow"
 	sand_type = /obj/item/stack/sheet/mineral/snow
+	flags = NONE

 /turf/open/floor/plating/asteroid/snow/airless
 	initial_gas_mix = "TEMP=2.7"