Merge remote-tracking branch 'upstream/master'

_maps/map_files/Research_Outpost/Research_Outpost.dmm

@@ -56,6 +56,10 @@
 /obj/effect/landmark/weed_node,
 /turf/open/floor/tile/dark,
 /area/outpost/science/research)
+"ap" = (
+/obj/docking_port/stationary/crashmode,
+/turf/open/floor/plating/ground/mars/random/dirt,
+/area/outpost/yard/south)
 "aq" = (
 /obj/structure/cable,
 /turf/open/floor/tile/dark/brown2{
@@ -305,10 +309,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating/asteroidfloor,
 /area/outpost/cargo)
-"bG" = (
-/obj/docking_port/stationary/crashmode,
-/turf/open/floor/plating/ground/mars/random/sand,
-/area/outpost/yard/central)
 "bH" = (
 /turf/open/floor/tile/dark/brown2{
 	dir = 5
@@ -1827,6 +1827,15 @@
 	},
 /turf/open/floor/tile/dark,
 /area/outpost/hallway/central)
+"iS" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/docking_port/stationary/crashmode,
+/turf/open/floor/tile/dark/brown2{
+	dir = 5
+	},
+/area/outpost/dormitories)
 "iT" = (
 /obj/effect/ai_node,
 /turf/open/floor/plating/ground/mars/cavetodirt,
@@ -5754,7 +5763,6 @@
 "Ba" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/manifold4w/green/hidden,
-/obj/docking_port/stationary/crashmode,
 /turf/open/floor/tile/dark/brown2/corner{
 	dir = 1
 	},
@@ -19813,7 +19821,7 @@ yW
 yW
 ai
 RD
-bG
+EA
 EA
 FH
 sY
@@ -21780,7 +21788,7 @@ aN
 ey
 VB
 aN
-bG
+EA
 EA
 oM
 CY
@@ -22330,7 +22338,7 @@ Hs
 Mb
 mN
 ES
-wa
+ap
 Ip
 kJ
 Ab
@@ -23370,7 +23378,7 @@ yb
 yb
 iL
 tK
-ZD
+iS
 ki
 ki
 ki

code/__DEFINES/loadout.dm

@@ -176,8 +176,6 @@ GLOBAL_LIST_INIT(commander_gear_listed_products, list(
 
 //A way to give them everything at once that still works with loadouts would be nice, but barring that make sure that your point calculation is set up so they don't get more than what they're supposed to
 GLOBAL_LIST_INIT(smartgunner_gear_listed_products, list(
-	/obj/effect/vendor_bundle/smartgunner_pistol = list(CAT_ESS, "SP-13 Smartpistol and KLTD Smart Goggles bundle", 0, "white"),
-	/obj/item/ammo_magazine/pistol/standard_pistol/smart_pistol = list(CAT_SGSUP, "SP-13 Smartpistol Magazine", 2, "sg-smartpistol"),
 	/obj/item/weapon/gun/rifle/standard_smartmachinegun = list(CAT_SGSUP, "SG-29 Smart Machine Gun", 29, "sg-machinegun"), //If a smartgunner buys a SG-29, then they will have 16 points to purchase 4 SG-29 drums
 	/obj/item/ammo_magazine/standard_smartmachinegun = list(CAT_SGSUP, "SG-29 Ammo Drum", 4, "sg-machinegun"),
 	/obj/item/weapon/gun/minigun/smart_minigun = list(CAT_SGSUP, "SG-85 Smart Handheld Gatling Gun", 27, "sg-minigun"), //If a smartgunner buys a SG-85, then they should be able to buy only 1 powerpack and 2 ammo bins
@@ -459,7 +457,7 @@ GLOBAL_LIST_INIT(medic_clothes_listed_products, list(
 GLOBAL_LIST_INIT(smartgunner_clothes_listed_products, list(
 		/obj/effect/vendor_bundle/basic_smartgunner = list(CAT_STD, "Standard kit", 0, "white"),
 		/obj/effect/vendor_bundle/basic_jaeger_smartgunner = list(CAT_STD, "Essential Jaeger Kit", 0, "white"),
-		/obj/effect/vendor_bundle/robot/essentials = list(CAT_STD, "Essential Combat Robot Kit", 0, "white"),
+		/obj/effect/vendor_bundle/robot/essentials_smartgunner = list(CAT_STD, "Essential Combat Robot Kit", 0, "white"),
 		/obj/effect/vendor_bundle/xenonauten_light = list(CAT_AMR, "Xenonauten light armor kit", 0, "orange"),
 		/obj/effect/vendor_bundle/xenonauten_medium = list(CAT_AMR, "Xenonauten medium armor kit", 0, "orange"),
 		/obj/effect/vendor_bundle/xenonauten_heavy = list(CAT_AMR, "Xenonauten heavy armor kit", 0, "orange"),

code/datums/gamemodes/campaign/loadout_items/_TGMC/secondaries.dm

@@ -143,6 +143,7 @@
 
 /datum/loadout_item/secondary/gun/marine/db_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder)
 	wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, SLOT_IN_HOLSTER)
+	wearer.equip_to_slot_or_del(new item_typepath(wearer), SLOT_IN_HOLSTER)
 
 //non-standard
 /datum/loadout_item/secondary/machete

code/game/objects/items/storage/holsters.dm

@@ -726,7 +726,7 @@
 
 /obj/item/storage/holster/belt/pistol/smart_pistol
 	name = "\improper SP-13 holster rig"
-	desc = "A holster belt, which holds SP-13 smartpistol and magazines for it."
+	desc = "A holster belt, which holds SP-13 smart machinepistol and magazines for it."
 
 /obj/item/storage/holster/belt/pistol/smart_pistol/full/Initialize(mapload)
 	. = ..()

code/game/objects/machinery/vending/new_marine_vendors.dm

@@ -619,6 +619,7 @@
 		/obj/item/clothing/shoes/marine/full,
 		/obj/item/clothing/gloves/marine,
 		/obj/item/storage/box/MRE,
+		/obj/item/clothing/glasses/night/m56_goggles,
 	)
 
 /obj/effect/vendor_bundle/basic_jaeger_smartgunner
@@ -627,6 +628,7 @@
 		/obj/item/clothing/shoes/marine/full,
 		/obj/item/clothing/gloves/marine,
 		/obj/item/storage/box/MRE,
+		/obj/item/clothing/glasses/night/m56_goggles,
 		/obj/item/facepaint/green,
 	)
 
@@ -725,15 +727,6 @@
 		/obj/item/circuitboard/apc,
 	)
 
-/obj/effect/vendor_bundle/smartgunner_pistol
-	gear_to_spawn = list(
-		/obj/item/clothing/glasses/night/m56_goggles,
-		/obj/item/storage/holster/belt/pistol/smart_pistol,
-		/obj/item/weapon/gun/pistol/smart_pistol,
-		/obj/item/ammo_magazine/pistol/standard_pistol/smart_pistol,
-		/obj/item/ammo_magazine/pistol/standard_pistol/smart_pistol,
-	)
-
 /obj/effect/vendor_bundle/leader
 	gear_to_spawn = list(
 		/obj/item/explosive/plastique,
@@ -928,6 +921,16 @@
 		/obj/item/clothing/under/marine/robotic,
 		/obj/item/tool/weldingtool,
 		/obj/item/stack/cable_coil,
+
+	)
+
+
+/obj/effect/vendor_bundle/robot/essentials_smartgunner
+	gear_to_spawn = list(
+		/obj/item/clothing/under/marine/robotic,
+		/obj/item/tool/weldingtool,
+		/obj/item/stack/cable_coil,
+		/obj/item/clothing/glasses/night/m56_goggles,
 	)
 
 /obj/effect/vendor_bundle/robot/light_armor

code/game/objects/structures/razorwire.dm

@@ -211,10 +211,7 @@
 	return ..()
 
 /obj/structure/razorwire/update_icon_state()
-	. = ..()
-	var/health_percent = round(obj_integrity/max_integrity * 100)
-	var/remaining = CEILING(health_percent, 25)
-	icon_state = "[base_icon_state]_[remaining]"
+	icon_state = "[base_icon_state]_[CEILING(ROUND_UP(obj_integrity/max_integrity * 100), 25)]"
 
 /obj/structure/razorwire/effect_smoke(obj/effect/particle_effect/smoke/S)
 	. = ..()

code/modules/mob/living/carbon/xenomorph/castes/puppet/puppet.dm

@@ -43,14 +43,6 @@
 	else
 		adjustBruteLoss(-5)
 
-/mob/living/carbon/xenomorph/puppet/can_receive_aura(aura_type, atom/source, datum/aura_bearer/bearer)
-	. = ..()
-	var/atom/movable/master = weak_master?.resolve()
-	if(!master)
-		return
-	if(source != master) //puppeteer phero only
-		return FALSE
-
 /mob/living/carbon/xenomorph/puppet/med_hud_set_status()
 	. = ..()
 	hud_set_blessings()

code/modules/mob/living/carbon/xenomorph/castes/widow/castedatum_widow.dm

@@ -35,6 +35,9 @@
 	// *** Defense *** //
 	soft_armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 15, BIO = 10, FIRE = 15, ACID = 10)
 
+	// *** Pheromones *** //
+	aura_strength = 2 //Widows aura is the same as drones.
+
 	// *** Minimap Icon *** //
 	minimap_icon = "widow"
 
@@ -60,6 +63,10 @@
 		/datum/action/ability/xeno_action/attach_spiderlings,
 		/datum/action/ability/activable/xeno/cannibalise,
 		/datum/action/ability/activable/xeno/spiderling_mark,
+		/datum/action/ability/xeno_action/pheromones,
+		/datum/action/ability/xeno_action/pheromones/emit_recovery,
+		/datum/action/ability/xeno_action/pheromones/emit_warding,
+		/datum/action/ability/xeno_action/pheromones/emit_frenzy,
 	)
 
 /datum/xeno_caste/widow/on_caste_applied(mob/xenomorph)
@@ -102,4 +109,8 @@
 		/datum/action/ability/activable/xeno/spiderling_mark,
 		/datum/action/ability/xeno_action/sow,
 		/datum/action/ability/activable/xeno/web_hook,
+		/datum/action/ability/xeno_action/pheromones,
+		/datum/action/ability/xeno_action/pheromones/emit_recovery,
+		/datum/action/ability/xeno_action/pheromones/emit_warding,
+		/datum/action/ability/xeno_action/pheromones/emit_frenzy,
 	)

code/modules/projectiles/guns/pistols.dm

@@ -833,43 +833,37 @@ It is a modified Beretta 93R, and can fire three round burst or single fire. Whe
 		/obj/item/attachable/lace,
 	)
 
