Merge remote-tracking branch 'upstream/master' into PortsPsionics

Author: cowbot92

.github/guides/DOWNLOADING.md

@@ -10,7 +10,7 @@ code tab of https://github.com/yogstation13/Yogstation
 (note: this will use a lot of bandwidth if you wish to update and is a lot of
 hassle if you want to make any changes at all, so it's not recommended.)
 
-## The Yogstation codebase recommends compiling using version [514.1589](https://www.byond.com/download/build/514/514.1589_byond.exe) and may potentially NOT work on newer or older versions.
+## The Yogstation codebase recommends compiling using version [514.1642](https://www.byond.com/download/build/514/514.1642_byond.exe) and may potentially NOT work on newer or older versions.
 
 ## :exclamation: How to compile :exclamation:
 

.github/workflows/turdis.yml

@@ -193,7 +193,7 @@ jobs:
           cp yogstation.rsc artifacts
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: DMB + RSC ${{matrix.map}}
           path: ${{github.workspace}}/artifacts

_maps/RandomZLevels/caves.dmm

@@ -1401,7 +1401,7 @@
 /area/awaymission/caves/BMP_asteroid)
 "el" = (
 /obj/structure/closet/secure_closet/personal,
-/obj/item/gun/energy/laser/captain/scattershot,
+/obj/item/gun/energy/laser/scattershot,
 /turf/open/floor/wood,
 /area/awaymission/caves/northblock)
 "em" = (
@@ -1650,8 +1650,8 @@
 "fc" = (
 /obj/structure/closet/crate,
 /obj/item/paper/fluff/awaymissions/caves/shipment_receipt,
-/obj/item/gun/energy/laser/captain/scattershot,
-/obj/item/gun/energy/laser/captain/scattershot,
+/obj/item/gun/energy/laser/scattershot,
+/obj/item/gun/energy/laser/scattershot,
 /obj/item/gun/energy/laser,
 /obj/item/grenade/syndieminibomb/concussion,
 /obj/item/grenade/syndieminibomb/concussion,
@@ -1726,7 +1726,7 @@
 	},
 /obj/item/paper/fluff/awaymissions/caves/shipment_receipt,
 /obj/item/organ/eyes/robotic/thermals,
-/obj/item/gun/energy/laser/captain/scattershot,
+/obj/item/gun/energy/laser/scattershot,
 /obj/item/slimepotion/fireproof,
 /turf/open/floor/plating/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14"
@@ -1789,7 +1789,7 @@
 	},
 /area/awaymission/caves/BMP_asteroid/level_two)
 "fw" = (
-/obj/item/gun/energy/laser/captain/scattershot,
+/obj/item/gun/energy/laser/scattershot,
 /turf/open/floor/plating/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14"
 	},

_maps/map_files/generic/CentCom.dmm

@@ -18388,7 +18388,7 @@
 	dir = 8
 	},
 /obj/item/gun/energy/gravity_gun,
