Merge remote-tracking branch 'origin/master' into TGUI-3.0

code/__DEFINES/dcs/signals.dm

@@ -254,6 +254,9 @@
 #define COMSIG_OBJ_DECONSTRUCT 	"obj_deconstruct"				//from base of obj/deconstruct(): (disassembled)
 #define COMSIG_OBJ_BREAK		"obj_break"						//from base of /obj/obj_break(): (damage_flag)
 #define COMSIG_OBJ_SETANCHORED 	"obj_setanchored"				//called in /obj/structure/setAnchored(): (value)
+#define COMSIG_OBJ_ATTACK_GENERIC "obj_attack_generic"			//from base of atom/animal_attack(): (/mob/user)
+	#define COMPONENT_STOP_GENERIC_ATTACK 1
+
 
 // /machinery signals
 #define COMSIG_MACHINE_EJECT_OCCUPANT "eject_occupant"			//from base of obj/machinery/dropContents() (occupant)

code/__HELPERS/files.dm

@@ -3,7 +3,7 @@
 	for(var/file in args)
 		src << browse_rsc(file)
 
-/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list("txt","log","htm", "html", "md"))
+/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list("txt","log","htm", "html", "md", "json"))
 	var/path = root
 
 	for(var/i=0, i<max_iterations, i++)

code/__HELPERS/mobs.dm

@@ -375,6 +375,8 @@ GLOBAL_LIST_EMPTY(species_list)
 			override = TRUE
 		if(HAS_TRAIT(M, TRAIT_SIXTHSENSE))
 			override = TRUE
+		if(SSticker.current_state == GAME_STATE_FINISHED)
+			override = TRUE
 		if(isnewplayer(M) && !override)
 			continue
 		if(M.stat != DEAD && !override)

code/__HELPERS/roundend.dm

@@ -233,6 +233,7 @@
 	for(var/antag_name in total_antagonists)
 		var/list/L = total_antagonists[antag_name]
 		log_game("[antag_name]s :[L.Join(", ")].")
+	set_observer_default_invisibility(0, "<span class='warning'>The round is over! You are now visible to the living.</span>")
 
 	CHECK_TICK
 	SSdbcore.SetRoundEnd()

code/datums/components/spawner.dm

@@ -8,6 +8,8 @@
 	var/list/faction = list("mining")
 
 /datum/component/spawner/Initialize(_mob_types, _spawn_time, _faction, _spawn_text, _max_mobs)
+	if(!isatom(parent))
+		return COMPONENT_INCOMPATIBLE
 	if(_spawn_time)
 		spawn_time=_spawn_time
 	if(_mob_types)
@@ -19,20 +21,25 @@
 	if(_max_mobs)
 		max_mobs=_max_mobs
 
-	RegisterSignal(parent, list(COMSIG_PARENT_QDELETING), .proc/stop_spawning)
+	RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/stop_spawning)
+	RegisterSignal(parent, COMSIG_OBJ_ATTACK_GENERIC, .proc/on_attack_generic)
 	START_PROCESSING(SSprocessing, src)
 
 /datum/component/spawner/process()
 	try_spawn_mob()
 
-
-/datum/component/spawner/proc/stop_spawning(force, hint)
+/datum/component/spawner/proc/stop_spawning(datum/source, force, hint)
 	STOP_PROCESSING(SSprocessing, src)
 	for(var/mob/living/simple_animal/L in spawned_mobs)
 		if(L.nest == src)
 			L.nest = null
 	spawned_mobs = null
 
+// Stopping clientless simple mobs' from indiscriminately bashing their own spawners due DestroySurroundings() et similars.
+/datum/component/spawner/proc/on_attack_generic(datum/source, mob/user, damage_amount, damage_type, damage_flag, sound_effect, armor_penetration)
+	if(!user.client && ((user.faction & faction) || (user in spawned_mobs)))
+		return COMPONENT_STOP_GENERIC_ATTACK
+
 /datum/component/spawner/proc/try_spawn_mob()
 	var/atom/P = parent
 	if(spawned_mobs.len >= max_mobs)

code/datums/status_effects/debuffs.dm

@@ -81,11 +81,11 @@
 		owner.adjustStaminaLoss(-0.5) //reduce stamina loss by 0.5 per tick, 10 per 2 seconds
 	if(human_owner && human_owner.drunkenness)
 		human_owner.drunkenness *= 0.997 //reduce drunkenness by 0.3% per tick, 6% per 2 seconds
-	if(prob(20))
-		if(carbon_owner)
-			carbon_owner.handle_dreams()
-		if(prob(10) && owner.health > owner.crit_threshold)
-			owner.emote("snore")
+	if(carbon_owner && !carbon_owner.dreaming && prob(2))
+		carbon_owner.dream()
+	// 2% per second, tick interval is in deciseconds
+	if(prob((tick_interval+1) * 0.2) && owner.health > owner.crit_threshold)
+		owner.emote("snore")
 
 /datum/status_effect/staggered
 	id = "staggered"

code/datums/status_effects/status_effect.dm

@@ -6,6 +6,7 @@
 	var/id = "effect" //Used for screen alerts.
 	var/duration = -1 //How long the status effect lasts in DECISECONDS. Enter -1 for an effect that never ends unless removed through some means.
 	var/tick_interval = 10 //How many deciseconds between ticks, approximately. Leave at 10 for every second.