-// Smart pistol, based on Calico M-950
+// Smart pistol, based on the MP-9.
 /obj/item/weapon/gun/pistol/smart_pistol
-	name = "\improper SP-13 smart pistol"
-	desc = "The SP-13 is a IFF-capable sidearm used by the TerraGov Marine Corps. A cutting-edge miniaturization technology allows mounting of a KTLD IFF system on the pistol, albeit at high manufactoring cost and the usual specialized training required to use such a pistol. Unique design feature high-capacity mag on top of the barrel, with integrated sight."
-	icon = 'icons/obj/items/guns/pistols64.dmi'
+	name = "\improper SP-13 smart machinepistol"
+	desc = "The SP-13 is a IFF-capable sidearm used by the TerraGov Marine Corps. Cutting edge advancements in cost cutting allows for anyone to use this pistol without training due to the simplified KTLD system used at the cost of the barrel muzzle device. Uses 9mm."
 	icon_state = "sp13"
 	worn_icon_state = "sp13"
 	caliber = CALIBER_9X19 //codex
-	max_shells = 30 //codex
-	fire_sound = 'sound/weapons/guns/fire/tp14.ogg' //same bullets, same sound
+	max_shells = 40 //codex
+	fire_sound = 'sound/weapons/guns/fire/tp14.ogg'
 	reload_sound = 'sound/weapons/guns/interact/tp14_reload.ogg'
 	default_ammo_type = /obj/item/ammo_magazine/pistol/standard_pistol/smart_pistol
 	allowed_ammo_types = list(/obj/item/ammo_magazine/pistol/standard_pistol/smart_pistol)
 	attachable_allowed = list(
-		/obj/item/attachable/suppressor,
 		/obj/item/attachable/reddot,
 		/obj/item/attachable/motiondetector,
+		/obj/item/attachable/magnetic_harness,
 		/obj/item/attachable/flashlight,
-		/obj/item/attachable/verticalgrip,
-		/obj/item/attachable/lasersight,
-		/obj/item/attachable/gyro,
-		/obj/item/attachable/lace,
 	)
 
 	gun_features_flags = GUN_AMMO_COUNTER|GUN_IFF|GUN_SMOKE_PARTICLES
