From 693c6ea85498c61403f5c768f0fd04d4b14df334 Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Wed, 20 Sep 2023 00:12:36 +0000
Subject: [PATCH 01/19] Automatic changelog compile [ci skip]

---
 html/changelog.html | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index c3feb36b2f3..3bd9e0a90a9 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -258,12 +258,6 @@ <h3 class="author">SerynEngi updated:</h3>
 				<li class="bugfix">Connected nucleum Z-level adapter to FTL gas network on the Aetherwhisp</li>
 				<li class="bugfix">Connected the stormdrive output to the nucleum gas network on the Aetherwhisp</li>
 			</ul>
-
-			<h2 class="date">19 July 2023</h2>
-			<h3 class="author">DeltaFire15 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">Showers can now also affect the last 18 contamination on targets.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

From c871d8fb6d31f8a75bd83c0d4908b6d79c15776b Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Thu, 21 Sep 2023 00:12:25 +0000
Subject: [PATCH 02/19] Automatic changelog compile [ci skip]

---
 html/changelog.html | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index 3bd9e0a90a9..c2778e74fe0 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -250,14 +250,6 @@ <h3 class="author">BlueHNT updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added wt550m9 rubber mag sprite</li>
 			</ul>
-
-			<h2 class="date">20 July 2023</h2>
-			<h3 class="author">SerynEngi updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Added power connection to remaining Aetherwhisp FTL plyons</li>
-				<li class="bugfix">Connected nucleum Z-level adapter to FTL gas network on the Aetherwhisp</li>
-				<li class="bugfix">Connected the stormdrive output to the nucleum gas network on the Aetherwhisp</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

