Merge remote-tracking branch 'origin/master'

BeeStation · Sep 26, 2023 · 506f3f7 · 506f3f7
2 parents e05ec9c + e486a25
commit 506f3f7
Show file tree

Hide file tree

Showing 22 changed files with 246 additions and 51 deletions.
diff --git a/_maps/map_files/Gladius/Gladius1.dmm b/_maps/map_files/Gladius/Gladius1.dmm
diff --git a/_maps/map_files/Gladius/Gladius2.dmm b/_maps/map_files/Gladius/Gladius2.dmm
diff --git a/_maps/map_files/Hammerhead/Hammerhead.dmm b/_maps/map_files/Hammerhead/Hammerhead.dmm
diff --git a/_maps/map_files/Snake/snake_lower.dmm b/_maps/map_files/Snake/snake_lower.dmm
diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm
diff --git 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/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

diff --git a/html/changelog.html b/html/changelog.html
@@ -56,6 +56,33 @@
 		-->
 		<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>
+				<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>
 			<h3 class="author">Bokkiewokkie updated:</h3>
 			<ul class="changes bgimages16">
@@ -244,26 +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>
-
-			<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>
-
-			<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>

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
@@ -1698,3 +1698,22 @@ 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
+  - rscadd: Added lift button to Gladius mining hanger
+  - bugfix: fixed Gladius cell lockers not being genpop lockers
diff --git 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
@@ -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/__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