-	gun_skill_category = SKILL_SMARTGUN
 	actions_types = list() // Inherits aimmode, but has IFF so..
 	gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC, GUN_FIREMODE_SEMIAUTO)
 
 	attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 20,"rail_x" = 13, "rail_y" = 23, "under_x" = 19, "under_y" = 13, "stock_x" = 21, "stock_y" = 17)
 
-	aim_slowdown = 0.2
-	wield_delay = 0.6 SECONDS
+	aim_slowdown = 0.35
+	wield_delay = 0.65 SECONDS
 	fire_delay = 0.2 SECONDS
 	accuracy_mult = 1.2
 	accuracy_mult_unwielded = 0.85
-	scatter = 3
-	scatter_unwielded = 7
-	recoil = -2
+	damage_falloff_mult = 0.75
+	scatter = 0
+	scatter_unwielded = 8
 	recoil_unwielded = 2

code/modules/projectiles/magazines/pistols.dm

@@ -261,7 +261,7 @@
 	caliber = CALIBER_9X19
 	icon_state = "tx13"
 	icon_state_mini = "mag_pistol_tube"
-	max_rounds = 30
+	max_rounds = 40
 	w_class = WEIGHT_CLASS_SMALL
 	default_ammo = /datum/ammo/bullet/pistol/ap
 

