Merge branch 'master' into syntheticbloods

code/__DEFINES/access.dm

@@ -6,7 +6,7 @@
 #define ACCESS_MORGUE 6
 #define ACCESS_TOX 7 //R&D department, R&D console, burn chamber on some maps
 #define ACCESS_TOX_STORAGE 8 //Toxins storage, burn chamber on some maps
-#define ACCESS_GENETICS 9 
+#define ACCESS_GENETICS 9
 #define ACCESS_ENGINE 10 //Engineering area, power monitor, power flow control console
 #define ACCESS_ENGINE_EQUIP 11 //APCs, EngiVend/YouTool, engineering equipment lockers
 #define ACCESS_MAINT_TUNNELS 12
@@ -64,6 +64,8 @@
 #define ACCESS_WEAPONS 66 //Weapon authorization for secbots
 #define ACCESS_NETWORK 67 //NTnet diagnostics/monitoring software
 #define ACCESS_CLONING 68 //Cloning room and clone pod ejection
+#define ACCESS_ENTER_GENPOP 69
+#define ACCESS_LEAVE_GENPOP 70
 
 	//BEGIN CENTCOM ACCESS
 	/*Should leave plenty of room if we need to add more access levels.

code/__DEFINES/clockcult.dm

@@ -8,6 +8,7 @@
 GLOBAL_VAR_INIT(clockwork_construction_value, 0) //The total value of all structures built by the clockwork cult
 GLOBAL_VAR_INIT(clockwork_vitality, 0) //How much Vitality is stored, total
 GLOBAL_VAR_INIT(clockwork_power, 0) //How many watts of power are globally available to the clockwork cult
+GLOBAL_VAR_INIT(neovgre_exists, 0) //Does neovgre exist?
 
 GLOBAL_LIST_EMPTY(all_clockwork_objects) //All clockwork items, structures, and effects in existence
 GLOBAL_LIST_EMPTY(all_clockwork_mobs) //All clockwork SERVANTS (not creatures) in existence

code/__DEFINES/reactions.dm

@@ -31,41 +31,14 @@
 #define STIMULUM_RESEARCH_AMOUNT			50
 //Plasma fusion properties
 #define FUSION_ENERGY_THRESHOLD				3e9 	//Amount of energy it takes to start a fusion reaction
-#define FUSION_TEMPERATURE_THRESHOLD		1000 	//Temperature required to start a fusion reaction
 #define FUSION_MOLE_THRESHOLD				250 	//Mole count required (tritium/plasma) to start a fusion reaction
-#define FUSION_RELEASE_ENERGY_SUPER			3e9 	//Amount of energy released in the fusion process, super tier
-#define FUSION_RELEASE_ENERGY_HIGH			1e9 	//Amount of energy released in the fusion process, high tier
-#define FUSION_RELEASE_ENERGY_MID			5e8 	//Amount of energy released in the fusion process, mid tier
-#define FUSION_RELEASE_ENERGY_LOW			1e8 	//Amount of energy released in the fusion process, low tier
-#define FUSION_MEDIATION_FACTOR				80 		//Arbitrary
-#define FUSION_SUPER_TIER_THRESHOLD			50 		//anything above this is super tier
-#define FUSION_HIGH_TIER_THRESHOLD			20 		//anything above this and below 50 is high tier
-#define FUSION_MID_TIER_THRESHOLD			5 		//anything above this and below 20 is mid tier - below this is low tier, but that doesnt need a define
-#define FUSION_ENERGY_DIVISOR_SUPER			25		//power_ratio is divided by this during energy calculations
-#define FUSION_ENERGY_DIVISOR_HIGH			20
-#define FUSION_ENERGY_DIVISOR_MID			10
-#define FUSION_ENERGY_DIVISOR_LOW			2
-#define FUSION_GAS_CREATION_FACTOR_TRITIUM	0.40 	//trit - one gas rather than two, so think about that when calculating stuff - 40% in total
-#define FUSION_GAS_CREATION_FACTOR_STIM		0.05	//stim percentage creation from high tier - 5%, 60% in total with pluox
-#define FUSION_GAS_CREATION_FACTOR_PLUOX    0.55	//pluox percentage creation from high tier - 55%, 60% in total with stim
-#define FUSION_GAS_CREATION_FACTOR_NITRYL	0.20 	//nitryl and N2O - 80% in total
-#define FUSION_GAS_CREATION_FACTOR_N2O		0.60 	//nitryl and N2O - 80% in total
-#define FUSION_GAS_CREATION_FACTOR_BZ		0.05 	//BZ - 5% - 90% in total with CO2
-#define FUSION_GAS_CREATION_FACTOR_CO2		0.85 	//CO2 - 85% - 90% in total with BZ
-#define FUSION_MID_TIER_RAD_PROB_FACTOR		2		//probability of radpulse is power ratio * this for whatever tier
-#define FUSION_LOW_TIER_RAD_PROB_FACTOR		5
-#define FUSION_EFFICIENCY_BASE				60		//used in the fusion efficiency calculations
-#define FUSION_EFFICIENCY_DIVISOR			0.6		//ditto
-#define FUSION_RADIATION_FACTOR				15000	//horizontal asymptote
-#define FUSION_RADIATION_CONSTANT			30		//equation is form of (ax) / (x + b), where a = radiation factor and b = radiation constant and x = power ratio (https://www.desmos.com/calculator/4i1f296phl)
-#define FUSION_ZAP_POWER_ASYMPTOTE			50000	//maximum value - not enough to instacrit but it'll still hurt like shit
-#define FUSION_ZAP_POWER_CONSTANT			75		//equation is of from [ax / (x + b)] + c, where a = zap power asymptote, b = zap power constant, c = zap power base and x = power ratio
-#define FUSION_ZAP_POWER_BASE				1000	//(https://www.desmos.com/calculator/vvbmhf4unm)
-#define FUSION_ZAP_RANGE_SUPER				9		//range of the tesla zaps that occur from fusion
-#define FUSION_ZAP_RANGE_HIGH				7
-#define FUSION_ZAP_RANGE_MID				5
-#define FUSION_ZAP_RANGE_LOW				3
-#define FUSION_PARTICLE_FACTOR_SUPER		4		//# of particles fired out is equal to rand(3,6) * this for whatever tier
-#define FUSION_PARTICLE_FACTOR_HIGH			3
-#define FUSION_PARTICLE_FACTOR_MID			2
-#define FUSION_PARTICLE_FACTOR_LOW			1
+#define FUSION_TRITIUM_CONVERSION_COEFFICIENT (1e-10)
+#define INSTABILITY_GAS_POWER_FACTOR 		0.003
+#define FUSION_TRITIUM_MOLES_USED  			1
+#define PLASMA_BINDING_ENERGY  				20000000
+#define TOROID_VOLUME_BREAKEVEN			1000
+#define FUSION_TEMPERATURE_THRESHOLD	    10000
+#define PARTICLE_CHANCE_CONSTANT 			(-20000000)
+#define FUSION_RAD_MAX						2000
+#define FUSION_RAD_COEFFICIENT				(-1000)
+#define FUSION_INSTABILITY_ENDOTHERMALITY   2

code/datums/weather/weather_types/radiation_storm.dm

@@ -18,7 +18,7 @@
 
 	area_type = /area
 	protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
-	/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle)
+	/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/security/prison)
 	target_trait = ZTRAIT_STATION
 
 	immunity_type = "rad"

code/game/machinery/turnstile.dm

@@ -0,0 +1,84 @@
+/obj/machinery/turnstile
+	name = "turnstile"
+	desc = "A mechanical door that permits one-way access and prevents tailgating."
+	icon = 'icons/obj/turnstile.dmi'
+	icon_state = "turnstile_map"
+	density = FALSE
+	armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 10, bio = 100, rad = 100, fire = 90, acid = 70)
+	anchored = TRUE
+	use_power = FALSE
+	idle_power_usage = 2
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	layer = OPEN_DOOR_LAYER
+
+/obj/machinery/turnstile/Initialize()
+	. = ..()
+	icon_state = "turnstile"
+
+/obj/machinery/turnstile/CanAtmosPass(turf/T)
+	return TRUE
+
+/obj/machinery/turnstile/bullet_act(obj/item/projectile/P, def_zone)
+	return -1 //Pass through!
+
+/obj/machinery/turnstile/proc/allowed_access(var/mob/B)
+	if(B.pulledby && ismob(B.pulledby))
+		return allowed(B.pulledby) | allowed(B)
+	else
+		return allowed(B)
+
+/obj/machinery/turnstile/CanPass(atom/movable/AM, turf/T)
+	if(ismob(AM))
+		var/mob/B = AM
+		if(isliving(AM))
+			var/mob/living/M = AM
+
+			if(world.time - M.last_bumped <= 5)
+				return FALSE
+			M.last_bumped = world.time
+
+			var/allowed_access = FALSE
+			var/turf/behind = get_step(src, dir)
+
+			if(B in behind.contents)
+				allowed_access = allowed_access(B)
+			else
+				to_chat(usr, "<span class='notice'>\the [src] resists your efforts.</span>")
+				return FALSE
+
+			if(allowed_access)
+				flick("operate", src)
+				playsound(src,'sound/items/ratchet.ogg',50,0,3)
+				return TRUE
+			else
+				flick("deny", src)
+				playsound(src,'sound/machines/deniedbeep.ogg',50,0,3)
+				return FALSE
+	if(ispath(AM, /obj/item/))
+		return TRUE
+	else
+		return FALSE
+
+/obj/machinery/turnstile/CheckExit(atom/movable/AM as mob|obj, target)
+	if(isliving(AM))
+		var/mob/living/M = AM
+		var/outdir = dir
+		if(allowed_access(M))
+			switch(dir)
+				if(NORTH)
+					outdir = SOUTH
+				if(SOUTH)
+					outdir = NORTH
+				if(EAST)
+					outdir = WEST
+				if(WEST)
+					outdir = EAST
+		var/turf/outturf = get_step(src, outdir)
+		var/canexit = (target == src.loc) | (target == outturf)
+
+		if(!canexit && world.time - M.last_bumped <= 5)
+			to_chat(usr, "<span class='notice'>\the [src] resists your efforts.</span>")
+		M.last_bumped = world.time
+		return canexit
+	else
+		return TRUE

code/game/mecha/combat/neovgre.dm

@@ -0,0 +1,96 @@
+/obj/mecha/combat/neovgre
+	name = "Neovgre, the Anima Bulwark"
+	desc = "Nezbere's most powerful creation, a mighty war machine of unmatched power said to have ended wars in a single night."
+	icon = 'icons/mecha/neovgre.dmi'
+	icon_state = "neovgre"
+	max_integrity = 500 //This is THE ratvarian superweaon, its deployment is an investment
+	armor = list("melee" = 50, "bullet" = 40, "laser" = 25, "energy" = 25, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) //Its similar to the clockwork armour albeit with a few buffs becuase RATVARIAN SUPERWEAPON!!
+	force = 50 //SMASHY SMASHY!!
+	internal_damage_threshold = 0
+	step_in = 3
+	pixel_x = -16
+	layer = ABOVE_MOB_LAYER
+	breach_time = 100 //ten seconds till all goes to shit
+	recharge_rate = 100
+	wreckage = /obj/structure/mecha_wreckage/durand/neovgre
+
+/obj/mecha/combat/neovgre/GrantActions(mob/living/user, human_occupant = 0) //No Eject action for you sonny jim, your life for Ratvar!
+	internals_action.Grant(user, src)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	strafing_action.Grant(user, src)
+
+/obj/mecha/combat/neovgre/RemoveActions(mob/living/user, human_occupant = 0)
+	internals_action.Remove(user)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	strafing_action.Remove(user)
+
+/obj/mecha/combat/neovgre/MouseDrop_T(mob/M, mob/user)
+	if(!is_servant_of_ratvar(user))
+		to_chat(user, "<span class='brass'>BEGONE HERETIC!</span>")
+		return
+	else
+		..()
+
+/obj/mecha/combat/neovgre/moved_inside(mob/living/carbon/human/H)
+	var/list/Itemlist = H.get_contents()
+	for(var/obj/item/clockwork/slab/W in Itemlist)
+		to_chat(H, "<span class='brass'>You safely store [W] inside [src].</span>")
+		qdel(W)
+	. = ..()
+
+/obj/mecha/combat/neovgre/obj_destruction()
+	for(var/mob/M in src)
+		to_chat(M, "<span class='brass'>You are consumed by the fires raging within Neovgre...</span>")
+		M.dust()
+	playsound(src, 'sound/magic/lightning_chargeup.ogg', 100, 0)
+	src.visible_message("<span class = 'userdanger'>The reactor has gone critical, its going to blow!</span>")
+	addtimer(CALLBACK(src,.proc/go_critical),breach_time)
+
+/obj/mecha/combat/neovgre/proc/go_critical()
+	explosion(get_turf(loc), 3, 5, 10, 20, 30)
+	Destroy(src)
+
+/obj/mecha/combat/neovgre/container_resist(mob/living/user)
+	to_chat(user, "<span class='brass'>Neovgre requires a lifetime commitment friend, no backing out now!</span>")
+	return
+
+/obj/mecha/combat/neovgre/process()
+	..()
+	if(GLOB.ratvar_awakens) // At this point only timley intervention by lord singulo could hople to stop the superweapon
+		cell.charge = INFINITY
+		max_integrity = INFINITY
+		obj_integrity = max_integrity
+		CHECK_TICK //Just to be on the safe side lag wise
+	else if(cell.charge < cell.maxcharge)
+		for(var/obj/effect/clockwork/sigil/transmission/T in range(SIGIL_ACCESS_RANGE, src))
+			var/delta = min(recharge_rate, cell.maxcharge - cell.charge)
+			if (get_clockwork_power() <= delta)
+				cell.charge += delta
+				adjust_clockwork_power(-delta)
+			CHECK_TICK
+
+/obj/mecha/combat/neovgre/Initialize()
+	.=..()
+	GLOB.neovgre_exists ++
+	var/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy/neovgre/N = new
+	N.attach(src)
+
+/obj/structure/mecha_wreckage/durand/neovgre
+	name = "\improper Neovgre wreckage?"
+	desc = "On closer inspection this looks like the wreck of a durand with some spraypainted cardboard duct taped to it!"
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy/neovgre
+	equip_cooldown = 8 //Rapid fire heavy laser cannon, simple yet elegant
+	energy_drain = 30
+	name = "Aribter Laser Cannon"
+	desc = "Please re-attach this to neovgre and stop asking questions about why it looks like a normal Nanotrasen issue Solaris laser cannon - Nezbere"
+	fire_sound = "sound/weapons/neovgre_laser.ogg"
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy/neovgre/can_attach(obj/mecha/combat/neovgre/M)
+	if(istype(M))
+		return 1
+	return 0

code/game/mecha/mecha.dm

@@ -49,6 +49,8 @@
 	var/lights = FALSE
 	var/lights_power = 6
 	var/last_user_hud = 1 // used to show/hide the mecha hud while preserving previous preference
+	var/breach_time = 0
+	var/recharge_rate = 0
 
 	var/bumpsmash = 0 //Whether or not the mech destroys walls by running into it.
 	//inner atmos

code/game/objects/items/cards_ids.dm

@@ -342,12 +342,41 @@ update_label("John Doe", "Clowny")
 	lefthand_file = 'icons/mob/inhands/equipment/idcards_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi'
 	assignment = "Prisoner"
-	registered_name = "Scum"
+	access = list(ACCESS_ENTER_GENPOP)
+
+	//Lavaland labor camp
 	var/goal = 0 //How far from freedom?
 	var/points = 0
+	//Genpop
+	var/sentence = 0	//When world.time is greater than this number, the card will have its ACCESS_ENTER_GENPOP access replaced with ACCESS_LEAVE_GENPOP the next time it's checked, unless this value is 0/null
+	var/crime= "\[REDACTED\]"
 
-/obj/item/card/id/prisoner/attack_self(mob/user)
-	to_chat(usr, "<span class='notice'>You have accumulated [points] out of the [goal] points you need for freedom.</span>")
+/obj/item/card/id/prisoner/GetAccess()
+	if((sentence && world.time >= sentence) || (goal && points >= goal))
+		access = list(ACCESS_LEAVE_GENPOP)
+	return ..()
+
+/obj/item/card/id/prisoner/process()
+	if(!sentence)
+		STOP_PROCESSING(SSobj, src)
+		return
+	if(world.time >= sentence)
+		playsound(loc, 'sound/machines/ping.ogg', 50, 1)
+		if(isliving(loc))
+			to_chat(loc, "<span class='boldnotice'>[src]</span><span class='notice'> buzzes: You have served your sentence! You may now exit prison through the turnstiles and collect your belongings.</span>")
+		STOP_PROCESSING(SSobj, src)
+	return
+
+/obj/item/card/id/prisoner/examine(mob/user)
+	. = ..()
+	if(sentence && world.time < sentence)
+		to_chat(user, "<span class='notice'>You're currently serving a sentence for [crime]. <b>[DisplayTimeText(sentence - world.time)]</b> left.</span>")
+	else if(goal)
+		to_chat(user, "<span class='notice'>You have accumulated [points] out of the [goal] points you need for freedom.</span>")
+	else if(!sentence)
+		to_chat(user, "<span class='warning'>You are currently serving a permanent sentence for [crime].</span>")
+	else
+		to_chat(user, "<span class='notice'>Your sentence is up! You're free!</span>")
 
 /obj/item/card/id/prisoner/one
 	name = "Prisoner #13-001"

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

@@ -0,0 +1,117 @@
+/obj/structure/closet/secure_closet/genpop
+	desc = "It's a secure locker for inmates's personal belongings."
+	var/default_desc = "It's a secure locker for the storage inmates's personal belongings during their time in prison."
+	name = "prisoner closet"
+	var/default_name = "prisoner closet"
+	req_access = list(ACCESS_BRIG)
+	var/obj/item/card/id/prisoner/registered_id = null
+	icon_state = "prisoner"
+	locked = FALSE
+	anchored = TRUE
+	opened = TRUE
+	density = FALSE
+
+/obj/structure/closet/secure_closet/genpop/attackby(obj/item/W, mob/user, params)
+	if(!broken && locked && W == registered_id) //Prisoner opening
+		handle_prisoner_id(user)
+		return
+
+	return ..()
+
+/obj/structure/closet/secure_closet/genpop/proc/handle_prisoner_id(mob/user)
+	var/obj/item/card/id/prisoner/prisoner_id = null
+	for(prisoner_id in user.held_items)
+		if(prisoner_id != registered_id)
+			prisoner_id = null
+		else
+			break
+
+	if(!prisoner_id)
+		to_chat(user, "<span class='danger'>Access Denied.</span>")
+		return FALSE
+
+	qdel(registered_id)
+	registered_id = null
+	locked = FALSE
+	open(user)
+	desc = "It's a secure locker for prisoner effects."
+	to_chat(user, "<span class='notice'>You insert your prisoner id into \the [src] and it springs open!</span>")
+
+	return TRUE
+
+/obj/structure/closet/secure_closet/genpop/proc/handle_edit_sentence(mob/user)
+	var/prisoner_name = input(user, "Please input the name of the prisoner.", "Prisoner Name", registered_id.registered_name) as text|null
+	if(prisoner_name == null | !user.Adjacent(src))
+		return FALSE
+	var/sentence_length = input(user, "Please input the length of their sentence in minutes (0 for perma).", "Sentence Length", registered_id.sentence) as num|null
+	if(sentence_length == null | !user.Adjacent(src))
+		return FALSE
+	var/crimes = input(user, "Please input their crimes.", "Crimes", registered_id.crime) as text|null
+	if(crimes == null | !user.Adjacent(src))
+		return FALSE
+
+	registered_id.registered_name = prisoner_name
+	var/filteredsentlength = text2num(sentence_length)
+	registered_id.sentence = filteredsentlength ? (filteredsentlength MINUTES) + world.time : 0
+	registered_id.crime = crimes
+	registered_id.update_label(prisoner_name, registered_id.assignment)
+	if(registered_id.sentence)
+		START_PROCESSING(SSobj, registered_id)
+	else
+		STOP_PROCESSING(SSobj, registered_id)
+
+	name = "[default_name] ([prisoner_name])"
+	desc = "[default_desc] It contains the personal effects of [prisoner_name]."
+
+	return TRUE
+
+/obj/structure/closet/secure_closet/genpop/togglelock(mob/living/user)
+	if(!allowed(user))
+		return ..()
+
+	if(!broken && locked && registered_id != null)
+		var/name = registered_id.registered_name
+		var/result = alert(user, "This locker currently contains [name]'s personal belongings ","Locker In Use","Reset","Amend ID", "Open")
+		if(!user.Adjacent(src))
+			return
+		if(result == "Reset")
+			name = default_name
+			desc = default_desc
+			registered_id = null
+		if(result == "Open" | result == "Reset")
+			locked = FALSE
+			open(user)
+		if(result == "Amend ID")
+			handle_edit_sentence(user)
+	else
+		return ..()
+
+/obj/structure/closet/secure_closet/genpop/close(mob/living/user)
+	if(registered_id != null)
+		locked = TRUE
+	return ..()
+
+/obj/structure/closet/secure_closet/genpop/attack_hand(mob/user)
+	if(user.lying && get_dist(src, user) > 0)
+		return
+
+	if(!broken && registered_id != null && registered_id in user.held_items)
+		handle_prisoner_id(user)
+		return
+
+	if(!broken && opened && !locked && allowed(user) && !registered_id) //Genpop setup
+
+		registered_id = new /obj/item/card/id/prisoner/(src.contents)
+		if(handle_edit_sentence(user))
+			close(user)
+			locked = TRUE
+			update_icon()
+			registered_id.forceMove(src.loc)
+			new /obj/item/clothing/under/rank/prisoner(src.loc)
+		else
+			qdel(registered_id)
+			registered_id = null
+
+		return
+
+	..()

code/modules/antagonists/clockcult/clock_scriptures/scripture_applications.dm

@@ -119,3 +119,33 @@
 	var/datum/clockwork_scripture/create_object/construct/clockwork_marauder/CM = new()
 	CM.recent_marauders--
 	qdel(CM)
+
+//Summon Neovgre: Summon a very powerful combat mech that explodes when destroyed for massive damage.
+/datum/clockwork_scripture/create_object/summon_arbiter
+	descname = "Powerful Assault Mech"
+	name = "Summon Neovgre, the Anima Bulwark"
+	desc = "Calls forth the mighty Anima Bulwark, a weapon of unmatched power,\
+			 mech with superior defensive and offensive capabilities. It will \
+			 steadily regenerate HP and triple its regeneration speed while standing \
+			 on a clockwork tile. It will automatically draw power from nearby sigils of \
+			 transmission should the need arise. Its Arbiter laser cannon can decimate foes \
+			 from a range and is capable of smashing through any barrier presented to it. \
+			 Be warned, choosing to pilot Neovgre is a lifetime commitment, once you are \
+			 in you cannot leave and when it is destroyed it will explode catastrophically with you inside."
+	invocations = list("By the strength of the alloy...!!", "...call forth the Arbiter!!")
+	channel_time = 200 // This is a strong fucking weapon, 20 seconds channel time is getting off light I tell ya.
+	power_cost = 75000 //75 KW
+	usage_tip = "Neovgre is a powerful mech that will crush your enemies!"
+	invokers_required = 5
+	multiple_invokers_used = TRUE
+	object_path = /obj/mecha/combat/neovgre
+	tier = SCRIPTURE_APPLICATION
+	primary_component = BELLIGERENT_EYE
+	sort_priority = 2
+	creator_message = "<span class='brass'>Neovgre, the Anima Bulwark towers over you... your enemies reckoning has come.</span>"
+
+/datum/clockwork_scripture/create_object/summon_arbiter/check_special_requirements()
+	if(GLOB.neovgre_exists)
+		to_chat(invoker, "<span class='brass'>\"You've already got one...\"</span>")
+		return FALSE
+	return ..()

code/modules/atmospherics/gasmixtures/reactions.dm

@@ -210,9 +210,9 @@
 
 	return cached_results["fire"] ? REACTING : NO_REACTION
 
-//fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again (and again, and again)
+//fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again (and again, and again). Again!
 //Fusion Rework Counter: Please increment this if you make a major overhaul to this system again.
-//5 reworks
+//6 reworks
 
 /datum/gas_reaction/fusion
 	exclude = FALSE
@@ -220,100 +220,79 @@
 	name = "Plasmic Fusion"
 	id = "fusion"
 
-//Since fusion isn't really intended to happen in successive chains, the requirements are very high
 /datum/gas_reaction/fusion/init_reqs()
 	min_requirements = list(
 		"TEMP" = FUSION_TEMPERATURE_THRESHOLD,
-		"ENER" = FUSION_ENERGY_THRESHOLD,
+		/datum/gas/tritium = FUSION_TRITIUM_MOLES_USED,
 		/datum/gas/plasma = FUSION_MOLE_THRESHOLD,
-		/datum/gas/tritium = FUSION_MOLE_THRESHOLD
-	)
+		/datum/gas/carbon_dioxide = FUSION_MOLE_THRESHOLD)
 
 /datum/gas_reaction/fusion/react(datum/gas_mixture/air, datum/holder)
 	var/list/cached_gases = air.gases
-	var/temperature = air.temperature
-	if(!air.analyzer_results)
-		air.analyzer_results = new
-	var/list/cached_scan_results = air.analyzer_results
 	var/turf/open/location
 	if (istype(holder,/datum/pipeline)) //Find the tile the reaction is occuring on, or a random part of the network if it's a pipenet.
 		var/datum/pipeline/fusion_pipenet = holder
 		location = get_turf(pick(fusion_pipenet.members))
 	else
 		location = get_turf(holder)
-
+	if(!air.analyzer_results)
+		air.analyzer_results = new
+	var/list/cached_scan_results = air.analyzer_results
 	var/old_heat_capacity = air.heat_capacity()
-	var/reaction_energy = 0
-
-	var/mediation = FUSION_MEDIATION_FACTOR*(air.heat_capacity()-(cached_gases[/datum/gas/plasma]*GLOB.meta_gas_specific_heats[/datum/gas/plasma]))/(air.total_moles()-cached_gases[/datum/gas/plasma]) //This is the average specific heat of the mixture,not including plasma.
-
-	var/gases_fused = air.total_moles() - cached_gases[/datum/gas/plasma]
-	var/plasma_differential = (cached_gases[/datum/gas/plasma] - gases_fused) / air.total_moles()
-	var/reaction_efficiency = FUSION_EFFICIENCY_BASE ** -((plasma_differential ** 2) / FUSION_EFFICIENCY_DIVISOR) //https://www.desmos.com/calculator/6jjx3vdrvx
-
+	var/reaction_energy = 0 //Reaction energy can be negative or positive, for both exothermic and endothermic reactions.
+	var/initial_plasma = cached_gases[/datum/gas/plasma]
+	var/initial_carbon = cached_gases[/datum/gas/carbon_dioxide]
+	var/scale_factor = (air.volume)/(PI) //We scale it down by volume/Pi because for fusion conditions, moles roughly = 2*volume, but we want it to be based off something constant between reactions.
+	var/toroidal_size = (2*PI)+TORADIANS(arctan((air.volume-TOROID_VOLUME_BREAKEVEN)/TOROID_VOLUME_BREAKEVEN)) //The size of the phase space hypertorus
 	var/gas_power = 0
+	var/list/gas_fusion_powers = GLOB.meta_gas_fusions
 	for (var/gas_id in cached_gases)
-		gas_power += reaction_efficiency * (GLOB.meta_gas_fusions[gas_id]*cached_gases[gas_id])
+		gas_power += (gas_fusion_powers[gas_id]*cached_gases[gas_id])
+	var/instability = MODULUS((gas_power*INSTABILITY_GAS_POWER_FACTOR)**2,toroidal_size) //Instability effects how chaotic the behavior of the reaction is
+	cached_scan_results[id] = instability//used for analyzer feedback
 
-	var/power_ratio = gas_power/mediation
-	cached_scan_results[id] = power_ratio //used for analyzer feedback
+	var/plasma = (initial_plasma-FUSION_MOLE_THRESHOLD)/(scale_factor) //We have to scale the amounts of carbon and plasma down a significant amount in order to show the chaotic dynamics we want
+	var/carbon = (initial_carbon-FUSION_MOLE_THRESHOLD)/(scale_factor) //We also subtract out the threshold amount to make it harder for fusion to burn itself out.
 
-	for (var/gas_id in cached_gases) //and now we fuse
-		cached_gases[gas_id] = 0
+	//The reaction is a specific form of the Kicked Rotator system, which displays chaotic behavior and can be used to model particle interactions.
+	plasma = MODULUS(plasma - (instability*sin(TODEGREES(carbon))), toroidal_size)
+	carbon = MODULUS(carbon - plasma, toroidal_size)
 
-	var/radiation_power = (FUSION_RADIATION_FACTOR * power_ratio) / (power_ratio + FUSION_RADIATION_CONSTANT) //https://www.desmos.com/calculator/4i1f296phl
-	var/zap_power = ((FUSION_ZAP_POWER_ASYMPTOTE * power_ratio) / (power_ratio + FUSION_ZAP_POWER_CONSTANT)) + FUSION_ZAP_POWER_BASE //https://www.desmos.com/calculator/n0zkdpxnrr
-	var/do_explosion = FALSE
-	var/zap_range //these ones are set later
-	var/fusion_prepare_to_die_edition_rng
 
-	if (power_ratio > FUSION_SUPER_TIER_THRESHOLD) //power ratio 50+: SUPER TIER. The gases become so energized that they fuse into a ton of tritium, which is pretty nice! Until you consider the fact that everything just exploded, the canister is probably going to break and you're irradiated.
-		reaction_energy += gases_fused * FUSION_RELEASE_ENERGY_SUPER * (power_ratio / FUSION_ENERGY_DIVISOR_SUPER)
-		cached_gases[/datum/gas/tritium] += gases_fused * FUSION_GAS_CREATION_FACTOR_TRITIUM //60% of the gas is converted to energy, 40% to trit
-		fusion_prepare_to_die_edition_rng = 100 //Wait a minute..
-		do_explosion = TRUE
-		zap_range = FUSION_ZAP_RANGE_SUPER
+	cached_gases[/datum/gas/plasma] = plasma*scale_factor + FUSION_MOLE_THRESHOLD //Scales the gases back up
+	cached_gases[/datum/gas/carbon_dioxide] = carbon*scale_factor + FUSION_MOLE_THRESHOLD
+	var/delta_plasma = initial_plasma - cached_gases[/datum/gas/plasma]
 
-	else if (power_ratio > FUSION_HIGH_TIER_THRESHOLD) //power ratio 20-50; High tier. The reaction is so energized that it fuses into a small amount of stimulum, and some pluoxium. Very dangerous, but super cool and super useful.
-		reaction_energy += gases_fused * FUSION_RELEASE_ENERGY_HIGH * (power_ratio / FUSION_ENERGY_DIVISOR_HIGH)
-		cached_gases[/datum/gas/stimulum] += gases_fused * FUSION_GAS_CREATION_FACTOR_STIM //40% of the gas is converted to energy, 60% to stim and pluox
-		cached_gases[/datum/gas/pluoxium] += gases_fused * FUSION_GAS_CREATION_FACTOR_PLUOX
-		fusion_prepare_to_die_edition_rng = power_ratio //Now we're getting into dangerous territory
-		do_explosion = TRUE
-		zap_range = FUSION_ZAP_RANGE_HIGH
-
-	else if (power_ratio > FUSION_MID_TIER_THRESHOLD) //power_ratio 5 to 20; Mediation is overpowered, fusion reaction starts to break down.
-		reaction_energy += gases_fused * FUSION_RELEASE_ENERGY_MID * (power_ratio / FUSION_ENERGY_DIVISOR_MID)
-		cached_gases[/datum/gas/nitryl] += gases_fused * FUSION_GAS_CREATION_FACTOR_NITRYL //20% of the gas is converted to energy, 80% to nitryl and N2O
-		cached_gases[/datum/gas/nitrous_oxide] += gases_fused * FUSION_GAS_CREATION_FACTOR_N2O
-		fusion_prepare_to_die_edition_rng = power_ratio * FUSION_MID_TIER_RAD_PROB_FACTOR //Still unlikely, but don't stand next to the reaction unprotected
-		zap_range = FUSION_ZAP_RANGE_MID
-
-	else //power ratio 0 to 5; Gas power is overpowered. Fusion isn't nearly as powerful.
-		reaction_energy += gases_fused * FUSION_RELEASE_ENERGY_LOW * (power_ratio / FUSION_ENERGY_DIVISOR_LOW)
-		cached_gases[/datum/gas/bz] += gases_fused * FUSION_GAS_CREATION_FACTOR_BZ //10% of the gas is converted to energy, 90% to BZ and CO2
-		cached_gases[/datum/gas/carbon_dioxide] += gases_fused * FUSION_GAS_CREATION_FACTOR_CO2
-		fusion_prepare_to_die_edition_rng = power_ratio * FUSION_LOW_TIER_RAD_PROB_FACTOR //Low, but still something to look out for
-		zap_range = FUSION_ZAP_RANGE_LOW
-
-	//All the deadly consequences of fusion, consolidated for your viewing pleasure
-	if (location)
-		if(prob(fusion_prepare_to_die_edition_rng)) //Some.. permanent effects
-			if(do_explosion)
-				explosion(location, 0, 0, 5, power_ratio, TRUE, TRUE) //large shockwave, the actual radius is quite small - people will recognize that you're doing fusion
-			radiation_pulse(location, radiation_power) //You mean causing a super-tier fusion reaction in the halls is a bad idea?
-			SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, 30000)//The science is cool though.
-			playsound(location, 'sound/effects/supermatter.ogg', 100, 0)
-		else
-			playsound(location, 'sound/effects/phasein.ogg', 75, 0)
-		//These will always happen, so be prepared
-		tesla_zap(location, zap_range, zap_power, TESLA_FUSION_FLAGS) //larpers beware
-		location.fire_nuclear_particles(power_ratio) //see code/modules/projectile/energy/nuclear_particle.dm
+	reaction_energy += delta_plasma*PLASMA_BINDING_ENERGY //Energy is gained or lost corresponding to the creation or destruction of mass.
+	if(instability < FUSION_INSTABILITY_ENDOTHERMALITY)
+		reaction_energy = max(reaction_energy,0) //Stable reactions don't end up endothermic.
+	else if (reaction_energy < 0)
+		reaction_energy *= (instability-FUSION_INSTABILITY_ENDOTHERMALITY)**0.5
 
+	if(air.thermal_energy() + reaction_energy < 0) //No using energy that doesn't exist.
+		cached_gases[/datum/gas/plasma] = initial_plasma
+		cached_gases[/datum/gas/carbon_dioxide] = initial_carbon
+		return NO_REACTION
+	cached_gases[/datum/gas/tritium] -= FUSION_TRITIUM_MOLES_USED
+	//The decay of the tritium and the reaction's energy produces waste gases, different ones depending on whether the reaction is endo or exothermic
 	if(reaction_energy > 0)
+		cached_gases[/datum/gas/oxygen] += FUSION_TRITIUM_MOLES_USED*(reaction_energy*FUSION_TRITIUM_CONVERSION_COEFFICIENT)
+		cached_gases[/datum/gas/nitrous_oxide] += FUSION_TRITIUM_MOLES_USED*(reaction_energy*FUSION_TRITIUM_CONVERSION_COEFFICIENT)
+	else
+		cached_gases[/datum/gas/bz] += FUSION_TRITIUM_MOLES_USED*(reaction_energy*-FUSION_TRITIUM_CONVERSION_COEFFICIENT)
+		cached_gases[/datum/gas/nitryl] += FUSION_TRITIUM_MOLES_USED*(reaction_energy*-FUSION_TRITIUM_CONVERSION_COEFFICIENT)
+
+	if(reaction_energy)
+		if(location)
+			var/particle_chance = ((PARTICLE_CHANCE_CONSTANT)/(reaction_energy-PARTICLE_CHANCE_CONSTANT)) + 1//Asymptopically approaches 100% as the energy of the reaction goes up.
+			if(prob(PERCENT(particle_chance)))
+				location.fire_nuclear_particle()
+			var/rad_power = max((FUSION_RAD_COEFFICIENT/instability) + FUSION_RAD_MAX,0)
+			radiation_pulse(location,rad_power)
+
 		var/new_heat_capacity = air.heat_capacity()
 		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
-			air.temperature = max(((temperature*old_heat_capacity + reaction_energy)/new_heat_capacity),TCMB)
+			air.temperature = CLAMP(((air.temperature*old_heat_capacity + reaction_energy)/new_heat_capacity),TCMB,INFINITY)
 		return REACTING
 
 /datum/gas_reaction/nitrylformation //The formation of nitryl. Endothermic. Requires N2O as a catalyst.

code/modules/clothing/suits/_suits.dm

@@ -1,74 +1,74 @@
-/obj/item/clothing/suit
-	icon = 'icons/obj/clothing/suits.dmi'
-	name = "suit"
-	var/fire_resist = T0C+100
-	allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-	slot_flags = ITEM_SLOT_OCLOTHING
-	body_parts_covered = CHEST
-	var/blood_overlay_type = "suit"
-	var/togglename = null
-	var/suittoggled = FALSE
-
-	var/adjusted = NORMAL_STYLE
-	mutantrace_variation = MUTANTRACE_VARIATION
-	var/tauric = FALSE		//Citadel Add for tauric hardsuits
-	var/taurmode = NOT_TAURIC
-	var/dimension_x = 32
-	var/dimension_y = 32
-	var/center = FALSE	//Should we center the sprite?
-
-/obj/item/clothing/suit/equipped(mob/user, slot)
-	..()
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-
-		if(mutantrace_variation)
-			if(DIGITIGRADE in H.dna.species.species_traits)
-				adjusted = ALT_STYLE
-				H.update_inv_wear_suit()
-			else if(adjusted == ALT_STYLE)
-				adjusted = NORMAL_STYLE
-
-		if(("taur" in H.dna.species.mutant_bodyparts) && (H.dna.features["taur"] != "None"))
-			if(H.dna.features["taur"] in GLOB.noodle_taurs)
-				taurmode = SNEK_TAURIC
-				if(tauric == TRUE)
-					center = TRUE
-					dimension_x = 64
-			else if(H.dna.features["taur"] in GLOB.paw_taurs)
-				taurmode = PAW_TAURIC
-				if(tauric == TRUE)
-					center = TRUE
-					dimension_x = 64
-		else
-			taurmode = NOT_TAURIC
-			if(tauric == TRUE)
-				center = FALSE
-				dimension_x = 32
-		H.update_inv_wear_suit()
-
-
-/obj/item/clothing/suit/worn_overlays(isinhands = FALSE)
-	. = list()
-	if(!isinhands)
-		if(damaged_clothes)
-			. += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]")
-		if(blood_DNA)
-			if(taurmode >= SNEK_TAURIC)
-				. += mutable_appearance('modular_citadel/icons/mob/64x32_effects.dmi', "[blood_overlay_type]blood", color = blood_DNA_to_color())
-			else
-				. += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood", color = blood_DNA_to_color())
-		var/mob/living/carbon/human/M = loc
-		if(ishuman(M) && M.w_uniform)
-			var/obj/item/clothing/under/U = M.w_uniform
-			if(istype(U) && U.attached_accessory)
-				var/obj/item/clothing/accessory/A = U.attached_accessory
-				if(A.above_suit)
-					. += U.accessory_overlay
-
-/obj/item/clothing/suit/update_clothes_damaged_state(damaging = TRUE)
-	..()
-	if(ismob(loc))
-		var/mob/M = loc
-		M.update_inv_wear_suit()
+/obj/item/clothing/suit
+	icon = 'icons/obj/clothing/suits.dmi'
+	name = "suit"
+	var/fire_resist = T0C+100
+	allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	slot_flags = ITEM_SLOT_OCLOTHING
+	body_parts_covered = CHEST
+	var/blood_overlay_type = "suit"
+	var/togglename = null
+	var/suittoggled = FALSE
+
+	var/adjusted = NORMAL_STYLE
+	mutantrace_variation = MUTANTRACE_VARIATION
+	var/tauric = FALSE		//Citadel Add for tauric hardsuits
+	var/taurmode = NOT_TAURIC
+	var/dimension_x = 32
+	var/dimension_y = 32
+	var/center = FALSE	//Should we center the sprite?
+
+/obj/item/clothing/suit/equipped(mob/user, slot)
+	..()
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+
+		if(mutantrace_variation)
+			if(DIGITIGRADE in H.dna.species.species_traits)
+				adjusted = ALT_STYLE
+				H.update_inv_wear_suit()
+			else if(adjusted == ALT_STYLE)
+				adjusted = NORMAL_STYLE
+
+		if(("taur" in H.dna.species.mutant_bodyparts) && (H.dna.features["taur"] != "None"))
+			if(H.dna.features["taur"] in GLOB.noodle_taurs)
+				taurmode = SNEK_TAURIC
+				if(tauric == TRUE)
+					center = TRUE
+					dimension_x = 64
+			else if(H.dna.features["taur"] in GLOB.paw_taurs)
+				taurmode = PAW_TAURIC
+				if(tauric == TRUE)
+					center = TRUE
+					dimension_x = 64
+		else
+			taurmode = NOT_TAURIC
+			if(tauric == TRUE)
+				center = FALSE
+				dimension_x = 32
+		H.update_inv_wear_suit()
+
+
+/obj/item/clothing/suit/worn_overlays(isinhands = FALSE)
+	. = list()
+	if(!isinhands)
+		if(damaged_clothes)
+			. += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]")
+		if(blood_DNA)
+			if(tauric)
+				. += mutable_appearance('modular_citadel/icons/mob/64x32_effects.dmi', "[blood_overlay_type]blood", color = blood_DNA_to_color())
+			else
+				. += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood", color = blood_DNA_to_color())
+		var/mob/living/carbon/human/M = loc
+		if(ishuman(M) && M.w_uniform)
+			var/obj/item/clothing/under/U = M.w_uniform
+			if(istype(U) && U.attached_accessory)
+				var/obj/item/clothing/accessory/A = U.attached_accessory
+				if(A.above_suit)
+					. += U.accessory_overlay
+
+/obj/item/clothing/suit/update_clothes_damaged_state(damaging = TRUE)
+	..()
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_wear_suit()

code/modules/crafting/recipes.dm

@@ -133,18 +133,6 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
 
-/datum/crafting_recipe/minigun
-	name = "Laser Minigun"
-	result = /obj/item/minigunpack2
-	reqs = list(/obj/item/gun/energy/laser/carbine = 3,
-				/obj/item/stack/sheet/plasteel = 5,
-				/obj/item/stack/cable_coil = 30,
-				/obj/item/stock_parts/cell/bluespace = 2)
-	tools = list(TOOL_WIRECUTTER, TOOL_SCREWDRIVER, TOOL_WELDER)
-	time = 150
-	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
-
 /datum/crafting_recipe/ed209
 	name = "ED209"
 	result = /mob/living/simple_animal/bot/ed209

code/modules/jobs/access.dm

@@ -121,7 +121,7 @@
 			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_BAR)
 
 /proc/get_all_accesses()
-	return list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT,
+	return list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP,
 	            ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_RD,
 	            ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS,
 	            ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD,
@@ -157,7 +157,7 @@
 		if(1) //station general
 			return list(ACCESS_KITCHEN,ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_LAWYER)
 		if(2) //security
-			return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_HOS)
+			return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_HOS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP,)
 		if(3) //medbay
 			return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CMO)
 		if(4) //research
@@ -312,6 +312,10 @@
 			return "Gateway"
 		if(ACCESS_SEC_DOORS)
 			return "Brig"
+		if(ACCESS_ENTER_GENPOP)
+			return "Prison Turnstile Entrance"
+		if(ACCESS_LEAVE_GENPOP)
+			return "Prison Turnstile Exit"
 		if(ACCESS_MINERAL_STOREROOM)
 			return "Mineral Storage"
 		if(ACCESS_MINISAT)

code/modules/jobs/job_types/head_of_security.dm

@@ -19,11 +19,11 @@
 	outfit = /datum/outfit/job/hos
 	mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)
 
-	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS,
+	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP,
 			            ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS,
 			            ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
 			            ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
-	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS,
+	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP,
 			            ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS,
 			            ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
 			            ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)

code/modules/jobs/job_types/security_officer.dm

@@ -15,8 +15,8 @@
 
 	outfit = /datum/outfit/job/security
 
-	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_FORENSICS_LOCKERS, ACCESS_MINERAL_STOREROOM)
-	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) // See /datum/job/officer/get_access()
+	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_FORENSICS_LOCKERS, ACCESS_MINERAL_STOREROOM)
+	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_MINERAL_STOREROOM) // See /datum/job/officer/get_access()
 
 	mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)
 

code/modules/jobs/job_types/warden.dm

@@ -15,8 +15,8 @@
 
 	outfit = /datum/outfit/job/warden
 
-	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_FORENSICS_LOCKERS, ACCESS_MINERAL_STOREROOM)
-	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) // See /datum/job/warden/get_access()
+	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_FORENSICS_LOCKERS, ACCESS_MINERAL_STOREROOM)
+	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_MINERAL_STOREROOM) // See /datum/job/warden/get_access()
 
 	mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)
 

code/modules/mining/equipment/explorer_gear.dm

@@ -11,6 +11,7 @@
 	heat_protection = CHEST|GROIN|LEGS|ARMS
 	hoodtype = /obj/item/clothing/head/hooded/explorer
 	armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)
+	flags_inv = HIDEJUMPSUIT|HIDETAUR
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
 	resistance_flags = FIRE_PROOF
 	tauric = TRUE		//Citadel Add for tauric hardsuits

code/modules/power/supermatter/supermatter.dm

@@ -421,7 +421,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 		if(prob(50))
 			radiation_pulse(src, power * (1 + (tritiumcomp * TRITIUM_RADIOACTIVITY_MODIFIER) + ((pluoxiumcomp * PLUOXIUM_RADIOACTIVITY_MODIFIER) * pluoxiumbonus) * (power_transmission_bonus/(10-(bzcomp * BZ_RADIOACTIVITY_MODIFIER)))))	// Rad Modifiers BZ(500%), Tritium(300%), and Pluoxium(-200%)
 		if(bzcomp >= 0.4 && prob(30 * bzcomp))
-			src.fire_nuclear_particles()		// Start to emit radballs at a maximum of 30% chance per tick
+			fire_nuclear_particle()		// Start to emit radballs at a maximum of 30% chance per tick
 
 		var/device_energy = power * REACTION_POWER_MODIFIER
 

code/modules/projectiles/ammunition/energy/laser.dm

@@ -71,9 +71,3 @@
 	projectile_type = /obj/item/projectile/beam/mindflayer
 	select_name = "MINDFUCK"
 	fire_sound = 'sound/weapons/laser.ogg'
-
-/obj/item/ammo_casing/energy/laser/weak
-	projectile_type = /obj/item/projectile/beam/weak/minigun
-	e_cost = 10
-	fire_sound = 'sound/weapons/gatling.ogg'
-	click_cooldown_override = 1

code/modules/projectiles/guns/energy/minigun.dm

@@ -1,149 +0,0 @@
-//The ammo/gun is stored in a back slot item
-/obj/item/minigunpack2
-	name = " Laser Gatling Pack"
-	desc = "A massive battery pack with an attached laser gatling gun!"
-	icon = 'icons/obj/guns/minigun.dmi'
-	icon_state = "holstered"
-	item_state = "backpack"
-	lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
-	slot_flags = ITEM_SLOT_BACK
-	w_class = WEIGHT_CLASS_HUGE
-	var/obj/item/gun/energy/minigun/gun
-	var/armed = 0 //whether the gun is attached, 0 is attached, 1 is the gun is wielded.
-	var/overheat = 0
-	var/overheat_max = 60
-	var/heat_diffusion = 5
-
-/obj/item/minigunpack2/Initialize()
-	. = ..()
-	gun = new(src)
-	START_PROCESSING(SSobj, src)
-
-/obj/item/minigunpack2/Destroy()
-	STOP_PROCESSING(SSobj, src)
-	return ..()
-
-/obj/item/minigunpack2/process()
-	overheat = max(0, overheat - heat_diffusion)
-
-//ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/item/minigunpack2/attack_hand(var/mob/living/carbon/user)
-	if(src.loc == user)
-		if(!armed)
-			if(user.get_item_by_slot(SLOT_BACK) == src)
-				armed = 1
-				if(!user.put_in_hands(gun))
-					armed = 0
-					to_chat(user, "<span class='warning'>You need a free hand to hold the gun!</span>")
-					return
-				update_icon()
-				user.update_inv_back()
-		else
-			to_chat(user, "<span class='warning'>You are already holding the gun!</span>")
-	else
-		..()
-
-/obj/item/minigunpack2/attackby(obj/item/W, mob/user, params)
-	if(W == gun) //Don't need armed check, because if you have the gun assume its armed.
-		user.dropItemToGround(gun, TRUE)
-	else
-		..()
-
-/obj/item/minigunpack2/dropped(mob/user)
-	if(armed)
-		user.dropItemToGround(gun, TRUE)
-
-/obj/item/minigunpack2/MouseDrop(atom/over_object)
-	. = ..()
-	if(armed)
-		return
-	if(iscarbon(usr))
-		var/mob/M = usr
-
-		if(!over_object)
-			return
-
-		if(!M.incapacitated())
-
-			if(istype(over_object, /obj/screen/inventory/hand))
-				var/obj/screen/inventory/hand/H = over_object
-				M.putItemFromInventoryInHandIfPossible(src, H.held_index)
-
-
-/obj/item/minigunpack2/update_icon()
-	if(armed)
-		icon_state = "notholstered"
-	else
-		icon_state = "holstered"
-
-/obj/item/minigunpack2/proc/attach_gun(var/mob/user)
-	if(!gun)
-		gun = new(src)
-	gun.forceMove(src)
-	armed = 0
-	if(user)
-		to_chat(user, "<span class='notice'>You attach the [gun.name] to the [name].</span>")
-	else
-		src.visible_message("<span class='warning'>The [gun.name] snaps back onto the [name]!</span>")
-	update_icon()
-	user.update_inv_back()
-
-
-/obj/item/gun/energy/minigun
-	name = "laser gatling gun"
-	desc = "An advanced laser cannon with an incredible rate of fire. Requires a bulky backpack power source to use."
-	icon = 'icons/obj/guns/minigun.dmi'
-	icon_state = "minigun_spin"
-	item_state = "minigun"
-	flags_1 = CONDUCT_1
-	force = 15
-	recoil = 2
-	slowdown = 1
-	slot_flags = null
-	w_class = WEIGHT_CLASS_HUGE
-	materials = list()
-	ammo_type = list(/obj/item/ammo_casing/energy/laser/weak)
-	burst_size = 2
-	automatic = 1
-	can_charge = 0
-	selfcharge = EGUN_SELFCHARGE
-	charge_tick = 2
-	charge_delay = 5
-	weapon_weight = WEAPON_HEAVY
-	item_flags = NEEDS_PERMIT | SLOWS_WHILE_IN_HAND
-	var/obj/item/minigunpack2/ammo_pack
-
-/obj/item/gun/energy/minigun/Initialize()
-	if(istype(loc, /obj/item/minigunpack2)) //We should spawn inside an ammo pack so let's use that one.
-		ammo_pack = loc
-	else
-		return INITIALIZE_HINT_QDEL //No pack, no gun
-
-	return ..()
-
-/obj/item/gun/energy/minigun/attack_self(mob/living/user)
-	return
-
-/obj/item/gun/energy/minigun/dropped(mob/user)
-	if(ammo_pack)
-		ammo_pack.attach_gun(user)
-	else
-		qdel(src)
-
-/obj/item/gun/energy/minigun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
-	if(ammo_pack)
-		if(ammo_pack.overheat < ammo_pack.overheat_max)
-			ammo_pack.overheat += burst_size
-			..()
-		else
-			to_chat(user, "The gun's heat sensor locked the trigger to prevent lens damage.")
-
-/obj/item/gun/energy/minigun/afterattack(atom/target, mob/living/user, flag, params)
-	if(!ammo_pack || ammo_pack.loc != user)
-		to_chat(user, "You need the backpack power source to fire the gun!")
-	. = ..()
-
-/obj/item/gun/energy/minigun/dropped(mob/living/user)
-	ammo_pack.attach_gun(user)
-

code/modules/projectiles/projectile/beams.dm

@@ -39,14 +39,6 @@
 /obj/item/projectile/beam/weak
 	damage = 15
 
-/obj/item/projectile/beam/weak/minigun
-	damage = 12.5
-	armour_penetration = 40
-
-/obj/item/projectile/beam/weak/minigun/Initialize()
-	.=..()
-	speed = pick(0.7,0.75,0.8,0.85,0.9,0.95,1,1.05,1.1,1.15)
-
 /obj/item/projectile/beam/weak/penetrator
 	armour_penetration = 50
 

code/modules/projectiles/projectile/energy/nuclear_particle.dm

@@ -3,10 +3,9 @@
 	name = "nuclear particle"
 	icon_state = "nuclear_particle"
 	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
-	damage = 20
-	damage_type = TOX
-	irradiate = 2500 //enough to knockdown and induce vomiting
-	speed = 0.4 
+	flag = "rad"
+	irradiate = 5000
+	speed = 0.4
 	hitsound = 'sound/weapons/emitter2.ogg'
 	impact_type = /obj/effect/projectile/impact/xray
 	var/static/list/particle_colors = list(
@@ -25,22 +24,6 @@
 	add_atom_colour(particle_colors[our_color], FIXED_COLOUR_PRIORITY)
 	set_light(4, 3, particle_colors[our_color]) //Range of 4, brightness of 3 - Same range as a flashlight
 
-/atom/proc/fire_nuclear_particles(power_ratio) //used by fusion to fire random # of nuclear particles - power ratio determines about how many are fired
-	var/random_particles = rand(3,6)
-	var/particles_to_fire
-	var/particles_fired
-	switch(power_ratio) //multiply random_particles * factor for whatever tier
-		if(0 to FUSION_MID_TIER_THRESHOLD)
-			particles_to_fire = random_particles * FUSION_PARTICLE_FACTOR_LOW
-		if(FUSION_MID_TIER_THRESHOLD to FUSION_HIGH_TIER_THRESHOLD)
-			particles_to_fire = random_particles * FUSION_PARTICLE_FACTOR_MID
-		if(FUSION_HIGH_TIER_THRESHOLD to FUSION_SUPER_TIER_THRESHOLD)
-			particles_to_fire = random_particles * FUSION_PARTICLE_FACTOR_HIGH
-		if(FUSION_SUPER_TIER_THRESHOLD to INFINITY)
-			particles_to_fire = random_particles * FUSION_PARTICLE_FACTOR_SUPER
-	while(particles_to_fire)
-		particles_fired++
-		var/angle = rand(0,360)
-		var/obj/item/projectile/energy/nuclear_particle/P = new /obj/item/projectile/energy/nuclear_particle(src)
-		addtimer(CALLBACK(P, /obj/item/projectile.proc/fire, angle), particles_fired) //multiply particles fired * delay so the particles end up stagnated (once every decisecond)
-		particles_to_fire--
+/atom/proc/fire_nuclear_particle(angle = rand(0,360)) //used by fusion to fire random nuclear particles. Fires one particle in a random direction.
+	var/obj/item/projectile/energy/nuclear_particle/P = new /obj/item/projectile/energy/nuclear_particle(src)
+	P.fire(angle)

html/changelogs/AutoChangeLog-pr-9214.yml

@@ -0,0 +1,7 @@
+author: "original by GuyonBroadway, SkowronX, and Arizon5. port by sishen1542 and kerse"
+delete-after: True
+changes: 
+  - rscadd: "Clockwork cultists may now summon forth Neovgre, the ratvrarian super weapon. This powerful mech can be summoned when applications scripture has been unlocked, boasts superior offensive and defensive capabilities, however once a pilot enters he cannot leave and is doomed to die with the mech."
+  - imageadd: "Sexy Sprite work courtesy or SkowronX from /tg/"
+  - imageadd: "brass edits by Arizon5"
+  - soundadd: "steamy laser by kerse"

html/changelogs/AutoChangeLog-pr-9246.yml

@@ -0,0 +1,8 @@
+author: "Linzolle"
+delete-after: True
+changes: 
+  - bugfix: "blood on your body floating a bit to your right if you're a taur"
+  - bugfix: "some suits having no icon on tauric characters"
+  - tweak: "front facing CMO hardsuit icon for naga taurs"
+  - tweak: "colour of medical cross on CMO hardsuit for taurs"
+  - bugfix: "taur body and jumpsuit showing through mining suits"

html/changelogs/AutoChangeLog-pr-9540.yml

@@ -0,0 +1,4 @@
+author: "YakumoChen"
+delete-after: True
+changes: 
+  - rscdel: "Reverted laser miniguns."

tgstation.dme

@@ -621,6 +621,7 @@
 #include "code\game\machinery\syndicatebomb.dm"
 #include "code\game\machinery\teleporter.dm"
 #include "code\game\machinery\transformer.dm"
+#include "code\game\machinery\turnstile.dm"
 #include "code\game\machinery\washing_machine.dm"
 #include "code\game\machinery\wishgranter.dm"
 #include "code\game\machinery\camera\camera.dm"
@@ -712,6 +713,7 @@
 #include "code\game\mecha\combat\gygax.dm"
 #include "code\game\mecha\combat\honker.dm"
 #include "code\game\mecha\combat\marauder.dm"
+#include "code\game\mecha\combat\neovgre.dm"
 #include "code\game\mecha\combat\phazon.dm"
 #include "code\game\mecha\combat\reticence.dm"
 #include "code\game\mecha\equipment\mecha_equipment.dm"
@@ -1037,6 +1039,7 @@
 #include "code\game\objects\structures\crates_lockers\closets\bodybag.dm"
 #include "code\game\objects\structures\crates_lockers\closets\cardboardbox.dm"
 #include "code\game\objects\structures\crates_lockers\closets\fitness.dm"
+#include "code\game\objects\structures\crates_lockers\closets\genpop.dm"
 #include "code\game\objects\structures\crates_lockers\closets\gimmick.dm"
 #include "code\game\objects\structures\crates_lockers\closets\job_closets.dm"
 #include "code\game\objects\structures\crates_lockers\closets\l3closet.dm"
@@ -2486,7 +2489,6 @@
 #include "code\modules\projectiles\guns\energy\kinetic_accelerator.dm"
 #include "code\modules\projectiles\guns\energy\laser.dm"
 #include "code\modules\projectiles\guns\energy\megabuster.dm"
-#include "code\modules\projectiles\guns\energy\minigun.dm"
 #include "code\modules\projectiles\guns\energy\mounted.dm"
 #include "code\modules\projectiles\guns\energy\plasma_cit.dm"
 #include "code\modules\projectiles\guns\energy\pulse.dm"