+	var/next_tick //The scheduled time for the next tick.
 	var/mob/living/owner //The mob affected by the status effect.
 	var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted
 	var/examine_text //If defined, this text will appear when the mob is examined - to use he, she etc. use "SUBJECTPRONOUN" and replace it in the examines themselves
@@ -31,7 +32,7 @@
 		return
 	if(duration != -1)
 		duration = world.time + duration
-	tick_interval = world.time + tick_interval
+	next_tick = world.time + tick_interval
 	if(alert_type)
 		var/obj/screen/alert/status_effect/A = owner.throw_alert(id, alert_type)
 		A.attached_effect = src //so the alert can reference us, if it needs to
@@ -52,9 +53,9 @@
 	if(!owner)
 		qdel(src)
 		return
-	if(tick_interval < world.time)
+	if(next_tick < world.time)
 		tick()
-		tick_interval = world.time + initial(tick_interval)
+		next_tick = world.time + tick_interval
 	if(duration != -1 && duration < world.time)
 		qdel(src)
 
@@ -221,7 +222,7 @@
 			threshold_crossed = FALSE //resets threshold effect if we fall below threshold so threshold effect can trigger again
 			on_threshold_drop()
 		if(stacks_added > 0)
-			tick_interval += delay_before_decay //refreshes time until decay
+			next_tick += delay_before_decay //refreshes time until decay
 		stacks = min(stacks, max_stacks)
 		status_overlay.icon_state = "[overlay_state][stacks]"
 		status_underlay.icon_state = "[underlay_state][stacks]"

code/game/mecha/mech_fabricator.dm

@@ -26,6 +26,7 @@
 								"Firefighter",
 								"Odysseus",
 								"Gygax",
+								"Medical-Spec Gygax",
 								"Durand",
 								"H.O.N.K",
 								"Phazon",

code/game/mecha/mecha_construction_paths.dm

@@ -642,6 +642,304 @@
 				user.visible_message("[user] unfastens Gygax Armor Plates.", "<span class='notice'>You unfasten Gygax Armor Plates.</span>")
 	return TRUE
 