code/modules/reqs/supplypacks.dm

@@ -827,19 +827,20 @@ WEAPONS
 /datum/supply_packs/weapons/rocketsledge
 	name = "Rocket Sledge"
 	contains = list(/obj/item/weapon/twohanded/rocketsledge)
-	cost = 600
+	cost = 850
 
 /datum/supply_packs/weapons/chainsaw
 	name = "Chainsaw"
 	contains = list(/obj/item/weapon/twohanded/chainsaw)
 	cost = 500
 
 /datum/supply_packs/weapons/smart_pistol
-	name = "TX13 smartpistol"
+	name = "TX13 smart machinepistol"
 	contains = list(/obj/item/weapon/gun/pistol/smart_pistol)
-	cost = 150
+	cost = 250
+
 /datum/supply_packs/weapons/smart_pistol_ammo
-	name = "TX13 smartpistol ammo"
+	name = "TX13 smart machinepistol ammo"
 	contains = list(/obj/item/ammo_magazine/pistol/standard_pistol/smart_pistol)
 	cost = 10
 

html/changelogs/archive/2024-11.yml

@@ -9,3 +9,19 @@
   - balance: Roboticist survivor now has a skink drone instead of a buildasentry.
   ivanmixo:
   - bugfix: Fixed light break helper complaining about already broken lights
+2024-11-02:
+  blackdav123:
+  - balance: Moved some crash landing sites on Research Outpost.
+  - balance: Bluesummers is a bit easier for marines now.
+  yyzsong:
+  - balance: Rocket sledge price 600 -> 850
+2024-11-08:
+  Lumipharon:
+  - bugfix: 'Campaign: Fixed SH-34 secondary not spawning'
+2024-11-10:
+  Lumipharon:
+  - bugfix: fixed razorwire icons occasionally erroring out
+2024-11-11:
+  Aporhtonoma:
+  - balance: puppeters puppets benefit from pheromones other xeno emit.
+  - balance: Widow can now emit drone level pheromones