Merge remote-tracking branch 'origin/master' into luciee

_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm

@@ -186,9 +186,7 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "O" = (
-/obj/item/claymore{
-	name = "Excalibur"
-	},
+/obj/item/claymore/ruin/excalibur,
 /obj/item/clothing/shoes/plate,
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/decal/cleanable/ash/large,

_maps/RandomRuins/LavaRuins/lavaland_surface_legionbarracks.dmm

@@ -82,11 +82,7 @@
 /area/ruin/unpowered)
 "S" = (
 /obj/structure/rack,
-/obj/item/claymore{
-	desc = "It's cracked and blunted";
-	force = 21;
-	name = "Ancient Sword"
-	},
+/obj/item/claymore/ruin,
 /obj/item/shield/riot/roman{
 	block_chance = 25;
 	desc = "Bears an inscription on the inside: <i>\"Necropolis venio domus\"</i>.";

code/game/objects/items/weaponry.dm

@@ -64,7 +64,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
 	force = 40
 	throwforce = 10
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = WEIGHT_CLASS_BULKY
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	block_chance = 50
 	sharpness = SHARP_EDGED
@@ -75,10 +75,25 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/claymore/Initialize()
 	. = ..()
 	AddComponent(/datum/component/butchering, 40, 105)
+	
+/obj/item/claymore/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+	if(attack_type == PROJECTILE_ATTACK)
+		final_block_chance = 0 //Don't bring a sword to a gunfight
+	return ..()
 
 /obj/item/claymore/suicide_act(mob/user)
 	user.visible_message(span_suicide("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
 	return(BRUTELOSS)
+	
+/obj/item/claymore/ruin
+	name = "ancient sword"
+	desc = "A cracked and blunted sword, clearly weathered over the ages."
+	force = 21
+	block_chance = 30
+	
+/obj/item/claymore/ruin/excalibur
+	name = "Excalibur"
+	desc = "A legendary sword passed down through the ages, though it seems to have lost its magic."
 
 /obj/item/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS
 	desc = "<b><i>THERE CAN BE ONLY ONE, AND IT WILL BE YOU!!!</i></b>\nActivate it in your hand to point to the nearest victim."
@@ -205,6 +220,24 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	name = new_name
 	playsound(user, 'sound/items/screwdriver2.ogg', 50, 1)
 
+/obj/item/claymore/bone
+	name = "Bone Sword"
+	desc = "Jagged pieces of bone are tied to what looks like a goliath's femur."
+	icon = 'icons/obj/weapons/swords.dmi'
+	icon_state = "bone_sword"
+	item_state = "bone_sword"
+	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
+	force = 15
+	throwforce = 10
+	armour_penetration = 15
+	w_class = WEIGHT_CLASS_HUGE
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+	block_chance = 30
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50)
+
 /obj/item/katana
 	name = "katana"
 	desc = "Woefully underpowered in D20."
@@ -801,20 +834,3 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 		to_chat(user, span_warning("[M] is too close to use [src] on."))
 		return
 	M.attack_hand(user)
-
-/obj/item/claymore/bone
-	name = "Bone Sword"
-	desc = "Jagged pieces of bone are tied to what looks like a goliaths femur."
-	icon = 'icons/obj/weapons/swords.dmi'
-	icon_state = "bone_sword"
-	item_state = "bone_sword"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
-	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
-	force = 15
-	throwforce = 10
-	armour_penetration = 15
-	w_class = WEIGHT_CLASS_NORMAL
-	hitsound = 'sound/weapons/bladeslice.ogg'
-	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
-	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50)

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

@@ -68,8 +68,11 @@
 						update_inv_hands()
 						I.pixel_x = initial(I.pixel_x)
 						I.pixel_y = initial(I.pixel_y)
-						I.transform = initial(I.transform)
-						throw_mode_off()
+						I.transform = initial(I.transform)	
+						//If() explanation: if we have a mind and a martial art that we can use, check if it has a block or deflect chance or it's sleeping carp
+						//Assuming any of that isnt true, then throw mode isnt helpful and it gets turned off. Otherwise, it stays on.
+						if(!(mind && mind.martial_art && mind.martial_art.can_use(src) && (mind.martial_art.deflection_chance || mind.martial_art.block_chance || mind.martial_art.id == "sleeping carp")))
+							throw_mode_off()
 						return TRUE
 	..()
 

html/changelog.html

@@ -58,6 +58,19 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">01 July 2022</h2>
+			<h3 class="author">Mqiib updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Throw mode stays on when it's beneficial to keep it on and you catch something.</li>
+				<li class="experiment">Oh no martial arts buffs</li>
+			</ul>
+			<h3 class="author">Skrem7 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Claymores are now baseline bulky, cannot block projectiles</li>
+				<li class="tweak">Bone sword now huge, less block chance</li>
+				<li class="tweak">All claymores in ruins are now unique items in code, have updated description, also damage/blockchance nerfed</li>
+			</ul>
+
 			<h2 class="date">28 June 2022</h2>
 			<h3 class="author">JamieD1 updated:</h3>
 			<ul class="changes bgimages16">
@@ -2550,26 +2563,6 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added a pipebomb for your IRA roleplay needs.</li>
 			</ul>
-
-			<h2 class="date">01 April 2022</h2>
-			<h3 class="author">Simplehorror updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Remove empty station trait announcements</li>
-			</ul>
-			<h3 class="author">TheGamerdk updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">AI cores should now update their icons correctly after coming online</li>
-			</ul>
-			<h3 class="author">ynot01 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed uber-spam exploit</li>
-			</ul>
-
-			<h2 class="date">30 March 2022</h2>
-			<h3 class="author">adamsong updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixed paper being blank when held to AI camera</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -32387,3 +32387,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Research now requires Toxins/Robotics Access and now has Doors
   redmoogle:
   - bugfix: Hand drill now works as a screwdriver for surgery
+2022-07-01:
+  Mqiib:
+  - tweak: Throw mode stays on when it's beneficial to keep it on and you catch something.
+  - experiment: Oh no martial arts buffs
+  Skrem7:
+  - tweak: Claymores are now baseline bulky, cannot block projectiles
+  - tweak: Bone sword now huge, less block chance
+  - tweak: All claymores in ruins are now unique items in code, have updated description,
+      also damage/blockchance nerfed