+//Begin Medigax
+/datum/component/construction/unordered/mecha_chassis/medigax
+	result = /datum/component/construction/mecha/medigax
+	steps = list(
+		/obj/item/mecha_parts/part/medigax_torso,
+		/obj/item/mecha_parts/part/medigax_left_arm,
+		/obj/item/mecha_parts/part/medigax_right_arm,
+		/obj/item/mecha_parts/part/medigax_left_leg,
+		/obj/item/mecha_parts/part/medigax_right_leg,
+		/obj/item/mecha_parts/part/medigax_head
+	)
+
+/datum/component/construction/mecha/medigax
+	result = /obj/mecha/medical/medigax
+	base_icon = "medigax"
+	steps = list(
+		//1
+		list(
+			"key" = TOOL_WRENCH,
+			"desc" = "The hydraulic systems are disconnected."
+		),
+
+		//2
+		list(
+			"key" = TOOL_SCREWDRIVER,
+			"back_key" = TOOL_WRENCH,
+			"desc" = "The hydraulic systems are connected."
+		),
+
+		//3
+		list(
+			"key" = /obj/item/stack/cable_coil,
+			"amount" = 5,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "The hydraulic systems are active."
+		),
+
+		//4
+		list(
+			"key" = TOOL_WIRECUTTER,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "The wiring is added."
+		),
+
+		//5
+		list(
+			"key" = /obj/item/circuitboard/mecha/gygax/main,
+			"action" = ITEM_DELETE,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "The wiring is adjusted."
+		),
+
+		//6
+		list(
+			"key" = TOOL_SCREWDRIVER,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "Central control module is installed."
+		),
+
+		//7
+		list(
+			"key" = /obj/item/circuitboard/mecha/gygax/peripherals,
+			"action" = ITEM_DELETE,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "Central control module is secured."
+		),
+
+		//8
+		list(
+			"key" = TOOL_SCREWDRIVER,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "Peripherals control module is installed."
+		),
+
+		//9
+		list(
+			"key" = /obj/item/circuitboard/mecha/gygax/targeting,
+			"action" = ITEM_DELETE,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "Peripherals control module is secured."
+		),
+
+		//10
+		list(
+			"key" = TOOL_SCREWDRIVER,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "Weapon control module is installed."
+		),
+
+		//11
+		list(
+			"key" = /obj/item/stock_parts/scanning_module,
+			"action" = ITEM_MOVE_INSIDE,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "Weapon control module is secured."
+		),
+
+		//12
+		list(
+			"key" = TOOL_SCREWDRIVER,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "Scanner module is installed."
+		),
+
+		//13
+		list(
+			"key" = /obj/item/stock_parts/capacitor,
+			"action" = ITEM_MOVE_INSIDE,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "Scanner module is secured."
+		),
+
+		//14
+		list(
+			"key" = TOOL_SCREWDRIVER,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "Capacitor is installed."
+		),
+
+		//15
+		list(
+			"key" = /obj/item/stock_parts/cell,
+			"action" = ITEM_MOVE_INSIDE,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "Capacitor is secured."
+		),
+
+		//16
+		list(
+			"key" = TOOL_SCREWDRIVER,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "The power cell is installed."
+		),
+
+		//17
+		list(
+			"key" = /obj/item/stack/sheet/metal,
+			"amount" = 5,
+			"back_key" = TOOL_SCREWDRIVER,
+			"desc" = "The power cell is secured."
+		),
+
+		//18
+		list(
+			"key" = TOOL_WRENCH,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "Internal armor is installed."
+		),
+
+		//19
+		list(
+			"key" = TOOL_WELDER,
+			"back_key" = TOOL_WRENCH,
+			"desc" = "Internal armor is wrenched."
+		),
+
+		//20
+		list(
+			"key" = /obj/item/mecha_parts/part/medigax_armor,
+			"action" = ITEM_DELETE,
+			"back_key" = TOOL_WELDER,
+			"desc" = "Internal armor is welded."
+		),
+
+		//21
+		list(
+			"key" = TOOL_WRENCH,
+			"back_key" = TOOL_CROWBAR,
+			"desc" = "External armor is installed."
+		),
+
+		//22
+		list(
+			"key" = TOOL_WELDER,
+			"back_key" = TOOL_WRENCH,
+			"desc" = "External armor is wrenched."
+		),
+
+	)
+
+/datum/component/construction/mecha/medigax/action(datum/source, atom/used_atom, mob/user)
+	return check_step(used_atom,user)
+
+/datum/component/construction/mecha/medigax/custom_action(obj/item/I, mob/living/user, diff)
+	if(!..())
+		return FALSE
+
+	switch(index)
+		if(1)
+			user.visible_message("[user] connects [parent] hydraulic systems", "<span class='notice'>You connect [parent] hydraulic systems.</span>")
+		if(2)
+			if(diff==FORWARD)
+				user.visible_message("[user] activates [parent] hydraulic systems.", "<span class='notice'>You activate [parent] hydraulic systems.</span>")
+			else
+				user.visible_message("[user] disconnects [parent] hydraulic systems", "<span class='notice'>You disconnect [parent] hydraulic systems.</span>")
+		if(3)
+			if(diff==FORWARD)
+				user.visible_message("[user] adds the wiring to [parent].", "<span class='notice'>You add the wiring to [parent].</span>")
+			else
+				user.visible_message("[user] deactivates [parent] hydraulic systems.", "<span class='notice'>You deactivate [parent] hydraulic systems.</span>")
+		if(4)
+			if(diff==FORWARD)
+				user.visible_message("[user] adjusts the wiring of [parent].", "<span class='notice'>You adjust the wiring of [parent].</span>")
+			else
+				user.visible_message("[user] removes the wiring from [parent].", "<span class='notice'>You remove the wiring from [parent].</span>")
+		if(5)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs [I] into [parent].", "<span class='notice'>You install [I] into [parent].</span>")
+			else
+				user.visible_message("[user] disconnects the wiring of [parent].", "<span class='notice'>You disconnect the wiring of [parent].</span>")
+		if(6)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures the mainboard.", "<span class='notice'>You secure the mainboard.</span>")
+			else
+				user.visible_message("[user] removes the central control module from [parent].", "<span class='notice'>You remove the central computer mainboard from [parent].</span>")
+		if(7)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs [I] into [parent].", "<span class='notice'>You install [I] into [parent].</span>")
+			else
+				user.visible_message("[user] unfastens the mainboard.", "<span class='notice'>You unfasten the mainboard.</span>")
+		if(8)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures the peripherals control module.", "<span class='notice'>You secure the peripherals control module.</span>")
+			else
+				user.visible_message("[user] removes the peripherals control module from [parent].", "<span class='notice'>You remove the peripherals control module from [parent].</span>")
+		if(9)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs [I] into [parent].", "<span class='notice'>You install [I] into [parent].</span>")
+			else
+				user.visible_message("[user] unfastens the peripherals control module.", "<span class='notice'>You unfasten the peripherals control module.</span>")
+		if(10)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures the weapon control module.", "<span class='notice'>You secure the weapon control module.</span>")
+			else
+				user.visible_message("[user] removes the weapon control module from [parent].", "<span class='notice'>You remove the weapon control module from [parent].</span>")
+		if(11)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs [I] to [parent].", "<span class='notice'>You install [I] to [parent].</span>")
+			else
+				user.visible_message("[user] unfastens the weapon control module.", "<span class='notice'>You unfasten the weapon control module.</span>")
+		if(12)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures the scanner module.", "<span class='notice'>You secure the scanner module.</span>")
+			else
+				user.visible_message("[user] removes the scanner module from [parent].", "<span class='notice'>You remove the scanner module from [parent].</span>")
+		if(13)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs [I] to [parent].", "<span class='notice'>You install [I] to [parent].</span>")
+			else
+				user.visible_message("[user] unfastens the scanner module.", "<span class='notice'>You unfasten the scanner module.</span>")
+		if(14)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures the capacitor.", "<span class='notice'>You secure the capacitor.</span>")
+			else
+				user.visible_message("[user] removes the capacitor from [parent].", "<span class='notice'>You remove the capacitor from [parent].</span>")
+		if(15)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs [I] into [parent].", "<span class='notice'>You install [I] into [parent].</span>")
+			else
+				user.visible_message("[user] unfastens the capacitor.", "<span class='notice'>You unfasten the capacitor.</span>")
+		if(16)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures the power cell.", "<span class='notice'>You secure the power cell.</span>")
+			else
+				user.visible_message("[user] pries the power cell from [parent].", "<span class='notice'>You pry the power cell from [parent].</span>")
+		if(17)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs the internal armor layer to [parent].", "<span class='notice'>You install the internal armor layer to [parent].</span>")
+			else
+				user.visible_message("[user] unfastens the power cell.", "<span class='notice'>You unfasten the power cell.</span>")
+		if(18)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures the internal armor layer.", "<span class='notice'>You secure the internal armor layer.</span>")
+			else
+				user.visible_message("[user] pries internal armor layer from [parent].", "<span class='notice'>You pry internal armor layer from [parent].</span>")
+		if(19)
+			if(diff==FORWARD)
+				user.visible_message("[user] welds the internal armor layer to [parent].", "<span class='notice'>You weld the internal armor layer to [parent].</span>")
+			else
+				user.visible_message("[user] unfastens the internal armor layer.", "<span class='notice'>You unfasten the internal armor layer.</span>")
+		if(20)
+			if(diff==FORWARD)
+				user.visible_message("[user] installs [I] to [parent].", "<span class='notice'>You install [I] to [parent].</span>")
+			else
+				user.visible_message("[user] cuts the internal armor layer from [parent].", "<span class='notice'>You cut the internal armor layer from [parent].</span>")
+		if(21)
+			if(diff==FORWARD)
+				user.visible_message("[user] secures Gygax Armor Plates.", "<span class='notice'>You secure Medical Gygax Armor Plates.</span>")
+			else
+				user.visible_message("[user] pries Gygax Armor Plates from [parent].", "<span class='notice'>You pry Medical Gygax Armor Plates from [parent].</span>")
+		if(22)
+			if(diff==FORWARD)
+				user.visible_message("[user] welds Gygax Armor Plates to [parent].", "<span class='notice'>You weld Medical Gygax Armor Plates to [parent].</span>")
+			else
+				user.visible_message("[user] unfastens Gygax Armor Plates.", "<span class='notice'>You unfasten  Medical Gygax Armor Plates.</span>")
+	return TRUE
+// End Medigax
+
 /datum/component/construction/unordered/mecha_chassis/firefighter
 	result = /datum/component/construction/mecha/firefighter
 	steps = list(

code/game/mecha/mecha_parts.dm

@@ -136,6 +136,47 @@
 	desc = "A set of armor plates designed for the Gygax. Designed to effectively deflect damage with a lightweight construction."
 	icon_state = "gygax_armor"
 
+///////// Medical Gygax
+
+/obj/item/mecha_parts/chassis/medigax
+	name = "\improper Medical Gygax chassis"
+	construct_type = /datum/component/construction/unordered/mecha_chassis/medigax
+
+/obj/item/mecha_parts/part/medigax_torso
+	name = "\improper Medical Gygax torso"
+	desc = "A torso part of Gygax. Contains power unit, processing core and life support systems."
+	icon_state = "medigax_harness"
+
+/obj/item/mecha_parts/part/medigax_head
+	name = "\improper Medical Gygax head"
+	desc = "A Gygax head. Houses advanced surveillance and targeting sensors."
+	icon_state = "medigax_head"
+
+/obj/item/mecha_parts/part/medigax_left_arm
+	name = "\improper Medical Gygax left arm"
+	desc = "A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons."
+	icon_state = "medigax_l_arm"
+
+/obj/item/mecha_parts/part/medigax_right_arm
+	name = "\improper Medical Gygax right arm"
+	desc = "A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons."
+	icon_state = "medigax_r_arm"
+
+/obj/item/mecha_parts/part/medigax_left_leg
+	name = "\improper Medical Gygax left leg"
+	desc = "A Gygax left leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
+	icon_state = "medigax_l_leg"
+
+/obj/item/mecha_parts/part/medigax_right_leg
+	name = "\improper Medical Gygax right leg"
+	desc = "A Gygax right leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
+	icon_state = "medigax_r_leg"
+
+/obj/item/mecha_parts/part/medigax_armor
+	gender = PLURAL
+	name = "\improper Medical Gygax armor plates"
+	desc = "A set of armor plates designed for the Gygax. Designed to effectively deflect damage with a lightweight construction."
+	icon_state = "medigax_armor"
 
 //////////// Durand
 

code/game/mecha/mecha_wreckage.dm

@@ -125,6 +125,24 @@
 	name = "\improper Dark Gygax wreckage"
 	icon_state = "darkgygax-broken"
 
+/obj/structure/mecha_wreckage/medigax
+	name = "\improper Medical Gygax wreckage"
+	icon_state = "medigax-broken"
+
+/obj/structure/mecha_wreckage/medigax/Initialize()
+	. = ..()
+	var/list/parts = list(/obj/item/mecha_parts/part/medigax_torso,
+								/obj/item/mecha_parts/part/medigax_head,
+								/obj/item/mecha_parts/part/medigax_left_arm,
+								/obj/item/mecha_parts/part/medigax_right_arm,
+								/obj/item/mecha_parts/part/medigax_left_leg,
+								/obj/item/mecha_parts/part/medigax_right_leg)
+	for(var/i = 0; i < 2; i++)
+		if(parts.len && prob(40))
+			var/part = pick(parts)
+			welder_salvage += part
+			parts -= part
+
 /obj/structure/mecha_wreckage/marauder
 	name = "\improper Marauder wreckage"
 	icon_state = "marauder-broken"

code/game/mecha/medical/medigax.dm

@@ -0,0 +1,34 @@
+/obj/mecha/medical/medigax
+	desc = "A Gygax with it's actuator overload stripped and a slick white paint scheme, for medical use, These exosuits are developed and produced by Vey-Med. (© All rights reserved)."
+	name = "\improper Medical Gygax"
+	icon_state = "medigax"
+	step_in = 1.75 // a little faster than an odysseus
+	max_temperature = 25000
+	max_integrity = 250
+	wreckage = /obj/structure/mecha_wreckage/odysseus
+	armor = list("melee" = 25, "bullet" = 20, "laser" = 30, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+	internal_damage_threshold = 35
+	deflect_chance = 15
+	step_energy_drain = 6
+	infra_luminosity = 6
+
+
+/obj/mecha/medical/medigax/moved_inside(mob/living/carbon/human/H)
+	. = ..()
+	if(.)
+		var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
+		hud.add_hud_to(H)
+
+/obj/mecha/medical/medigax/go_out()
+	if(isliving(occupant))
+		var/mob/living/carbon/human/L = occupant
+		var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
+		hud.remove_hud_from(L)
+	..()
+
+/obj/mecha/medical/medigax/mmi_moved_inside(obj/item/mmi/mmi_as_oc, mob/user)
+	. = ..()
+	if(.)
+		var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
+		var/mob/living/brain/B = mmi_as_oc.brainmob
+		hud.add_hud_to(B)

code/game/objects/items/clown_items.dm

@@ -88,6 +88,7 @@
 			var/obj/effect/decal/cleanable/C = locate() in target
 			qdel(C)
 			target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
+			target.clean_blood()
 			SEND_SIGNAL(target, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
 			target.wash_cream()
 	return
@@ -180,4 +181,4 @@
 	name = "Canned Laughter"
 	desc = "Just looking at this makes you want to giggle."
 	icon_state = "laughter"
-	list_reagents = list(/datum/reagent/consumable/laughter = 50)
+	list_reagents = list(/datum/reagent/consumable/laughter = 50)

code/game/objects/obj_defense.dm

@@ -103,6 +103,8 @@
 	take_damage(400, BRUTE, "melee", 0, get_dir(src, B))
 
 /obj/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime
+	if(SEND_SIGNAL(src, COMSIG_OBJ_ATTACK_GENERIC, user, damage_amount, damage_type, damage_flag, sound_effect, armor_penetration) & COMPONENT_STOP_GENERIC_ATTACK)
+		return FALSE
 	user.do_attack_animation(src)
 	user.changeNext_move(CLICK_CD_MELEE)
 	return take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user), armor_penetration)

code/game/objects/structures/tables_racks.dm

@@ -134,6 +134,8 @@
 	if(!ishuman(pushed_mob))
 		return
 	var/mob/living/carbon/human/H = pushed_mob
+	if(iscatperson(H))
+		H.emote("nya")
 	SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "table", /datum/mood_event/table)
 
 /obj/structure/table/shove_act(mob/living/target, mob/living/user)

