Merge remote-tracking branch 'upstream/master' into node-18

BeeStation · Oct 20, 2023 · a8a4c6c · a8a4c6c
2 parents af1eef0 + 4aa7af2
commit a8a4c6c
Show file tree

Hide file tree

Showing 25 changed files with 357 additions and 203 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/__DEFINES/bans.dm b/code/__DEFINES/bans.dm
@@ -0,0 +1 @@
+#define BAN_OOC "OOC"
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