-/obj/item/gun/energy/laser/captain/scattershot{
+/obj/item/gun/energy/laser/scattershot{
 	pixel_y = 8
 	},
 /obj/item/gun/energy/wormhole_projector{

code/__DEFINES/food.dm

@@ -19,6 +19,7 @@
 #define SEAFOOD		(1<<18)
 #define MICE		(1<<19) //disliked/liked by anything that dislikes/likes any of RAW, MEAT, or GROSS, except felinids
 #define NUTS 		(1<<20)
+#define COFFEE 		(1<<21)
 
 /// A list of food type names, in order of their flags
 #define FOOD_FLAGS list( \

code/datums/traits/negative.dm

@@ -646,7 +646,8 @@
 	reagent_type = /datum/reagent/drug/caffeine
 	junkie_warning = "You suddenly feel like you need some caffeine..."
 	var/list/weighted_items = list(
-		/obj/item/reagent_containers/food/drinks/coffee = 200,
+		/obj/item/reagent_containers/food/drinks/soda_cans/icedcoffee = 200,
+		/obj/item/reagent_containers/food/drinks/coffee = 100, //who just carries around a styrofoam cup of coffee in their backpack
 		/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 100,
 		/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 100,
 		/obj/item/reagent_containers/food/drinks/mug/tea = 50,

code/game/mecha/equipment/mecha_equipment.dm

@@ -108,11 +108,9 @@
 		return FALSE
 	if(!chassis)
 		return FALSE
-	if(chassis.Adjacent(target))
-		if(!(range & MECHA_MELEE))
-			chassis.default_melee_attack(target)
-			return FALSE
-	else if(!(range & MECHA_RANGED))
+	if(!(range & MECHA_MELEE) && chassis.default_melee_attack(target))
+		return FALSE
+	if(!(range & MECHA_RANGED) && !chassis.Adjacent(target))
 		return FALSE
 	if(!equip_ready)
 		return FALSE

code/game/mecha/equipment/tools/other_tools.dm

@@ -575,3 +575,54 @@
 	if(chassis)
 		chassis.ejection_distance -= ejection_distance
 	. = ..()
+
+///// Coral Generator /////
+
+/obj/item/mecha_parts/mecha_equipment/coral_generator
+	name = "IA-C01G AORTA"
+	desc = "A highly classified emergent technology, burns raw redspace crystal to enhance mech movement, as a side effect the mech will emit a red glow, greatly increasing energy usage."
+	icon_state = "coral_engine" 
+	selectable = FALSE // your mech IS the weapon
+	var/minimum_damage = 10
+	var/structure_damage_mult = 4
+	var/list/hit_list = list()
+	equip_actions = list(/datum/action/innate/mecha/coral_overload_mode)
+
+/obj/item/mecha_parts/mecha_equipment/coral_generator/can_attach(obj/mecha/new_mecha)
+	if(istype(new_mecha, /obj/mecha/combat/gygax)) // no gygax stacking sorry
+		return FALSE
+	if(locate(type) in new_mecha.equipment)
+		return FALSE // no stacking multiple
+	return ..()
+
+/datum/action/innate/mecha/coral_overload_mode
+	name = "Coral Engine Overload"
+	button_icon_state = "mech_coral_overload_off"
+
+/datum/action/innate/mecha/coral_overload_mode/Activate(forced_state = null)
+	
+	if(chassis?.equipment_disabled) // If a EMP or something has messed a mech up return instead of activating -- Moogle
+		return
+	if(!owner || !chassis || chassis.occupant != owner)
+		return
+	if(!isnull(forced_state))
+		chassis.coral_leg_overload_mode = forced_state
+	else
+		chassis.coral_leg_overload_mode = !chassis.coral_leg_overload_mode
+	button_icon_state = "mech_coral_overload_[chassis.coral_leg_overload_mode ? "on" : "off"]"
+	chassis.log_message("Toggled coral engine overload.", LOG_MECHA)
+	if(chassis.coral_leg_overload_mode)
+		chassis.AddComponent(/datum/component/after_image, 0.5 SECONDS, 0.5, TRUE)
+		chassis.coral_leg_overload_mode = 1
+		chassis.step_in = min(1, round(chassis.step_in/2))
+		chassis.step_energy_drain = max(chassis.overload_step_energy_drain_min,chassis.step_energy_drain*chassis.leg_overload_coeff)
+		chassis.occupant_message(span_danger("You enable coral engine overload."))
+	else
+		var/datum/component/after_image/chassis_after_image = chassis.GetComponent(/datum/component/after_image)
+		if(chassis_after_image)
+			qdel(chassis_after_image)
+		chassis.coral_leg_overload_mode = 0
+		chassis.step_in = initial(chassis.step_in)
+		chassis.step_energy_drain = chassis.normal_step_energy_drain
+		chassis.occupant_message(span_notice("You disable coral engine overload."))
+	build_all_button_icons()

code/game/mecha/equipment/weapons/armor.dm

@@ -19,29 +19,29 @@
 /obj/item/mecha_parts/mecha_equipment/armor/attach(obj/mecha/new_chassis)
 	. = ..()
 	if(equip_ready)
-		new_chassis.armor.attachArmor(armor)
+		new_chassis.armor = new_chassis.armor.attachArmor(armor)
 
 /obj/item/mecha_parts/mecha_equipment/armor/detach(atom/moveto)
 	if(equip_ready)
-		chassis.armor.detachArmor(armor)
+		chassis.armor = chassis.armor.detachArmor(armor)
 	return ..()
 
 /obj/item/mecha_parts/mecha_equipment/armor/set_ready_state(state)
 	if(equip_ready != state)
 		if(state)
-			chassis.armor.attachArmor(armor)
+			chassis.armor = chassis.armor.attachArmor(armor)
 		else
-			chassis.armor.detachArmor(armor)
+			chassis.armor = chassis.armor.detachArmor(armor)
 	return ..()
 
 /obj/item/mecha_parts/mecha_equipment/armor/melee //what is that noise? A BAWWW from TK mutants.
 	name = "armor booster module (Close Combat Weaponry)"
-	desc = "Boosts exosuit armor against armed melee attacks. Requires energy to operate."
+	desc = "Boosts exosuit armor against armed melee attacks."
 	icon_state = "mecha_abooster_ccw"
 	armor = list(MELEE = 20, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 20, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, ELECTRIC = 0)
 
 /obj/item/mecha_parts/mecha_equipment/armor/ranged
 	name = "armor booster module (Ranged Weaponry)"
-	desc = "Boosts exosuit armor against ranged attacks. Completely blocks taser shots. Requires energy to operate."
+	desc = "Boosts exosuit armor against ranged attacks."
 	icon_state = "mecha_abooster_proj"
 	armor = list(MELEE = 0, BULLET = 15, LASER = 15, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, ELECTRIC = 0)

code/game/mecha/equipment/weapons/weapons.dm

@@ -200,6 +200,9 @@
 		chassis.default_melee_attack(target)
 	return TRUE
 
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/use(used)
+	return chassis?.cell?.use(used * energy_drain)
+
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun
 	equip_cooldown = 10
 	name = "Exosuit Proto-kinetic Accelerator"