code/game/turfs/simulated/floor.dm

@@ -205,7 +205,7 @@
 			if(floor_tile)
 				if(prob(70))
 					remove_tile()
-			else if(prob(50))
+			else if(prob(50) && (/turf/open/space in baseturfs))
 				ReplaceWithLattice()
 
 /turf/open/floor/narsie_act(force, ignore_mobs, probability = 20)

code/modules/antagonists/traitor/equipment/Malf_Modules.dm

@@ -257,6 +257,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 		return
 	if (active)
 		return //prevent the AI from activating an already active doomsday
+	if (owner_AI.shunted)
+		return //prevent AI from activating doomsday while shunted.
 	active = TRUE
 	set_us_up_the_bomb(owner)
 

code/modules/awaymissions/mission_code/snowdin.dm

@@ -475,43 +475,26 @@
 
 /obj/effect/spawner/lootdrop/snowdin/dungeonlite
 	name = "dungeon lite"
-	loot = list(/obj/item/melee/classic_baton = 11,
-				/obj/item/melee/classic_baton/telescopic = 12,
-				/obj/item/book/granter/spell/smoke = 10,
+	loot = list(/obj/item/book/granter/spell/smoke = 10,
 				/obj/item/book/granter/spell/blind = 10,
 				/obj/item/storage/firstaid/regular = 45,
 				/obj/item/storage/firstaid/toxin = 35,
 				/obj/item/storage/firstaid/brute = 27,
 				/obj/item/storage/firstaid/fire = 27,
 				/obj/item/storage/toolbox/syndicate = 12,
-				/obj/item/grenade/plastic/c4 = 7,
 				/obj/item/grenade/clusterbuster/smoke = 15,
 				/obj/item/clothing/under/chameleon = 13,
-				/obj/item/clothing/shoes/chameleon/noslip = 10,
 				/obj/item/borg/upgrade/ddrill = 3)
 
 /obj/effect/spawner/lootdrop/snowdin/dungeonmid
 	name = "dungeon mid"
-	loot = list(/obj/item/defibrillator/compact = 6,
-				/obj/item/storage/firstaid/tactical = 35,
-				/obj/item/shield/energy = 6,
-				/obj/item/shield/riot/tele = 12,
-				/obj/item/dnainjector/lasereyesmut = 7,
-				/obj/item/gun/magic/wand/fireball/inert = 3,
+	loot = list(/obj/item/shield/riot = 12,
 				/obj/item/pneumatic_cannon = 15,
-				/obj/item/melee/transforming/energy/sword = 7,
-				/obj/item/book/granter/spell/knock = 15,
-				/obj/item/book/granter/spell/summonitem = 20,
-				/obj/item/book/granter/spell/forcewall = 17,
 				/obj/item/storage/backpack/holding = 12,
-				/obj/item/grenade/spawnergrenade/manhacks = 6,
-				/obj/item/grenade/spawnergrenade/spesscarp = 7,
-				/obj/item/grenade/clusterbuster/inferno = 3,
 				/obj/item/stack/sheet/mineral/diamond{amount = 15} = 10,
 				/obj/item/stack/sheet/mineral/uranium{amount = 15} = 10,
 				/obj/item/stack/sheet/mineral/plasma{amount = 15} = 10,
 				/obj/item/stack/sheet/mineral/gold{amount = 15} = 10,
-				/obj/item/book/granter/spell/barnyard = 4,
 				/obj/item/pickaxe/drill/diamonddrill = 6,
 				/obj/item/borg/upgrade/vtec = 7,
 				/obj/item/borg/upgrade/disablercooler = 7)
@@ -519,21 +502,12 @@
 
 /obj/effect/spawner/lootdrop/snowdin/dungeonheavy
 	name = "dungeon heavy"
-	loot = list(/obj/item/twohanded/singularityhammer = 25,
-				/obj/item/twohanded/mjollnir = 10,
-				/obj/item/twohanded/fireaxe = 25,
+	loot = list(/obj/item/twohanded/fireaxe = 25,
 				/obj/item/organ/brain/alien = 17,
-				/obj/item/twohanded/dualsaber = 15,
-				/obj/item/organ/heart/demon = 7,
-				/obj/item/gun/ballistic/automatic/c20r/unrestricted = 16,
-				/obj/item/gun/magic/wand/resurrection/inert = 15,
-				/obj/item/gun/magic/wand/resurrection = 10,
-				/obj/item/uplink/old = 2,
-				/obj/item/book/granter/spell/charge = 12,
-				/obj/item/grenade/clusterbuster/spawner_manhacks = 15,
-				/obj/item/book/granter/spell/fireball = 10,
+				/obj/item/organ/heart/cursed = 7,
+				/obj/item/book/granter/spell/forcewall = 17,
+				/obj/item/gun/magic/wand/fireball/inert = 3,
 				/obj/item/pickaxe/drill/jackhammer = 30,
-				/obj/item/borg/upgrade/syndicate = 13,
 				/obj/item/borg/upgrade/selfrepair = 17)
 
 /obj/effect/spawner/lootdrop/snowdin/dungeonmisc

code/modules/awaymissions/mission_code/spacebattle.dm

@@ -1,51 +0,0 @@
-//Spacebattle Areas
-
-/area/awaymission/spacebattle
-	name = "Space Battle"
-	icon_state = "awaycontent1"
-	requires_power = FALSE
-
-/area/awaymission/spacebattle/cruiser
-	name = "Nanotrasen Cruiser"
-	icon_state = "awaycontent2"
-
-/area/awaymission/spacebattle/syndicate1
-	name = "Syndicate Assault Ship 1"
-	icon_state = "awaycontent3"
-
-/area/awaymission/spacebattle/syndicate2
-	name = "Syndicate Assault Ship 2"
-	icon_state = "awaycontent4"
-
-/area/awaymission/spacebattle/syndicate3
-	name = "Syndicate Assault Ship 3"
-	icon_state = "awaycontent5"
-
-/area/awaymission/spacebattle/syndicate4
-	name = "Syndicate War Sphere 1"
-	icon_state = "awaycontent6"
-
-/area/awaymission/spacebattle/syndicate5
-	name = "Syndicate War Sphere 2"
-	icon_state = "awaycontent7"
-
-/area/awaymission/spacebattle/syndicate6
-	name = "Syndicate War Sphere 3"
-	icon_state = "awaycontent8"
-
-/area/awaymission/spacebattle/syndicate7
-	name = "Syndicate Fighter"
-	icon_state = "awaycontent9"
-
-/area/awaymission/spacebattle/secret
-	name = "Hidden Chamber"
-	icon_state = "awaycontent10"
-
-/mob/living/simple_animal/hostile/syndicate/ranged/spacebattle
-	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
-				/obj/item/gun/ballistic/automatic/c20r,
-				/obj/item/shield/energy)
-
-/mob/living/simple_animal/hostile/syndicate/melee/spacebattle
-	deathmessage = "falls limp as they release their grip from the energy weapons, activating their self-destruct function!"
-	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)

code/modules/clothing/head/misc.dm

@@ -437,3 +437,12 @@
 	item_state = "hunter"
 	armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
+
+/obj/item/clothing/head/kepi
+	name = "kepi"
+	desc = "A white cap with visor. Oui oui, mon capitane!"
+	icon_state = "kepi"
+
+/obj/item/clothing/head/kepi/old
+	icon_state = "kepi_old"
+	desc = "A flat, white circular cap with a visor, that demands some honor from it's wearer."

code/modules/events/stray_cargo.dm

@@ -85,8 +85,8 @@
 /datum/round_event_control/stray_cargo/syndicate
 	name = "Stray Syndicate Cargo Pod"
 	typepath = /datum/round_event/stray_cargo/syndicate
-	weight = 6
-	max_occurrences = 1
+	weight = 0
+	max_occurrences = 0
 	earliest_start = 30 MINUTES
 
 /datum/round_event/stray_cargo/syndicate

code/modules/flufftext/Dreaming.dm

@@ -1,7 +1,3 @@
-/mob/living/carbon/proc/handle_dreams()
-	if(prob(10) && !dreaming)
-		dream()
-
 /mob/living/carbon/proc/dream()
 	set waitfor = FALSE
 	var/list/dream_fragments = list()

code/modules/food_and_drinks/food/snacks.dm

@@ -303,12 +303,12 @@ All foods are distributed among various categories. Use common sense.
 	var/obj/item/result
 	if(cooked_type)
 		result = new cooked_type(T)
-		//if the result is food, set its food quality to the original food item's quality
-		if(isfood(result))
-			var/obj/item/reagent_containers/food/food_output = result
-			food_output.adjust_food_quality(food_quality + M.quality_increase)
 		if(istype(M))
 			initialize_cooked_food(result, M.efficiency)
+			//if the result is food, set its food quality to the original food item's quality
+			if(isfood(result))
+				var/obj/item/reagent_containers/food/food_output = result
+				food_output.adjust_food_quality(food_quality + M.quality_increase)
 		else
 			initialize_cooked_food(result, 1)
 		SSblackbox.record_feedback("tally", "food_made", 1, result.type)

code/modules/mob/living/carbon/human/species_types/jellypeople.dm

@@ -468,6 +468,7 @@
 			if(ReadHSV(temp_hsv)[3] >= ReadHSV("#7F7F7F")[3]) // mutantcolors must be bright
 				H.dna.features["mcolor"] = sanitize_hexcolor(new_color, 6)
 				H.update_body()
+				H.update_hair()
 			else
 				to_chat(H, "<span class='notice'>Invalid color. Your color is not bright enough.</span>")
 	else if(select_alteration == "Hair Style")

code/modules/mob/living/carbon/life.dm

@@ -1,8 +1,8 @@
 /mob/living/carbon/BiologicalLife(seconds, times_fired)
-	if(stat == DEAD)
-		return FALSE
 	//Reagent processing needs to come before breathing, to prevent edge cases.
 	handle_organs()
+	if(stat == DEAD)
+		return FALSE
 	if(!(. = ..()))
 		return
 	handle_blood()

code/modules/power/apc.dm

@@ -1136,6 +1136,7 @@
 		return
 	if(!is_station_level(z))
 		return
+	malf.ShutOffDoomsdayDevice()
 	occupier = new /mob/living/silicon/ai(src, malf.laws, malf) //DEAR GOD WHY?	//IKR????
 	occupier.adjustOxyLoss(malf.getOxyLoss())
 	if(!findtext(occupier.name, "APC Copy"))

code/modules/power/smes.dm

@@ -228,6 +228,11 @@
 	var/last_chrg = inputting
 	var/last_onln = outputting
 
+	//check for self-recharging cells in stock parts and use them to self-charge
+	for(var/obj/item/stock_parts/cell/C in component_parts)
+		if(C.self_recharge)
+			charge += min(capacity-charge, C.chargerate) // If capacity-charge is smaller than the attempted charge rate, this avoids overcharging
+
 	//inputting
 	if(terminal && input_attempt)
 		input_available = terminal.surplus()

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -387,7 +387,8 @@
 			return FALSE
 
 		if("analyze")
-			var/datum/reagent/R = GLOB.name2reagent[params["id"]]
+			var/reagent = GLOB.name2reagent[params["id"]]
+			var/datum/reagent/R = GLOB.chemical_reagents_list[reagent]
 			if(R)
 				var/state = "Unknown"
 				if(initial(R.reagent_state) == 1)
@@ -400,13 +401,9 @@
 				var/T = initial(R.metabolization_rate) * (60 / P)
 				if(istype(R, /datum/reagent/fermi))
 					fermianalyze = TRUE
-					var/datum/chemical_reaction/Rcr = get_chemical_reaction(R)
+					var/datum/chemical_reaction/Rcr = get_chemical_reaction(reagent)
 					var/pHpeakCache = (Rcr.OptimalpHMin + Rcr.OptimalpHMax)/2
-					var/datum/reagent/targetReagent = reagents.has_reagent(R)
-
-					if(!targetReagent)
-						CRASH("Tried to find a reagent that doesn't exist in the chem_master!")
-					analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold), "purityF" = targetReagent.purity, "inverseRatioF" = initial(R.inverse_chem_val), "purityE" = initial(Rcr.PurityMin), "minTemp" = initial(Rcr.OptimalTempMin), "maxTemp" = initial(Rcr.OptimalTempMax), "eTemp" = initial(Rcr.ExplodeTemp), "pHpeak" = pHpeakCache)
+					analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold), "purityF" = R.purity, "inverseRatioF" = initial(R.inverse_chem_val), "purityE" = initial(Rcr.PurityMin), "minTemp" = initial(Rcr.OptimalTempMin), "maxTemp" = initial(Rcr.OptimalTempMax), "eTemp" = initial(Rcr.ExplodeTemp), "pHpeak" = pHpeakCache)
 				else
 					fermianalyze = FALSE
 					analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold))