From dc2d54cea84b8b4a66b8679918e7d6bde9b50ab6 Mon Sep 17 00:00:00 2001
From: BlueHNT <79374236+BlueHNT@users.noreply.github.com>
Date: Thu, 21 Sep 2023 23:54:12 +0200
Subject: [PATCH 03/19] Ju Jitsu Update [REDO] (#2454)

Co-authored-by: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
---
 code/datums/martial/_martial.dm               |   1 +
 .../code/modules/jobs/security/martial_art.dm | 100 +++++++++++++++---
 nsv13/sound/weapons/chokehold.ogg             | Bin 0 -> 9954 bytes
 3 files changed, 89 insertions(+), 12 deletions(-)
 create mode 100644 nsv13/sound/weapons/chokehold.ogg

diff --git a/code/datums/martial/_martial.dm b/code/datums/martial/_martial.dm
index 475936d11cb..31c5cd1472c 100644
--- a/code/datums/martial/_martial.dm
+++ b/code/datums/martial/_martial.dm
@@ -9,6 +9,7 @@
 	var/reroute_deflection = FALSE //Delete the bullet, or actually deflect it in some direction?
 	var/block_chance = 0 //Chance to block melee attacks using items while on throw mode.
 	var/restraining = 0 //used in cqc's disarm_act to check if the disarmed is being restrained and so whether they should be put in a chokehold or not
+	var/armlockstate = 0 //used in jujitsu grab after hand armlock move
 	var/help_verb
 	var/no_guns = FALSE
 	var/allow_temp_override = TRUE //if this martial art can be overridden by temporary martial arts
diff --git a/nsv13/code/modules/jobs/security/martial_art.dm b/nsv13/code/modules/jobs/security/martial_art.dm
index af918d05cd2..76f88c0170d 100644
--- a/nsv13/code/modules/jobs/security/martial_art.dm
+++ b/nsv13/code/modules/jobs/security/martial_art.dm
@@ -1,7 +1,7 @@
 #define MARTIALART_JUJITSU "ju jitsu"
-
-#define TAKEDOWN_COMBO "DD"
-#define JUDO_THROW "DHHG"
+#define TAKEDOWN_COMBO "DG"
+#define JUDO_THROW "HHG"
+#define ARMLOCKING "DHGG"
 
 /obj/item/book/granter/martial/jujitsu
 	martial = /datum/martial_art/jujitsu
@@ -37,8 +37,11 @@
 	set desc = "Remember your police academy martial arts training."
 	set category = "Jujitsu"
 	to_chat(usr, "<span class='notice'>Combos:</span>")
-	to_chat(usr, "<span class='warning'><b>Disarm, disarm</b> will perform a takedown on the target, if they have been slowed / weakened first</span>")
-	to_chat(usr, "<span class='warning'><b>Disarm, harm, harm, grab</b> will execute a judo throw on the target,landing you on top of them in a pinning position. Provided that you have a grab on them on the final step...</span>")
+	to_chat(usr, "<span class='warning'><b>Disarm, Grab</b> will perform a takedown on the target, if they have been slowed / weakened first</span>")
+	to_chat(usr, "<span class='warning'><b>Harm, Harm, Grab</b> will execute a judo throw on the target,landing you on top of them in a pinning position. Provided that you have a grab on them on the final step...</span>")
+	to_chat(usr, "<span class='warning'><b>Disarm, Harm, Grab, Grab</b> will execute an armlock on the target, throwing you both to the ground. You however have more maneuverability than the perp from this position.</span>")
+
+	to_chat(usr, "<b><i>In addition, you also have a small window of opportunity to forcefully grab the perp during armlock.</i></b>")
 
 /datum/martial_art/jujitsu/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	if(findtext(streak,TAKEDOWN_COMBO))
@@ -49,6 +52,10 @@
 		streak = ""
 		judo_throw(A,D)
 		return TRUE
+	if(findtext(streak,ARMLOCKING))
+		streak = ""
+		armlocking(A, D)
+		return TRUE
 	return FALSE
 
 /datum/martial_art/jujitsu/proc/takedown(mob/living/carbon/human/A, mob/living/carbon/human/D)
@@ -61,12 +68,15 @@
 	A.do_attack_animation(D, ATTACK_EFFECT_KICK)
 	D.visible_message("<span class='userdanger'>[A] trips [D] up and pins them to the ground!</span>", "<span class='userdanger'>[A] is pinning you to the ground!</span>")
 	playsound(get_turf(D), 'nsv13/sound/effects/judo_throw.ogg', 100, TRUE)
-	D.Paralyze(7 SECONDS) //Equivalent to a clown PDA
+	D.Paralyze(2 SECONDS)
+	D.Knockdown(7 SECONDS)
 	A.shake_animation(10)
-	D.shake_animation(10)
+	D.shake_animation(20)
+	D.adjustOxyLoss(10) // you smashed him into the ground
 	A.forceMove(get_turf(D))
-	A.start_pulling(D, supress_message = FALSE)
-	A.setGrabState(GRAB_AGGRESSIVE)
+	if(A.mobility_flags & MOBILITY_STAND) //Fixes permanent slowdown
+		A.start_pulling(D, supress_message = FALSE)
+		A.setGrabState(GRAB_AGGRESSIVE)
 	last_move = world.time
 
 /datum/martial_art/jujitsu/proc/judo_throw(mob/living/carbon/human/A, mob/living/carbon/human/D)
@@ -81,25 +91,78 @@
 			target = get_turf(A)
 		D.forceMove(target)
 		A.setDir(newdir)
-		A.start_pulling(D, supress_message = FALSE)
-		A.setGrabState(GRAB_AGGRESSIVE)
+		D.dropItemToGround(D.get_active_held_item()) // yeet
+		if(A.mobility_flags & MOBILITY_STAND) //Fixes permanent slowdown
+			A.start_pulling(D, supress_message = FALSE)
+			A.setGrabState(GRAB_AGGRESSIVE)
+		D.adjustOxyLoss(40) // YOU THREW HIM, THREW HIM!!
 		D.Paralyze(7 SECONDS) //Equivalent to a clown PDA
 		D.visible_message("<span class='userdanger'>[A] throws [D] over their shoulder and pins them down!</span>", "<span class='userdanger'>[A] throws you over their shoulder and pins you to the ground!</span>")
 		playsound(get_turf(D), 'nsv13/sound/effects/judo_throw.ogg', 100, TRUE)
 		last_move = world.time
 
+// Armlock state removal after 5s
+/datum/martial_art/jujitsu/proc/drop_armlocking()
+	armlockstate = FALSE
+
+// Armlock
+/datum/martial_art/jujitsu/proc/armlocking(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	if(!can_use(A))
+		return FALSE
+	if(world.time < last_move+cooldown)
+		to_chat(A, "<span class='sciradio'>You're too fatigued to perform this move right now...</span>")
+		return FALSE
+	if(!D.stat)
+		D.visible_message("<span class='warning'>[A] locks [D] into a armlock position!</span>", \
+							"<span class='userdanger'>[A] locks you into a armlock position!</span>")
+		A.Knockdown(20) // knockdown officer with the perp
+		A.adjustStaminaLoss(15)
+		D.adjustStaminaLoss(30)
+		D.Paralyze(70)
+		D.shake_animation(50)
+		A.start_pulling(D, supress_message = FALSE)
+		armlockstate = TRUE
+		addtimer(CALLBACK(src, PROC_REF(drop_armlocking)), 50, TIMER_UNIQUE) // you get 3 seconds after standing up to grab the perp
+		A.do_attack_animation(D, ATTACK_EFFECT_DISARM)
+		playsound(get_turf(D), 'nsv13/sound/effects/judo_throw.ogg', 100, TRUE)
+		last_move = world.time
+	return TRUE
+
 /datum/martial_art/jujitsu/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	if(!can_use(A))
 		return FALSE
 	if(A==D)
 		return FALSE //prevents grabbing yourself
-	if(A.a_intent == INTENT_GRAB)
+	if(A.a_intent == INTENT_GRAB && A.mobility_flags & MOBILITY_STAND) //Fixes permanent slowdown and missfire
+		if(armlockstate == TRUE) // neck grabs if armlocked
+			A.setGrabState(GRAB_NECK)
+			D.visible_message("<span class='warning'>[A] grabs [D] from the armlock position by the neck!</span>", \
+							"<span class='userdanger'>[A] grabs you from the armlock position by the neck!</span>")
+			armlockstate = FALSE
 		add_to_streak("G",D)
 		if(check_streak(A,D)) //doing combos is prioritized over upgrading grabs
 			return TRUE
 	return FALSE
 
 /datum/martial_art/jujitsu/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
+	var/def_check = D.getarmor(BODY_ZONE_CHEST, "melee")
+	var/bonus_damage = 0
+	if((armlockstate == TRUE)) // disable chosen arm temporarily when armlocked
+		if(A.zone_selected == BODY_ZONE_L_ARM)
+			D.apply_damage(100, STAMINA, BODY_ZONE_L_ARM, def_check)
+			D.visible_message("<span class ='danger'>[A] has cracked [D]'s arm!</span>", "<span class ='danger'>[A] cracks your arm, causing a coursing pain!</span>")
+			armlockstate = FALSE
+		if(A.zone_selected == BODY_ZONE_R_ARM)
+			D.apply_damage(100, STAMINA, BODY_ZONE_R_ARM, def_check)
+			D.visible_message("<span class ='danger'>[A] has cracked [D]'s arm!</span>", "<span class ='danger'>[A] cracks your arm, causing a coursing pain!</span>")
+			armlockstate = FALSE
+		return FALSE
+	if((A.grab_state >= GRAB_AGGRESSIVE))
+		bonus_damage += 5
+	D.apply_damage(rand(2,3) + bonus_damage, A.dna.species.attack_type, affecting, def_check) // bonus damage when grabbing at least aggressively if required to kill
+	if((D.mobility_flags & MOBILITY_STAND))
+		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) // makes punch be default if he's standing
 	if(!can_use(A))
 		return FALSE
 	add_to_streak("H",D)
@@ -108,6 +171,19 @@
 	return FALSE
 
 /datum/martial_art/jujitsu/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	var/bonus_stam = 0
+	if((A.grab_state >= GRAB_AGGRESSIVE)) // If you shove during agressive grab it deals bonus stam
+		bonus_stam = 20
+		if(!(D.mobility_flags & MOBILITY_STAND)) // If you shove while perp is on ground and aggressive grabbing, it deals even more stam
+			bonus_stam += 10
+	D.adjustStaminaLoss(10 + bonus_stam) // deals minor stam damage with scaling dependant on grab and perp standing
+	A.do_attack_animation(D, ATTACK_EFFECT_DISARM)
+	if(A.pulling == D && A.grab_state >= GRAB_NECK) // LV3 hold minimum
+		D.visible_message("<span class='danger'>[A] puts [D] into a chokehold!</span>", \
+							"<span class='userdanger'>[A] puts you into a chokehold!</span>")
+		playsound(get_turf(D), 'nsv13/sound/weapons/chokehold.ogg', 50, 1, 1)
+		D.SetSleeping(200)
+		return FALSE
 	if(!can_use(A))
 		return FALSE
 	add_to_streak("D",D)
diff --git a/nsv13/sound/weapons/chokehold.ogg b/nsv13/sound/weapons/chokehold.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..43e0db0741f5c20d1f69ef94ef964a6a882becd8
GIT binary patch
literal 9954
zcmeHsX;hQR)@}t534;a*3K%p%7=nNS!zkE*VG4vHB*-8t0U8ns%48$m+7Xb3Fp7X}
z1P&ks2n2y<P|#KpaaKZP5E=*QmO*jo#u@e23!c;G+&|x4>)c;=-CC8ZdUx$z!&6ne
z_OAFwM+X2I@HO;zdnX}9YnPqHsP(A*dlOjfM1&wiX+kmpcpa#v{0zz$k^EOcB$1kH
zp_ezPeKGs;pJAo!a#Jdh!#jNcw^p|1HrD1AB$5Io5aBN(Au2qHy*F-G5}O<4Xi2i%
zY)0B_W?{#$u(h`&+gp;%NlPI_88XL)$3-WHM@Km($3=R<@0jqo$k?caU2)-1)-%8t
zPm79VhvUCx$424zCG3q%j);oHvku_h_wJ2`B+s}AbNn`>LrC5mXOAas-eh673F*{)
z4Qy_IR9xiVgk9`N$52w(zak#iM8!qyjf_fggj0xsQ?S@fM&^KzWwVy2hk-oYa1In^
zCBQK`a`%xfS0glb9Hi}!N=SrLbR=m*Qp8^FJ~(4mY}7Juq9Z$TFBcI&typf%z-3z?
z3OE5kNYpfOt4&;!fzfvH)0)D$+}ZO?%f(wY4QJ^cdeb1WP`9SiB`ehU@IWCGAOb%*
zr(iSq&I-C2297~R=|+yQlw}8LY=nk!`Dfy47XxdZ6?8JDNVdx9f7rgmWw_b}VIXY=
zpRwBIj3B+q4l)z0Jp9t-?PhQpy{5+ev_8_AH5qbN#<^*~ldj!MS8~Y`q<dPu)6R%?
zPFb_u2f^8+FkRmHnr4QZGaP}u-5G4gP3L;;3==zr4H<ZHqy{Jipt9PSUu~?2(QZ=&
z*8spc`D3rf<E|gYU2nxHDX0Xm000Hx4yp9u*LdXr?omVtE;3k(PqIa(H`|t?<&wAu
z0Dk_;uJPEFOLCC_C{)_=YlHZ;G5qPQe1(k6CK<p3Kn`|8-WK5CUQD^mV2*Th$Nw#c
zmPTnUi9-xAgY0h`<g-Y!TJlTl0EfX-<&*k&{{)$*NnKTq7TY~6o2m?6C7`z2>6CeN
z94I=;KWjH#mU!p-lQN4tuvA?ZtSo?h(`9{?!HUZzqt*ih0uzK5e`j`gnQA{Q8Hx`S
z3i3K&X@!`bFYs!GC6BWQ=qJ4pS|ZZaQZjdC7FVW@eAb^oTY7Tf3M~2d&ps%_{EKCY
zZwX{LUnfjvUifcBg~90<yqhXZ+j7?V?F<R6onGcLCz*+<DYjQID2b<2jg|qI0Zt0K
zN3e8{e<rLf-Av7d8^pTGG^$BMeRZzoP19d)EhYBPntoZeMcJYcvu&fej~>9a8V=g?
z+-_Qs-X0jTN8CZD5^Ia;ic9$6A@(lvT9JkRNXx7&VqIB+qDlQSoOonu0Py`2CsEb;
zJHEo*RW<NegV9WCX(bJCWhO_BlqLsv9Sj{k6884s1dQ*J!-Gnrg8w5fPaP^XJlyQd
z6Cw6%Cf>4}Arxc&IZe2rU?0|fX}@{45xfQow+Bsq|04UUJNjc?rDUc=Bh251>u((;
zwF(Qc4r2y#x0iB5JCnzcM~%Nd`0(Fi*vh3TssUhMq)#l;BNk2B<`X=fVy>A0Cwb&V
z@+Xb+r)-M|o<#=iqUZyq^(O?gCn`)tODq6`upogiOyM`A@at3ZXR?Z7PL$R+2sYjj
zKI?9N`aeabr43F1Ac^3fKyarMT<Nf|gf34RK^J$~g5a89dUKGxJV%MTBLsAN(z4R{
zx&QzuUvI(Ql;CJ;219f+W`Nlc-E}B{`9B4kluT2Hz@kAR3KU`j%*^@)=o|uTkkeQh
zp-g{P+v;Hw-O+W!;)rI)PVJwH{W0G+5F+@_x6En=h=$@}hRYFb&Cd}g8uV3kxOhhZ
zMu2*>59ico3gZ$o02Go{1{_wmkP&@~1OiRg)K`{#S9baHze=43$xeSc!1%Ql*wIS|
z)t402uivJ3Wyum*2Y;wN{_F6+_tgUXqNoly{99kJBL~U<jd}gogZ=*v{J)L>G+8i@
z;BU7sR=Z6PWT}IF9%=-1k=$)rkJ1&ibm1j3swm1?TFEBS{>Fj;E1acxKJbJU1LQ2d
zzpIL1MI{^K%Bz7DG1~t+Ly+SxS(lG-{n_y1W?GgWMOBFYTk79SP%~@pgBLidO8H-7
zvgJpi0B_2+6xsy&Q$f&73o13>1F$<-U<?)ge;59<Lp6{k1NIri4zISFK7u_GuD5~G
z6$1`DAqvh0G8-eKYjF->#q*%zmjV6&$X{tSrK!6X)vyIde1fOc!57OGOdqIV_x|O8
zOuITpfN}LF(|#7RMJ6N~Qv=#7j}X|?g?*FYNM@59aFGExJ}X%8<UoZHU)Ug6ZpBqX
zrUfuPi-ZR%ps~aj2t{qCw7(pXD~iEn9{EZZiRNHOzF5f397=wSv;cb)&2=wzDrL}^
z$zgcDkS!32M9oSRUo31hY$W;cbapjcBx>w7$Iy`GlEZ@Kkr9fX-mr9H!j{6em!c4n
zr`>JJe#{YAUm69FFVmY4^;J0N801zS%QeYqkz^>XcB<0dD8n-b;G(7w8*qbUs9S^4
z?k8kmT?`Fs2k9bw4V_NZ$Y4-S3{Dl(IYcIgPHZSvbTKg~p#v~_SQh?{_{ChK0{m*g
zBe@}$wvS#7HsX$*kt&^UF<o|yYVib`L7qe{c$-hx6fc=PbSgr#Bi1h2J;ih?w3K|P
zM1zbw&PKJxgU~)w2Y|7J_Ni-6<n*1F;HIO1a()B?H$<wGu(Vpn0->Sj@&bsi{}ay=
zxQqz&B9jpfXcy3!%&<1oB`oK<NeFBZmSxbo&0|9m)S|RH#c)L+W;;fbqwbd;HtlJC
zHr58fOSzSxQf6JCyDd>$$&?&vfZUf(n(2kmB#*+lDC%Yu(-q*U__yt^20Y-F&utw>
z460$LXqdnf@7B`i-w7S5{rmI(sAL9>vn31d-;x#J1Jf3~`)0JozSmO{v>UD{iU+s*
zMa^2xL}eFZEkgmWKoTP)r`09PVwzBMFC_L#;vHvW-I8IJX+`2H7b5XWV1z$0gHETK
zbq3{7t4<Zssp6raT#JU9;gB40KP%Uh*nTf0$6}3sEUlqql+)O%8L`L2tX(rA_lm-<
z$XGMs7)PaFK|j>gY$#+8sb6y<G^e&xkYlm+-5A}}Vt5At-=)g}N?P9LCPKMJzWiG4
zHZ=fo!(-qkfqMq-iW+*Z9o!YGTokGpkhWCPEzU)D&yxQ`r$X9NsgOSRwS=J(%Ml60
zMIzRwFV$kG#<exruO3rFO)*lUyTIAPg<9e>sDTzPLQ|-Mi$^6Mfnv4AaLUA5H7eR5
zLyb-()?%p&y08+`7*upsh8o<Q2==f6DiN+O&K4TSn$AXA%r)Vs&}-K(Yn4c7^Hdkp
ziDs^8dbOH0nqF=iiGCsc`UGYA?FRZC{1ZZHmPJPKF^1(6tc$YC94^_LC~sDx>C&%R
zGn(L4mADFOMQ6a{6#^hDw_-E6_y{~s#3aecxvv8}JmuRg%4L^*DSl{-Y5>ZKmF8j&
z7(qK~!ge?vN14w|Hp}YD=_)vzuBzn8;mY=1R^OY_tKu_2G)cz8b^%ZUFW~@p0994V
zt?<a0*nLSUKkzcLaton?gh31Z0Btk_Cklm}sHvsB4yUtz17258p8(bP@_PfG2jt|I
zEh<EV%gHT0D98biC3%26C?NDTZ67`dqEIG(KHBWyK(ceNw{@_)VX?_(6Uo8Rw%5*K
zi<R9LTT3&02YV|k+bs?@mKGLv_TSiV+GJyA4QogwD?2;8EsnPE0l{R;)^F_1Y)BTH
zEFA1Ews!)>t)+`Ens#*qYf|arbnvfa6x3+Y(L<TaFAriVT?C*7tS@b<Wp84?-$i=<
z&Do3EGRKs>h6mf%b}erD`RzAapS087RY*=Wc)F8wNXHn=3=D9_csP5f$;BT9KUK|>
zwExj^<A#K!o#%FWkbK)7&E$4P-;E1p=3HU<GkL+>z27&8L~Sa7S7ZEQZAfosxaQb?
z+;}IgPvva0k_~iqpE^@-R^tctta5L5&JVn~mEhI<RMG0q90~fbD?Ey-J#yr7J*^K!
zw><2LLuYbNH*&`TSorw*sr1=k2guEfmO1)12MbyRuRncMzIyfj=Pw5{r{a4==D7uL
z3(GTKy|Vp$ur{wi38;ML9Bx%$0o0mOxd#Rn-|U~+NiDEBPB2BE_nP=IcEans#7@^V
z-xIFa#&V7M_O7Z6YTt7lv8)rpw+N-{fXD>6wG3-(SfzPR?*2t9ur&zd*EpdYUM(2_
zz%YC=o(ANdLX13<?OB&e`NM2Mlt^(m#+rxq=naqkp*Q1It7Jfj;OTO-&E~;*^~&$o
z?%s9bfmI>e={IM*6});kulVpORR#RmajqGAF~J;UTqLgh$91{+UA*>p>+(Zio_;p5
z;!Sc_7uO2{N?&LB@`r?f3?|`GKc7B)TQAgFr(4CTXU_Vtw<^Hi_Mf9D6ja+$&s#af
zO@y4l&&ohoOkdMq(kzr{xVF#as!c@ZH_vRcL}_64rJhQba#He-MmsK%Z$CtjtmO5v
zuZRw9fLo+en<wA|U5T@=x5aDnAM7}q%KTQxas0-3{lZSiRPs<Ko2&tTzY+35rT4EL
z!Cn`fQ$C}FVbF%)Deh+bS-GTdJ?c|3$KaR7i1alaySeHc)-r!cd-pRX0+$_<v<0oO
zI7m)ZulT%_K1Ty1#5d@W88{h=XP6xy&QE0B8Dy)?lH0i_7qU2wE-0*&W&b=b<!jc|
z7+{0H-ibI)__QqD^#}fxbcbe<hZ-tqMtWI!M>4{D@mYyYX&IW}S$|w_Htn~(i466V
z?@-tFk7pwXRD^!CTM#HkmAgsMd3xiV!Tna{FY4oz#^x3V#F>8aJ`UQma$sR_%^m+<
z>CUlUJ8H@Y6bCs%^(v&H8IAM&{Phz;uh%h`l2Z#R$~hg5A>z(}a<>Aq<M&C@&0vw9
zurssnLUGyg$FoXKcQTQ8L=kF~*2=#U7eW;?lIeNdR`udF#nv=?ZY^~@(A_wR?x+Uj
zZt5nnG%HpvXAh|~xq(ACfNJRvYW1j-bP9xf=fjG2De#qA=11R=@LR(f*`D46hQ`eP
z9{EN3Hl6R(cYa>Z4)My?!cHqo0sjHRwUOgBF0P=iF8XtWez|q6n6=ZBl5OlvFl?44
zfud{54l|`+0<7QdN{iIn{IW9iv+w;!Kcb8NVJu26@prpXU(zERuj&*P+?mjPMk~e=
zjfX7*%{@)3dvckLEb$Oa9cN+2vJDbz?q7M?=^jItnNvvF$dz(Bbhsyr%*QYvrX8nx
zUTj*t|LNx<&d1yvxq;t(-)1%^r}z4Xh!W~qcS_`<7Ld1p>x>F;uZ@^H<ve$Re?)sy
zi+Sp*abF!56JMIN(X*PXerfxL2WNeV+}am~9BDg!Oz1vVC`?<xu0U0uUV)cYmIU6(
zwszQ1EiO~%ru^ExGYXBMAX8cI-?;zY2<1Zi_c2Ku{cB%m4WM2<M=1bhTEL$qhYbSZ
z@8K!Gp4{rX{Z<HM$8%O(#y;b0R#Dc|TTd{{yYsQ#_O7^52DLa~{=nJp@%z>DlRCxf
z6)(_E<M5&beqJCkT(nlS>h;9UI^GZDLG~#ZyGe?!!em5R-xU;)W2zriuUNU1zCh#e
zBfG&0Jwx-Z@mGkS8MF|WY%|}^_Np^bh=@?H)?2*gmXy10=a=Q|VSOk;s}No?@P$>C
z)EQkTww^3ICrz*)s}6B&rgyDFDc{A}uZm0A>X0~Nd*<=`mH23s6QH6OO4r2H<~MgH
zB?lTvO9wpzxYe_77$y0JM@cUC&ak_gB=J=^v|pa?R#XywJ8}uzY2>ta%Qob7!U^3H
zZiVBrMDmGwfpsM}Zf@Ad$nNuS(|OTntUX21r^Z~7cNEEBC2oKDm{#XKDL*qm_S-{i
zWQ@wv=ew)(h2fi(EuQ%^Cxl!=o=>CrH$|2F)oPe*w@KD-#1(C$x0HUfnf$Wi<;pd&
zttZx=+1vL;>CtM_(K=&}DCz|L+O34NO9nrKn>Q@3>fv^ugw0~0d&G=ra>cab^;nyS
zB<A^RdM1+gwX8GYY;R=O>+)*@im1m1IfB%kvtRx?)cL?dBDp_OH=k3om74mz?Dvzh
zFFtag?s|Lrq57VOH#!GLa<E1B#c2OMbsr{s?ikGE%I(`0z`v!KU|%4cJ-u4%0zF^Y
z&^cRWR;3pCYi3|7`+_&qwSccsp7U1ixe9pp;KFtsE#+(0q<D6lIUFRfDnIZfd-Qk7
zPV($bO?y$k;mD^+SE*+}ca5#WsVbqnIv`J2Os-b1uvyMtd<atbhzMRu!uDLD=3-Z<
zwN7nA4=y|_rY^S2s%IBu=P7Aq@cZ2+rvSiir)wYZO!=C{p8Y)-iUM5hn#-&K{VHjF
z=Xf6Fjg%>6hq99eo%0I{5&G!fm>u4CIe<J;`f=jrxwD<Wy~v!7zUM|gVT9OHSy?7}
z@p71>gSz5W_vG%ecHP1KBCj8M@mtka8Uym<hK_>c>J`>s^XFsEhG=AsFJDSxoRoc~
zfHj$@7}|Ekk*-l?-#xLO_K~$`+Z9(7poB%;@-=j*Znk`4q`p3MQzcgkN(JG(J4Vgi
ze2awK1GWF44)1CZN`FapB4}?|yUpFkk$PpLf)ikbqMw>wW^xUhx|Bym%9**y#SqvN
z^lbmO=a*CMXFF+i(Z`EB?JA}^48{2s61?@!Y~#nZfWW+3sjll#B#Icw#;kwJX)LjP
z)Q5~!RYUoWBze2xUcNB;6qh>Yqjc3(mX)jw2zLXgEYEpYi2I{b&YI}^B|v77bDQL?
z^g$do2|gAddf(PiT#-Q@q^(Bbm<@N=W$G-YTyEr~v@I05CV4@ole=4Yw~mQdO&U+`
zX6B5Mhq&X^K?DC7t|<C$vrjT=adZW`{OH8Xcdbfl_WC`KTaBCyk;BZ(MDaOJ(arUz
zZC{fetGVNez8^mwJgTWDk$d&w!bi>)M=L-H{pJ0-4A-SpJhpp``3bqZoN%$DEt=Ms
zC6c(Vjg4{R`+K;|+N0H{h+KObCgX7WI|_3RF6?T-$&@6WZ{j9bR%YlxDL)y8I#Z&V
ztXDqA8M_yJ`c28=`^_kd4h^#|yWc1?hVjLk%q0F6l`_Pr-FN))kodZ#2SIBkl)P8(
zZ#5Rcq?dO=_nToNp70%?r82K7W~puPe+?+X9`Crl$BdQG7icMeqKxg35uywEwVZ0F
zaj~$$`bN+8q(9CJYQ;Wv<cYXro$N6mDOVj}N8;X0#q~a&9J_t!H(JWUr`RIO9ViR>
z>#t}^HQ4s;Lz_k7Ik)8EW?|?=MY*9P*|BjvFuBGZkRQg~I;FBnu-E2^By;WeGPj@~
z3P7+7y^+PQKEM9FbY8L$JIFanO;S_S#n+6*eBX|Bn~W#B8BJil!vYpBXY831Ol~mT
z5xOPP5V<757Hj{UImyB^qG-X7Sh02SR%54oH&@>xT=Qw4@nF(65II$P*EOXyFLdkL
z$M=Wtg6qiXX$il~@t>V(kk)(b`XTCij&}$5^|Sj-3`GrdM#ekrm!xx-_tBO!@y47~
z-P_1I?9Nkd(*EOp!1*2C#hvq=)y8ObimtWV8Z2dE_%S7Ot$$at?a{|qR+13orf@~2
zw4NWBBW$21mEa0g*eBz*S`5t!Ptwcjz#;6H_faXIlWspb{`kGw9;LJs(D4GKG`|1%
zkRdyiHr7l@O={O*dM1wx8{!PIDY*Wh4yW$l2uwp89{$uDai98WD|UUCP+L{b6S>8B
z%suxsx!PeRhA-CgMRS3n(;8hYJqxsqq;rVun3`m-jdpnW{Owd!Z^hoXA75F9chLhf
zy(43_dQ=>txDx}bFTXO!Hbh0%{UYZ$XIow9TP7u$kIAE?kIKDr)Mh9$CPok4d)YSE
z|K?QY@vct6(W42m$CmaOR-dIZS(!ii$cf$KUmjSS6cT5yj_ys_wj&nPSTB}g>}tzj
zzcX+tZ5GyNWA|NvU4llpz7WH^RHfI0;ko$r)$#j{-EG*?doq-Veur!v3Vy9xj7vH6
z^q!mIB|Aiqa40RD#%SizTW`;Z7_|ZOIooVRBIyo!W#6jT!!P%zD2lr>ySke6v+xl{
z@XZJ8Ce?Qgx7hK+uU1Qi?2}Js^lBUBTqCA%{zJ*<JOM7WDj`?dw?OP?=ayNwf!ANb
zjY19#8P5w5bGGM%%^hJ#W~E8VgSXq=ep)lyre1i_-?KH`9><KZRo+w}vcP2?e_CyA
zneL5jC!Q6{^v~4i-_4R~9e;dDshUYVF7gSOm257rm`M6QLmn6GKJ^8E&b}?b|BG`<
z^3&`hxlSyU^J~(M;3oGt_Dpon=e~WCV=VA7GBi|MyY@KVZTxM;Y1HBloA%YheV>*y
zaU;>SP}+~^Mtu(B$~nP-RBH_#4f_eh64CkzpK4xK+L_TlhK_|l%iYFwXn5+~cawCk
zWB!ju4+H{bPs1gRoaWybv(9l#_ri>@r2Fm6!luKzS$R1HUJe%9(nb{uP=xK!t~%$_
zEL;drIoq6XY(OC(Por7ddnl9w-xku*+Bbg=EZ%G52ISo@ct8bM-+*|Py*WnBJ(+JC
z+i2>@|H&6wU0bvRnP$NRM+vWk-<F11=YM=iC??NqfCXyM;Q0gZMmOpZAK=ejNUqMs
z4kB3KP5SFK%8RW@tl%TW?L!_zoU>HPLem4`4LTLzm;oQmdY_)+P%pTqoHx4Yjkw0f
zKz?)jy~b3g^!az=hUJE1g4%WDnVluV>l|imb$F`rdmDfYbN^sudCs9bf5A60<vl84
z96_%G*t7MLLtIA!s{)2*-NuRMH;K}c%JIX_nv~YE6v3$oMbn3868&f?U$bZE0dK^G
z;K&Vlg;Ol%-j(zS_|3Kom+?U**Ge#s$IsIW2;~(U#fN~y1iZ&AcKE*4{DGxBBCg9-
zP(BMKL7-R^G~PMUIbKSp348=T^s4!hnU1zo+_6B(r4-Sg6FZ@3m*(2Xv(ke(@v0Sv
zK-w6xw~S>5f~e`kF)T)sl$+##G~Lv9H0I>o{^n}5OOKw0THorN1`G!;Z#vP_7jN@8
zr2D&UsGK{D0CzhESvV|E&%51+32zR_VBItOVElZ;tC2`oD~ZZaZu%5f8ZZr>w^Q~#
z-t-2SS+`M#SBIQ7MNq1p$4dKi{aN++sq9rHNezKE*4o*}@>VYn58w5={MW;=4+q#O
zzZ!vBgq;jXCEA<C&Xx7IIrF4VD-3E6Oo$g^8XL@Iu*`@=T>8s%_1Y(=G&823&Nax(
z+#*03Uh8nR=-1-7yN}NG3~?3JqCZVbCj3^&d8v12j$9hdXny><dyG?bI0v~mu{oE<
zPF4Hj1;Y&-%BqRt&)s?`>_|}R&6n+G`UgXi6MRc7<F_&>#w<@;MSDmX;CMc_FwV14
z%n|sso3;5GgbgWb$i?&g{`mOi8$j5lbVA+2!S~lSmPRb-{-!`{Ou-2~An-iz&mre^
z!pD$}A3t?(_R(CoVV%j~DJezGb#hWK-?zO^E*9zz_fI1)7f0>qE@Vz`;JsN3<SLaf
z4$|vIJ{yxoG^_cIC+cGyl@%h?3=P9slT&KGj|LR38X0bFjz$^gDlOg$7G8e25Pio|
zC$p|gn5KL-PZk{JYv{+gkF6><>81rZoUWR`&nD-)sZ%JJwF0m}Kk_juUkkP9{mVyg
z%9qWzpLad}BwD`&<8A?`BUA@7G~#)1mq^qZ&3q{M@TOuy9{lcowb*F*rFFEu(4iHo
z#s?y0zsXqSpjGxOtWnjFvNqS+4>cGcJwEWMP7qheJsB53q@kbrDV?y%9NBWu<w@S-
z*A>7)3rfUb@XS*tujwM<`Qi4lurLj5$wI6e%}8e@SiIMGYp?R%ALp1)Y%-_6m%%<m
z)^-dP6vDAM>az7iE`!=#eEN^+A?JG**()vbW#uI3cNefbS1xC#8$&5_ip9v8)X1?K
zwcX^>&EBXHAH3$3bDyKS_9_(icEV>?N*MX(`<%zG#Q|uPq6y@^7({8}bTI-XKFq_P
zI&w2~{S6dSlc>j%^r2U@b)Q~lmvhPLvaHARE3fsP2t;&6z2`-aiM6|wV@`G%GNww&
zY7>mHW?KXO!C69yM;Z@4hKay}_l^X;%O5MUy?i25erz04_Eha!w{-K1TlF42n%SM$
za^l<Zc1NmfcLQ18r*TN)?_7C?<fLUkO4t(C_v18gQ_xI&i|79CtS@&^yIKaOd;#zF
zpN2UW+waJyE&nrwXDF#f63+KCRw(6RQ_IaO?@{#q^_+iR<EG>3aP%GCtSSvpEmP~;
zI2kjl&#e=f4>eHV&qma6wSHCWix-`i(Q5kD!=}2%FGTcO_|fIOXfD-#P<*Z=vWHL_
zJzDS@MLm=sC)2b>Ly=O337q__SIBYy=Kh4_&Ou*u2u{}RXUA}%Xc3nnnja*4b_^B!
z1aQ}F^~~EYjhsw0R(FXl(mpM`-Z$-Mm@x`RFZsRfkA&8rqtqaV@GbR*GQi)?5aExC
z(gGWqE3>oL3D%FRWxq-Jee~&sTftMuZhO&eyV>ACd&3;Vomt1FQmwKVpGpUrCV?8Z
z*~jE}8Gn(xp7gBjrr9aEE`P;Wly<i($uolz?3JoH4R%p#*m>Cl(^sDq`YJ8RCM{;M
zWp~cECettEv%{Yh9PiEvntNnYl}w>-!h@}L<>s}{TYqv>3T7qPhf&jiSe3V??f0H0
z;!&r_XLs6~nmCF3;HY8nyO*VUNt?#k>CXrx1VSA@m8r6z)@PJupq59GmEJLbdL(Ac
zgis*zv7rkB89(DGeZ4%_<aa4=hLmf+3%uJGfnQi(`GMI)y61KGTEMs5HwTk54y(o-
zP<H8kLk|xmT@35x72(bY&qJ)}G=Dn1L$vKD-4f1N<?Q}3Jh%Rdh}idKBT*9t{uh8Q
Bq`m+E

literal 0
HcmV?d00001


From 0d9ca57be8e07ff81ce63ea0925e860ae9441805 Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Thu, 21 Sep 2023 16:55:21 -0500
Subject: [PATCH 04/19] Automatic changelog generation for PR #2454 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-2454.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-2454.yml

diff --git a/html/changelogs/AutoChangeLog-pr-2454.yml b/html/changelogs/AutoChangeLog-pr-2454.yml
new file mode 100644
index 00000000000..e08de77c11f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2454.yml
@@ -0,0 +1,5 @@
+author: BlueHNT
+delete-after: true
+changes:
+  - rscadd: Added new Ju Jitsu move
+  - tweak: Tweaked Ju Jitsu

From e6e336b9e82e4e5044efea1b83d30ad63e4bd7e8 Mon Sep 17 00:00:00 2001
From: The Lusty E <89947174+bruhlookatthisdood@users.noreply.github.com>
Date: Thu, 21 Sep 2023 16:57:16 -0500
Subject: [PATCH 05/19] Snake atmospherics fixes (#2513)

---
 _maps/map_files/Snake/snake_lower.dmm         | 31 +++++++++++++++----
 nsv13.dme                                     |  4 +++
 nsv13/code/__DEFINES/atmospherics.dm          |  3 ++
 .../game/machinery/computer/atmos_control.dm  | 11 +++++++
 .../game/objects/items/nsv_circuitboards.dm   |  6 ++++
 .../unary_devices/outlet_injector.dm          |  3 ++
 .../components/unary_devices/vent_pump.dm     |  3 ++
 7 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 nsv13/code/__DEFINES/atmospherics.dm
 create mode 100644 nsv13/code/game/machinery/computer/atmos_control.dm
 create mode 100644 nsv13/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
 create mode 100644 nsv13/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm

diff --git a/_maps/map_files/Snake/snake_lower.dmm b/_maps/map_files/Snake/snake_lower.dmm
index 8f23ef89e58..b0dcc7ac19a 100644
--- a/_maps/map_files/Snake/snake_lower.dmm
+++ b/_maps/map_files/Snake/snake_lower.dmm
@@ -765,7 +765,7 @@
 /turf/open/floor/plasteel,
 /area/security/brig)
 "cO" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{
+/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
 	dir = 8
 	},
 /turf/open/floor/engine/air,
@@ -3151,7 +3151,7 @@
 /turf/open/floor/engine,
 /area/nsv/weapons/fore)
 "ls" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{
 	dir = 4
 	},
 /turf/open/floor/engine/airless,
@@ -3797,9 +3797,9 @@
 /turf/open/floor/plasteel/white,
 /area/science/lab)
 "nL" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{
 	dir = 8;
-	name = "Fuel Mix Injector"
+	piping_layer = 4
 	},
 /turf/open/floor/engine/airless,
 /area/engine/atmos)
@@ -4718,6 +4718,12 @@
 /obj/machinery/light_switch/north,
 /turf/open/floor/engine,
 /area/security/execution/transfer)
+"ru" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nucleium_output{
+	dir = 1
+	},
+/turf/open/floor/engine/vacuum,
+/area/engine/atmos)
 "rv" = (
 /obj/machinery/light_switch/north,
 /turf/open/floor/plasteel/dark/side,
@@ -6293,6 +6299,9 @@
 	dir = 4
 	},
 /obj/item/radio/intercom/directional/south,
+/obj/machinery/computer/atmos_control/tank/nucleium_tank{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/engine/atmos)
 "wV" = (
@@ -9238,6 +9247,12 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/engine/atmos)
+"GQ" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nucleium_input{
+	dir = 1
+	},
+/turf/open/floor/engine/vacuum,
+/area/engine/atmos)
 "GS" = (
 /obj/structure/kitchenspike,
 /obj/machinery/camera/autoname,
@@ -13075,6 +13090,10 @@
 /area/security/brig)
 "TL" = (
 /obj/machinery/light/small,
+/obj/machinery/air_sensor/atmos/nucleium_tank,
+/obj/machinery/portable_atmospherics/canister/nucleium{
+	filled = 0
+	},
 /turf/open/floor/engine/vacuum,
 /area/engine/atmos)
 "TP" = (
@@ -40506,7 +40525,7 @@ NS
 Ly
 IV
 hP
-Hg
+ru
 Hg
 ge
 ge
@@ -41020,7 +41039,7 @@ iB
 yL
 xe
 hP
-Hg
+GQ
 Hg
 ge
 oe
diff --git a/nsv13.dme b/nsv13.dme
index af6c1d39ea5..3a98b52c0a9 100644
--- a/nsv13.dme
+++ b/nsv13.dme
@@ -3660,6 +3660,7 @@
 #include "interface\interface.dm"
 #include "interface\stylesheet.dm"
 #include "interface\skin.dmf"
+#include "nsv13\code\__DEFINES\atmospherics.dm"
 #include "nsv13\code\__DEFINES\components.dm"
 #include "nsv13\code\__DEFINES\fleets.dm"
 #include "nsv13\code\__DEFINES\ftl.dm"
@@ -3788,6 +3789,7 @@
 #include "nsv13\code\game\machinery\plasma_loader.dm"
 #include "nsv13\code\game\machinery\refillable_chem_dispenser.dm"
 #include "nsv13\code\game\machinery\computer\_ship.dm"
+#include "nsv13\code\game\machinery\computer\atmos_control.dm"
 #include "nsv13\code\game\machinery\computer\boarding_pin.dm"
 #include "nsv13\code\game\machinery\computer\helm.dm"
 #include "nsv13\code\game\machinery\computer\munitions.dm"
@@ -3840,8 +3842,10 @@
 #include "nsv13\code\modules\antagonists\boarders\boarders.dm"
 #include "nsv13\code\modules\antagonists\boarders\pirate_boarders.dm"
 #include "nsv13\code\modules\atmospherics\gasmixtures\reactions.dm"
+#include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\outlet_injector.dm"
 #include "nsv13\code\modules\atmospherics\machinery\components\binary_devices\constrictor.dm"
 #include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\tank.dm"
+#include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\vent_pump.dm"
 #include "nsv13\code\modules\cargo\mission_rewards.dm"
 #include "nsv13\code\modules\cargo\objective_cargo.dm"
 #include "nsv13\code\modules\cargo\packs.dm"
diff --git a/nsv13/code/__DEFINES/atmospherics.dm b/nsv13/code/__DEFINES/atmospherics.dm
new file mode 100644
index 00000000000..5de0fedc9f0
--- /dev/null
+++ b/nsv13/code/__DEFINES/atmospherics.dm
@@ -0,0 +1,3 @@
+#define ATMOS_GAS_MONITOR_INPUT_NUCLEIUM "nucleium_in"
+#define ATMOS_GAS_MONITOR_OUTPUT_NUCLEIUM "nucleium_out"
+#define ATMOS_GAS_MONITOR_SENSOR_NUCLEIUM "nucleium_sensor"
diff --git a/nsv13/code/game/machinery/computer/atmos_control.dm b/nsv13/code/game/machinery/computer/atmos_control.dm
new file mode 100644
index 00000000000..223ec4566f1
--- /dev/null
+++ b/nsv13/code/game/machinery/computer/atmos_control.dm
@@ -0,0 +1,11 @@
+/obj/machinery/computer/atmos_control/tank/nucleium_tank //NSV added nucleium tank console
+	name = "Nucleium Supply Monitor"
+	input_tag = ATMOS_GAS_MONITOR_INPUT_NUCLEIUM
+	output_tag = ATMOS_GAS_MONITOR_OUTPUT_NUCLEIUM
+	sensors = list(ATMOS_GAS_MONITOR_SENSOR_NUCLEIUM = "Nucleium Tank")
+	circuit = /obj/item/circuitboard/computer/atmos_control/tank/nucleium_tank
+
+/obj/machinery/air_sensor/atmos/nucleium_tank //nucleium stuff
+	name = "nucleium tank gas sensor"
+	id_tag = ATMOS_GAS_MONITOR_SENSOR_NUCLEIUM
+
diff --git a/nsv13/code/game/objects/items/nsv_circuitboards.dm b/nsv13/code/game/objects/items/nsv_circuitboards.dm
index 4465dee6c6d..d89894a974f 100644
--- a/nsv13/code/game/objects/items/nsv_circuitboards.dm
+++ b/nsv13/code/game/objects/items/nsv_circuitboards.dm
@@ -439,6 +439,12 @@
 		/obj/item/stack/sheet/glass = 1)
 	needs_anchored = FALSE
 
+//Atmospheric consoles
+/obj/item/circuitboard/computer/atmos_control/tank/nucleium_tank
+	name = "nucleium supply control (Computer Board)"
+	build_path = /obj/machinery/computer/atmos_control/tank/nucleium_tank
+
+//Bot navbeacon
 /obj/item/circuitboard/machine/navbeacon
 	name = "Bot Navigational Beacon"
 	icon_state = "science"
diff --git a/nsv13/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/nsv13/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
new file mode 100644
index 00000000000..5a372955b8a
--- /dev/null
+++ b/nsv13/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
@@ -0,0 +1,3 @@
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nucleium_input
+	name = "nucleium tank input injector"
+	id = ATMOS_GAS_MONITOR_INPUT_NUCLEIUM
diff --git a/nsv13/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/nsv13/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
new file mode 100644
index 00000000000..2c9f578581e
--- /dev/null
+++ b/nsv13/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -0,0 +1,3 @@
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nucleium_output
+	name = "nucleium tank output inlet"
+	id_tag = ATMOS_GAS_MONITOR_OUTPUT_NUCLEIUM

From fe7fccb644626aa0ec40d35e39efcd7b01a08edf Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Thu, 21 Sep 2023 16:58:01 -0500
Subject: [PATCH 06/19] Automatic changelog generation for PR #2513 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-2513.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-2513.yml

diff --git a/html/changelogs/AutoChangeLog-pr-2513.yml b/html/changelogs/AutoChangeLog-pr-2513.yml
new file mode 100644
index 00000000000..0cdbe041400
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2513.yml
@@ -0,0 +1,8 @@
+author: bruhlookatthisdood
+delete-after: true
+changes:
+  - bugfix: Fixes snake atmospherics having wrong injector and vent types in fuel
+      mix chamber
+  - bugfix: Fixes snake atmospherics having wrong vent type in air chamber
+  - bugfix: Fixes snake atmospherics's nucleium chamber missing sensor, canister,
+      vent, and injector

From 3dbbfe94fcca0432df3ffb05ee7005410f51fd63 Mon Sep 17 00:00:00 2001
From: Brillcrafter <110330962+Brillcrafter@users.noreply.github.com>
Date: Thu, 21 Sep 2023 22:58:24 +0100
Subject: [PATCH 07/19] Upped the firerate on the mech LBX AC 10 "Scattershot"
 (#2496)

---
 code/game/mecha/equipment/weapons/weapons.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index dbe623a03de..c800adb9edf 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -293,7 +293,7 @@
 	name = "\improper LBX AC 10 \"Scattershot\""
 	desc = "A weapon for combat exosuits. Shoots a spread of pellets."
 	icon_state = "mecha_scatter"
-	equip_cooldown = 20
+	equip_cooldown = 15  //NSV13 - decreased cool down to 15 from 20
 	projectile = /obj/item/projectile/bullet/scattershot
 	projectiles = 40
 	projectile_energy_cost = 25

From 890eb4690c60c02e177f40b9fe700af4c797ebbc Mon Sep 17 00:00:00 2001
From: Ikalpo <kalvin999@hotmail.com>
Date: Thu, 21 Sep 2023 14:58:37 -0700
Subject: [PATCH 08/19] VLS unloading fix (#2521)

---
 .../munitions/ship_weapons/ballistic_weapons/revision2/vls.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/vls.dm b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/vls.dm
index 8a6c19c5974..3cf4a5d9905 100644
--- a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/vls.dm
+++ b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/vls.dm
@@ -58,6 +58,8 @@
 		return FALSE
 	if(loading)
 		return FALSE
+	if(oldloc == src)// stops torps from getting sent back in instantly
+		return FALSE
 	if(state >= STATE_LOADED)
 		return FALSE
 	load(torp)
@@ -133,9 +135,7 @@
 	hatch.toggle(HT_CLOSED)
 
 /obj/machinery/ship_weapon/vls/unload()
-	loading = TRUE // This prevents torps from immediately falling back into the VLS tube
 	. = ..()
-	loading = FALSE
 	if(!hatch)
 		return
 	hatch.toggle(HT_CLOSED)

From 6d3c8f17cb44061533e354f9cac362850e3c104d Mon Sep 17 00:00:00 2001
From: someone543 <95106800+someone543@users.noreply.github.com>
Date: Fri, 22 Sep 2023 05:58:48 +0800
Subject: [PATCH 09/19] Hammerhead missing items (#2522)

---
 _maps/map_files/Hammerhead/Hammerhead.dmm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/_maps/map_files/Hammerhead/Hammerhead.dmm b/_maps/map_files/Hammerhead/Hammerhead.dmm
index 770cbdcdb3b..a3dbae2f4e2 100644
--- a/_maps/map_files/Hammerhead/Hammerhead.dmm
+++ b/_maps/map_files/Hammerhead/Hammerhead.dmm
@@ -16758,6 +16758,8 @@
 "bbI" = (
 /obj/machinery/computer/lore_terminal,
 /obj/structure/munitions_trolley,
+/obj/item/ammo_box/magazine/nsv/heavy_cannon,
+/obj/item/ammo_box/magazine/nsv/heavy_cannon,
 /turf/open/floor/durasteel/eris_techfloor_alt,
 /area/nsv/hanger)
 "bbJ" = (
@@ -21870,8 +21872,8 @@
 	pixel_y = -8
 	},
 /obj/structure/table/glass,
-/obj/item/storage/toolbox/mechanical,
 /obj/item/radio/intercom/directional/north,
+/obj/item/storage/toolbox/mechanical,
 /turf/open/floor/plasteel/white,
 /area/science/lab)
 "cGV" = (
@@ -27424,6 +27426,12 @@
 "gqM" = (
 /obj/machinery/computer/ship/viewscreen,
 /obj/structure/munitions_trolley,
+/obj/item/ammo_box/magazine/nsv/light_cannon,
+/obj/item/ammo_box/magazine/nsv/light_cannon,
+/obj/item/ammo_box/magazine/nsv/light_cannon,
+/obj/item/ammo_box/magazine/nsv/light_cannon,
+/obj/item/ammo_box/magazine/nsv/light_cannon,
+/obj/item/ammo_box/magazine/nsv/light_cannon,
 /turf/open/floor/durasteel/eris_techfloor_alt,
 /area/nsv/hanger)
 "gre" = (
@@ -30064,6 +30072,7 @@
 /obj/item/clothing/head/welding{
 	pixel_x = 7
 	},
+/obj/item/stack/sheet/plasteel/twenty,
 /turf/open/floor/durasteel/padded,
 /area/science/robotics/lab)
 "ibY" = (
@@ -35687,7 +35696,7 @@
 "lLE" = (
 /obj/effect/turf_decal/tile/purple,
 /obj/structure/table,
-/obj/item/stack/sheet/plasteel/twenty,
+/obj/machinery/ecto_sniffer,
 /turf/open/floor/durasteel/padded,
 /area/science/robotics/lab)
 "lMH" = (

From 30b5b1737b2a75a1a2e9e87a20ac0e86cc3d7b5a Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Thu, 21 Sep 2023 16:59:29 -0500
Subject: [PATCH 10/19] Automatic changelog generation for PR #2521 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-2521.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-2521.yml

diff --git a/html/changelogs/AutoChangeLog-pr-2521.yml b/html/changelogs/AutoChangeLog-pr-2521.yml
new file mode 100644
index 00000000000..e7f6da64e03
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2521.yml
@@ -0,0 +1,4 @@
+author: Ikalpo
+delete-after: true
+changes:
+  - bugfix: fixed VLS eating torps that get unloaded

From c9c09e31d6213b1823185aae48cfd53155be0f2e Mon Sep 17 00:00:00 2001
From: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date: Fri, 22 Sep 2023 00:01:08 +0200
Subject: [PATCH 11/19] Adds a overmap z failsafe (#2525)

---
 nsv13/code/__DEFINES/overmap.dm            | 3 +++
 nsv13/code/modules/overmap/FTL/ftl_jump.dm | 6 ++++++
 nsv13/code/modules/overmap/ai-skynet.dm    | 2 ++
 nsv13/code/modules/overmap/overmap.dm      | 1 +
 4 files changed, 12 insertions(+)

diff --git a/nsv13/code/__DEFINES/overmap.dm b/nsv13/code/__DEFINES/overmap.dm
index ed4354121b9..beb76f66c13 100644
--- a/nsv13/code/__DEFINES/overmap.dm
+++ b/nsv13/code/__DEFINES/overmap.dm
@@ -102,6 +102,9 @@ GLOBAL_LIST_INIT(overmap_impact_sounds, list('nsv13/sound/effects/ship/freespace
 #define INTERIOR_DELETING 3
 #define INTERIOR_DELETED 4
 
+//Overmap flags
+#define OVERMAP_FLAG_ZLEVEL_CARRIER (1<<0) //! This overmap is meant to carry a z with it, prompting restoration in certain cases.
+
 //Ship mass
 #define MASS_TINY 1 //1 Player - Fighters
 #define MASS_SMALL 2 //2-5 Players - FoB/Mining Ship
diff --git a/nsv13/code/modules/overmap/FTL/ftl_jump.dm b/nsv13/code/modules/overmap/FTL/ftl_jump.dm
index e6b585cf61c..f63c95723a9 100644
--- a/nsv13/code/modules/overmap/FTL/ftl_jump.dm
+++ b/nsv13/code/modules/overmap/FTL/ftl_jump.dm
@@ -1,11 +1,17 @@
 /datum/star_system/proc/add_ship(obj/structure/overmap/OM, turf/target_turf)
 	if(!system_contents.Find(OM))
 		system_contents += OM	//Lets be safe while I cast some black magic.
+	var/did_restore_system = FALSE
 	if(!occupying_z && OM.z) //Does this system have a physical existence? if not, we'll set this now so that any inbound ships jump to the same Z-level that we're on.
 		if(!SSmapping.level_trait(OM.z, ZTRAIT_OVERMAP))
 			occupying_z = OM.get_reserved_z()
 		else
 			occupying_z = OM.z
+		did_restore_system = TRUE
+	else if(!occupying_z && ((OM.overmap_flags & OVERMAP_FLAG_ZLEVEL_CARRIER) || length(OM.mobs_in_ship))) //If someone is inside, or we always want it loaded, load it.
+		occupying_z = OM.get_reserved_z()
+		did_restore_system = TRUE
+	if(did_restore_system)
 		if(fleets.len)
 			for(var/datum/fleet/F in fleets)
 				if(!F.current_system)
diff --git a/nsv13/code/modules/overmap/ai-skynet.dm b/nsv13/code/modules/overmap/ai-skynet.dm
index bb1164370fa..eab22f31145 100644
--- a/nsv13/code/modules/overmap/ai-skynet.dm
+++ b/nsv13/code/modules/overmap/ai-skynet.dm
@@ -1610,6 +1610,8 @@ Seek a ship thich we'll station ourselves around
 	var/ai_can_launch_fighters = FALSE //AI variable. Allows your ai ships to spawn fighter craft
 	var/list/ai_fighter_type = list()
 	var/ai_flags = AI_FLAG_DESTROYER
+	///Overmap bitflags
+	var/overmap_flags = NONE
 
 	var/list/holding_cargo = list() // list of objective datums. This station has cargo to deliver to the players as part of a courier objective
 	var/list/expecting_cargo = list() // list of objective datums. This station is expecting cargo delivered to them by the players as a part of a courier objective
diff --git a/nsv13/code/modules/overmap/overmap.dm b/nsv13/code/modules/overmap/overmap.dm
index 00f5b0650d7..9216e047d2a 100644
--- a/nsv13/code/modules/overmap/overmap.dm
+++ b/nsv13/code/modules/overmap/overmap.dm
@@ -232,6 +232,7 @@ Proc to spool up a new Z-level for a player ship and assign it a treadmill.
 	var/turf/exit = get_turf(locate(round(world.maxx * 0.5, 1), round(world.maxy * 0.5, 1), world.maxz)) //Plop them bang in the center of the system.
 	var/obj/structure/overmap/OM = new _path(exit) //Ship'll pick up the info it needs, so just domp eet at the exit turf.
 	OM.reserved_z = world.maxz
+	OM.overmap_flags |= OVERMAP_FLAG_ZLEVEL_CARRIER
 	OM.current_system = SSstar_system.find_system(OM)
 	if(OM.role == MAIN_OVERMAP) //If we're the main overmap, we'll cheat a lil' and apply our status to all of the Zs under "station"
 		for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))

From 1a41156f5fa0447975caf45b14da3f73f49eaa49 Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Thu, 21 Sep 2023 17:01:53 -0500
Subject: [PATCH 12/19] Automatic changelog generation for PR #2525 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-2525.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-2525.yml

diff --git a/html/changelogs/AutoChangeLog-pr-2525.yml b/html/changelogs/AutoChangeLog-pr-2525.yml
new file mode 100644
index 00000000000..d147b2bcedb
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2525.yml
@@ -0,0 +1,5 @@
+author: DeltaFire15
+delete-after: true
+changes:
+  - bugfix: Overmap objects with players should be a bit less likely to get stuck
+      in nullspace.

From 6ac2546bf2481f946caf3a2f7431bbb2d1db033f Mon Sep 17 00:00:00 2001
From: someone543 <95106800+someone543@users.noreply.github.com>
Date: Fri, 22 Sep 2023 06:02:10 +0800
Subject: [PATCH 13/19] Gives Tycoon a FLARE (#2528)

---
 _maps/map_files/Tycoon/Tycoon2.dmm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm
index 4d99ee10e2a..dcffdb84ab8 100644
--- a/_maps/map_files/Tycoon/Tycoon2.dmm
+++ b/_maps/map_files/Tycoon/Tycoon2.dmm
@@ -42294,6 +42294,13 @@
 	initial_gas_mix = "TEMP=2.7"
 	},
 /area/engine/atmos)
+"fQR" = (
+/obj/structure/lattice/catwalk/over/ship,
+/obj/machinery/conquest_beacon/nanotrasen,
+/turf/open/floor/monotile/dark,
+/area/bridge{
+	name = "CIC"
+	})
 "fSF" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
@@ -88543,7 +88550,7 @@ bBU
 wMJ
 nDn
 bmE
-bmE
+fQR
 bmE
 xvg
 bTi

From d36dc75d9b327c6a384be6baf7e18dc72faf1c93 Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Thu, 21 Sep 2023 17:02:57 -0500
Subject: [PATCH 14/19] Automatic changelog generation for PR #2528 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-2528.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-2528.yml

diff --git a/html/changelogs/AutoChangeLog-pr-2528.yml b/html/changelogs/AutoChangeLog-pr-2528.yml
new file mode 100644
index 00000000000..5fcda5d2ea9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2528.yml
@@ -0,0 +1,4 @@
+author: someone543
+delete-after: true
+changes:
+  - rscadd: FLARE added to Tycoon

From 65e1c384c12fe052e8e943c5d5ea3469cee3762b Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Thu, 21 Sep 2023 22:04:04 +0000
Subject: [PATCH 15/19] Automatic changelog compile [ci skip]

---
 html/changelog.html                       | 25 +++++++++++++++++++++++
 html/changelogs/.all_changelog.yml        | 17 +++++++++++++++
 html/changelogs/AutoChangeLog-pr-2454.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-2513.yml |  8 --------
 html/changelogs/AutoChangeLog-pr-2521.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-2525.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-2528.yml |  4 ----
 7 files changed, 42 insertions(+), 26 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2454.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2513.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2521.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2525.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2528.yml

diff --git a/html/changelog.html b/html/changelog.html
index c2778e74fe0..aaebae12b66 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,31 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">21 September 2023</h2>
+			<h3 class="author">BlueHNT updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added new Ju Jitsu move</li>
+				<li class="tweak">Tweaked Ju Jitsu</li>
+			</ul>
+			<h3 class="author">DeltaFire15 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Overmap objects with players should be a bit less likely to get stuck in nullspace.</li>
+			</ul>
+			<h3 class="author">Ikalpo updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">fixed VLS eating torps that get unloaded</li>
+			</ul>
+			<h3 class="author">bruhlookatthisdood updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes snake atmospherics having wrong injector and vent types in fuel mix chamber</li>
+				<li class="bugfix">Fixes snake atmospherics having wrong vent type in air chamber</li>
+				<li class="bugfix">Fixes snake atmospherics's nucleium chamber missing sensor, canister, vent, and injector</li>
+			</ul>
+			<h3 class="author">someone543 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">FLARE added to Tycoon</li>
+			</ul>
+
 			<h2 class="date">01 September 2023</h2>
 			<h3 class="author">Bokkiewokkie updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 1416172bc36..05487deb0c6 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1698,3 +1698,20 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       plutonium sludge.
   someone543:
   - tweak: Ecto Sniffer has a cooldown for radio messages, and can now send visible_messages
+2023-09-21:
+  BlueHNT:
+  - rscadd: Added new Ju Jitsu move
+  - tweak: Tweaked Ju Jitsu
+  DeltaFire15:
+  - bugfix: Overmap objects with players should be a bit less likely to get stuck
+      in nullspace.
+  Ikalpo:
+  - bugfix: fixed VLS eating torps that get unloaded
+  bruhlookatthisdood:
+  - bugfix: Fixes snake atmospherics having wrong injector and vent types in fuel
+      mix chamber
+  - bugfix: Fixes snake atmospherics having wrong vent type in air chamber
+  - bugfix: Fixes snake atmospherics's nucleium chamber missing sensor, canister,
+      vent, and injector
+  someone543:
+  - rscadd: FLARE added to Tycoon
diff --git a/html/changelogs/AutoChangeLog-pr-2454.yml b/html/changelogs/AutoChangeLog-pr-2454.yml
deleted file mode 100644
index e08de77c11f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2454.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: BlueHNT
-delete-after: true
-changes:
-  - rscadd: Added new Ju Jitsu move
-  - tweak: Tweaked Ju Jitsu
diff --git a/html/changelogs/AutoChangeLog-pr-2513.yml b/html/changelogs/AutoChangeLog-pr-2513.yml
deleted file mode 100644
index 0cdbe041400..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2513.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: bruhlookatthisdood
-delete-after: true
-changes:
-  - bugfix: Fixes snake atmospherics having wrong injector and vent types in fuel
-      mix chamber
-  - bugfix: Fixes snake atmospherics having wrong vent type in air chamber
-  - bugfix: Fixes snake atmospherics's nucleium chamber missing sensor, canister,
-      vent, and injector
diff --git a/html/changelogs/AutoChangeLog-pr-2521.yml b/html/changelogs/AutoChangeLog-pr-2521.yml
deleted file mode 100644
index e7f6da64e03..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2521.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Ikalpo
-delete-after: true
-changes:
-  - bugfix: fixed VLS eating torps that get unloaded
diff --git a/html/changelogs/AutoChangeLog-pr-2525.yml b/html/changelogs/AutoChangeLog-pr-2525.yml
deleted file mode 100644
index d147b2bcedb..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2525.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: DeltaFire15
-delete-after: true
-changes:
-  - bugfix: Overmap objects with players should be a bit less likely to get stuck
-      in nullspace.
diff --git a/html/changelogs/AutoChangeLog-pr-2528.yml b/html/changelogs/AutoChangeLog-pr-2528.yml
deleted file mode 100644
index 5fcda5d2ea9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2528.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: someone543
-delete-after: true
-changes:
-  - rscadd: FLARE added to Tycoon

From f9535048579b3c84bfe05447c6ae08bd90977328 Mon Sep 17 00:00:00 2001
From: someone543 <95106800+someone543@users.noreply.github.com>
Date: Fri, 22 Sep 2023 06:04:19 +0800
Subject: [PATCH 16/19] Gladius locker and hanger lift fixes (#2530)

---
 _maps/map_files/Gladius/Gladius1.dmm | 11 ++++++-----
 _maps/map_files/Gladius/Gladius2.dmm | 18 ++++++++++++++++--
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/_maps/map_files/Gladius/Gladius1.dmm b/_maps/map_files/Gladius/Gladius1.dmm
index 90069c29bfc..560ae1f443e 100644
--- a/_maps/map_files/Gladius/Gladius1.dmm
+++ b/_maps/map_files/Gladius/Gladius1.dmm
@@ -3700,6 +3700,10 @@
 	},
 /turf/open/floor/monotile/dark,
 /area/gateway)
+"bRw" = (
+/obj/machinery/lazylift_button,
+/turf/closed/wall/r_wall/ship,
+/area/shuttle/turbolift/tertiary)
 "bRS" = (
 /obj/effect/turf_decal/tile/ship/half/blue{
 	dir = 1
@@ -32226,10 +32230,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/closet/secure_closet/brig{
-	id = "brig3";
-	name = "Cell 3 Locker"
-	},
+/obj/structure/closet/secure_closet/genpop,
 /turf/open/floor/monotile/steel,
 /area/security/brig)
 "oZR" = (
@@ -72863,7 +72864,7 @@ wsg
 eqI
 gVj
 gVj
-eqI
+bRw
 eqI
 pJj
 pJj
diff --git a/_maps/map_files/Gladius/Gladius2.dmm b/_maps/map_files/Gladius/Gladius2.dmm
index f73194c193d..05dc2448477 100644
--- a/_maps/map_files/Gladius/Gladius2.dmm
+++ b/_maps/map_files/Gladius/Gladius2.dmm
@@ -10592,6 +10592,9 @@
 /area/crew_quarters/bar)
 "glm" = (
 /obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/open/floor/monotile/dark,
 /area/maintenance/nsv/deck2/starboard/aft)
 "glx" = (
@@ -11740,6 +11743,13 @@
 /obj/machinery/atmospherics/pipe/simple/supply/visible/layer2,
 /turf/open/floor/plasteel/grid/steel,
 /area/engine/atmos)
+"gVh" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/turbolift/tertiary)
 "gVj" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
@@ -34384,6 +34394,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/dark,
 /area/nsv/engine/corridor)
+"tAt" = (
+/obj/machinery/lazylift_button,
+/turf/closed/wall/ship,
+/area/shuttle/turbolift/tertiary)
 "tAz" = (
 /obj/machinery/light{
 	dir = 4
@@ -62674,7 +62688,7 @@ lEY
 lEY
 lEY
 hnm
-cEl
+gVh
 qjq
 xmk
 gnw
@@ -63448,7 +63462,7 @@ khJ
 khJ
 jBH
 dnn
-khJ
+tAt
 khJ
 dJe
 dJe

From a50f8de097b8de37773c8aec491164de5f1c6fcc Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Thu, 21 Sep 2023 17:05:02 -0500
Subject: [PATCH 17/19] Automatic changelog generation for PR #2530 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-2530.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-2530.yml

diff --git a/html/changelogs/AutoChangeLog-pr-2530.yml b/html/changelogs/AutoChangeLog-pr-2530.yml
new file mode 100644
index 00000000000..c995cca4060
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2530.yml
@@ -0,0 +1,5 @@
+author: someone543
+delete-after: true
+changes:
+  - rscadd: Added lift button to Gladius mining hanger
+  - bugfix: fixed Gladius cell lockers not being genpop lockers

From ad5cabd8563c8f3feff459d6640cc039f389d99f Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Thu, 21 Sep 2023 23:03:58 +0000
Subject: [PATCH 18/19] Automatic changelog compile [ci skip]

---
 html/changelog.html                       | 2 ++
 html/changelogs/.all_changelog.yml        | 2 ++
 html/changelogs/AutoChangeLog-pr-2530.yml | 5 -----
 3 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2530.yml

diff --git a/html/changelog.html b/html/changelog.html
index aaebae12b66..280a7b9b733 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -79,6 +79,8 @@ <h3 class="author">bruhlookatthisdood updated:</h3>
 			<h3 class="author">someone543 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">FLARE added to Tycoon</li>
+				<li class="rscadd">Added lift button to Gladius mining hanger</li>
+				<li class="bugfix">fixed Gladius cell lockers not being genpop lockers</li>
 			</ul>
 
 			<h2 class="date">01 September 2023</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 05487deb0c6..d4c06f2d295 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1715,3 +1715,5 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       vent, and injector
   someone543:
   - rscadd: FLARE added to Tycoon
+  - rscadd: Added lift button to Gladius mining hanger
+  - bugfix: fixed Gladius cell lockers not being genpop lockers
diff --git a/html/changelogs/AutoChangeLog-pr-2530.yml b/html/changelogs/AutoChangeLog-pr-2530.yml
deleted file mode 100644
index c995cca4060..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2530.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: someone543
-delete-after: true
-changes:
-  - rscadd: Added lift button to Gladius mining hanger
-  - bugfix: fixed Gladius cell lockers not being genpop lockers

From e486a252723a9b71546fe01836cae00d199cecdd Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Fri, 22 Sep 2023 00:12:55 +0000
Subject: [PATCH 19/19] Automatic changelog compile [ci skip]

---
 html/changelog.html | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index 280a7b9b733..c3b09aa3cf7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -271,12 +271,6 @@ <h3 class="author">covertcorvid updated:</h3>
 				<li class="rscdel">Removed arrivals shuttles</li>
 				<li class="tweak">Late joiners will now spawn near the cryostasis pods</li>
 			</ul>
-
-			<h2 class="date">21 July 2023</h2>
-			<h3 class="author">BlueHNT updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added wt550m9 rubber mag sprite</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>