code/modules/reagents/reagent_containers/glass.dm

@@ -386,6 +386,20 @@
 /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty
 	list_reagents = list()
 
+/obj/item/reagent_containers/glass/beaker/waterbottle/wataur
+	name = "Bottled Wataur"
+	desc = "Finally, a bottle as proportionate as you."
+	icon = 'icons/obj/drinks.dmi'
+	icon_state = "wataur"
+	custom_materials = list(/datum/material/plastic=0)
+	list_reagents = list(/datum/reagent/water = 100)
+	volume = 100
+	amount_per_transfer_from_this = 20
+	possible_transfer_amounts = list(5,10,15,20,25,30,50, 100)
+	container_flags = TEMP_WEAK|APTFT_ALTCLICK|APTFT_VERB
+	container_HP = 1
+	cached_icon = "wataur"
+
 /obj/item/reagent_containers/glass/get_belt_overlay()
 	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "bottle")
 

code/modules/research/designs/mechfabricator_designs.dm

@@ -264,6 +264,79 @@
 	construction_time = 600
 	category = list("Gygax")
 
+//Medical Gygax
+/datum/design/medigax_chassis
+	name = "Exosuit Chassis (\"Medical Gygax\")"
+	id = "medigax_chassis"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/chassis/medigax
+	materials = list(/datum/material/iron=20000)
+	construction_time = 100
+	category = list("Medical-Spec Gygax")
+
+/datum/design/medigax_torso
+	name = "Exosuit Torso (\"Medical Gygax\")"
+	id = "medigax_torso"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/medigax_torso
+	materials = list(/datum/material/iron=20000,/datum/material/glass=10000,/datum/material/diamond=2000)
+	construction_time = 300
+	category = list("Medical-Spec Gygax")
+
+/datum/design/medigax_head
+	name = "Exosuit Head (\"Medical Gygax\")"
+	id = "medigax_head"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/medigax_head
+	materials = list(/datum/material/iron=10000,/datum/material/glass=5000, /datum/material/diamond=2000)
+	construction_time = 200
+	category = list("Medical-Spec Gygax")
+
+/datum/design/medigax_left_arm
+	name = "Exosuit Left Arm (\"Medical Gygax\")"
+	id = "medigax_left_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/medigax_left_arm
+	materials = list(/datum/material/iron=15000, /datum/material/diamond=1000)
+	construction_time = 200
+	category = list("Medical-Spec Gygax")
+
+/datum/design/medigax_right_arm
+	name = "Exosuit Right Arm (\"Medical Gygax\")"
+	id = "medigax_right_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/medigax_right_arm
+	materials = list(/datum/material/iron=15000, /datum/material/diamond=1000)
+	construction_time = 200
+	category = list("Medical-Spec Gygax")
+
+/datum/design/medigax_left_leg
+	name = "Exosuit Left Leg (\"Medical Gygax\")"
+	id = "medigax_left_leg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/medigax_left_leg
+	materials = list(/datum/material/iron=15000, /datum/material/diamond=2000)
+	construction_time = 200
+	category = list("Medical-Spec Gygax")
+
+/datum/design/medigax_right_leg
+	name = "Exosuit Right Leg (\"Medical Gygax\")"
+	id = "medigax_right_leg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/medigax_right_leg
+	materials = list(/datum/material/iron=15000, /datum/material/diamond=2000)
+	construction_time = 200
+	category = list("Medical-Spec Gygax")
+
+/datum/design/medigax_armor
+	name = "Exosuit Armor (\"Medical Gygax\")"
+	id = "medigax_armor"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/medigax_armor
+	materials = list(/datum/material/iron=15000,/datum/material/diamond=10000,/datum/material/titanium=10000)
+	construction_time = 600
+	category = list("Medical-Spec Gygax")
+
 //Durand
 /datum/design/durand_chassis
 	name = "Exosuit Chassis (\"Durand\")"

code/modules/research/techweb/nodes/mecha_nodes.dm

@@ -42,6 +42,14 @@
 	"gygax_peri", "gygax_targ", "gygax_armor")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 
+/datum/techweb_node/medigax
+	id = "mech_medigax"
+	display_name = "EXOSUIT: Medical-Spec Gygax"
+	description = "Medical-Spec Gygax designs"
+	prereq_ids = list("mech_gygax", "mecha_odysseus")
+	design_ids = list("medigax_chassis", "medigax_torso", "medigax_head", "medigax_left_arm", "medigax_right_arm", "medigax_left_leg", "medigax_right_leg", "medigax_armor")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
+
 /datum/techweb_node/durand
 	id = "mech_durand"
 	display_name = "EXOSUIT: Durand"

code/modules/uplink/uplink_items/uplink_bundles.dm

@@ -193,6 +193,8 @@
 			var/datum/uplink_item/I = uplink_items[category][item]
 			if(src == I || !I.item)
 				continue
+			if(istype(I, /datum/uplink_item/bundles_TC/reroll)) //oops!
+				continue
 			if(U.telecrystals < I.cost)
 				continue
 			if(I.limited_stock == 0)

code/modules/vending/cola.dm

@@ -15,7 +15,8 @@
 					/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10,
 					/obj/item/reagent_containers/glass/beaker/waterbottle = 10)
 	contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,
-					/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6)
+					/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6,
+					/obj/item/reagent_containers/glass/beaker/waterbottle/wataur = 2)
 	premium = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1,
 					/obj/item/reagent_containers/food/drinks/soda_cans/air = 1,
 					/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1,