Merge branch 'master' into Thruster

code/modules/clothing/head/helmet.dm

@@ -559,11 +559,17 @@
 	item_state = "solgov_envirohelm"
 
 /obj/item/clothing/head/helmet/operator
-	name = "\improper Operator helmet"
+	name = "\improper operator helmet"
 	desc = "A robust combat helmet commonly employed by Syndicate forces, regardless of alignment."
 	icon_state = "operator"
 	item_state = "operator"
 
+/obj/item/clothing/head/helmet/medical
+	name = "\improper trauma team helmet"
+	desc = "A robust combat helmet commonly employed by cybersun medical trauma teams, with its distinctive turquoise."
+	icon_state = "traumahelm"
+	item_state = "traumahelm"
+
 /obj/item/clothing/head/helmet/bulletproof/m10
 	name = "\improper M10 pattern Helmet"
 	desc = "A classic looking helmet, derived from numerous convergently-similar designs from all across inhabited space. A faded tag reads: 'The difference between an open-casket and closed-casket funeral. Wear on head for best results.'"

code/modules/clothing/head/jobs.dm

@@ -184,6 +184,12 @@
 	name = "syndicate cap"
 	desc = "A black cap fit for a high ranking syndicate officer."
 
+/obj/item/clothing/head/HoS/cybersun
+	name = "cybersun hat"
+	desc = "A crimson-red hat fit for a high ranking cybersun officer."
+	icon_state = "cybersunhat"
+	item_state = "cybersunhat"
+
 /obj/item/clothing/head/HoS/beret/syndicate
 	name = "syndicate beret"
 	desc = "A black beret with thick armor padding inside. Stylish and robust."

code/modules/clothing/head/soft_caps.dm

@@ -137,6 +137,13 @@
 	dog_fashion = null
 
 /obj/item/clothing/head/soft/cybersun
+	name = "cybersun agent cap"
+	desc = "A black baseball hat emblazoned with a reflective Cybersun patch."
+	icon_state = "agentsoft"
+	soft_type = "black"
+	dog_fashion = null
+
+/obj/item/clothing/head/soft/cybersun/medical
 	name = "cybersun medic cap"
 	desc = "A turquoise baseball hat emblazoned with a reflective cross. Typical of Cybersun Industries field medics."
 	icon_state = "cybersunsoft"

code/modules/clothing/outfits/syndicate.dm

@@ -67,10 +67,10 @@
 /datum/outfit/job/syndicate/assistant/cybersun
 	name = "Junior Agent (Cybersun)"
 
-	uniform = /obj/item/clothing/under/syndicate
+	uniform = /obj/item/clothing/under/syndicate/cybersun
 	shoes = /obj/item/clothing/shoes/jackboots
 	r_pocket = /obj/item/radio
-	head = /obj/item/clothing/head/soft/black
+	head = /obj/item/clothing/head/soft/cybersun
 
 /datum/outfit/job/syndicate/assistant/twink
 	name = "Deck Assistant (Twinkleshine)"
@@ -261,10 +261,10 @@
 /datum/outfit/job/syndicate/captain/cybersun
 	name = "Captain (Cybersun)"
 
-	uniform = /obj/item/clothing/under/suit/black_really
-	head = /obj/item/clothing/head/HoS/syndicate
+	uniform = /obj/item/clothing/under/syndicate/cybersun/officer
+	suit = /obj/item/clothing/suit/armor/vest/capcarapace/cybersun
+	head = /obj/item/clothing/head/HoS/cybersun
 	gloves = /obj/item/clothing/gloves/combat
-	suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
 
 
 //cargo tech
@@ -405,9 +405,10 @@
 	name = "Intelligence Officer (Cybersun)"
 
 	ears = /obj/item/radio/headset/syndicate/alt
-	uniform = /obj/item/clothing/under/suit/charcoal
+	uniform = /obj/item/clothing/under/syndicate/cybersun/officer
+	suit = /obj/item/clothing/suit/cybersun_suit
 	shoes = /obj/item/clothing/shoes/jackboots
-	head = /obj/item/clothing/head/HoS/syndicate
+	head = /obj/item/clothing/head/HoS/cybersun
 	gloves = /obj/item/clothing/gloves/combat
 	id = /obj/item/card/id/syndicate_command/crew_id
 	r_pocket = /obj/item/kitchen/knife/combat/survival
@@ -488,7 +489,7 @@
 /datum/outfit/job/syndicate/doctor/cybersun
 	name = "Medical Doctor (Cybersun)"
 
-	uniform = /obj/item/clothing/under/syndicate/cybersun
+	uniform = /obj/item/clothing/under/syndicate/medic
 	accessory = /obj/item/clothing/accessory/armband/medblue
 	shoes = /obj/item/clothing/shoes/jackboots
 
@@ -518,7 +519,7 @@
 	head = /obj/item/clothing/head/soft/paramedic
 	suit =  /obj/item/clothing/suit/toggle/labcoat/paramedic
 	alt_suit = /obj/item/clothing/suit/apron/surgical
-	gloves = /obj/item/clothing/gloves/color/latex/nitrile
+	gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
 	belt = /obj/item/storage/belt/medical/paramedic
 	id = /obj/item/card/id
 	l_pocket = /obj/item/pda/medical
@@ -533,15 +534,15 @@
 	name = "Field Medic (Cybersun Industries)"
 
 	uniform = /obj/item/clothing/under/syndicate/medic
-	head = /obj/item/clothing/head/soft/cybersun
+	head = /obj/item/clothing/head/soft/cybersun/medical
 	shoes = /obj/item/clothing/shoes/combat
 	suit = /obj/item/clothing/suit/toggle/labcoat/raincoat
 
 /datum/outfit/job/syndicate/paramedic/twink
 	name = "Medic (Twinkleshine)"
 
 	gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
-	alt_uniform = /obj/item/clothing/under/syndicate/cybersun
+	uniform = /obj/item/clothing/under/syndicate/medic
 	glasses = /obj/item/clothing/glasses/hud/health
 	belt = /obj/item/storage/belt/medical
 	back = /obj/item/storage/backpack/duffelbag/syndie/med
@@ -734,9 +735,9 @@
 
 	id = /obj/item/card/id/syndicate_command/crew_id
 	ears = /obj/item/radio/headset
-	uniform = /obj/item/clothing/under/syndicate
+	uniform = /obj/item/clothing/under/syndicate/cybersun
 	accessory = /obj/item/clothing/accessory/armband/cargo
-	head = /obj/item/clothing/head/soft/black
+	head = /obj/item/clothing/head/soft/cybersun
 	r_pocket = /obj/item/radio
 
 /datum/outfit/job/syndicate/miner/gec
@@ -818,8 +819,8 @@
 /datum/outfit/job/syndicate/engineer/cybersun
 	name = "Engineer (Cybersun)"
 
-	uniform = /obj/item/clothing/under/syndicate/cybersun
+	uniform = /obj/item/clothing/under/syndicate/cybersun/research
 	shoes = /obj/item/clothing/shoes/workboots
 	r_pocket = /obj/item/radio
-	head = /obj/item/clothing/head/beanie/black
+	head = /obj/item/clothing/head/soft/cybersun
 	accessory = /obj/item/clothing/accessory/armband/engine

code/modules/clothing/suits/armor.dm

@@ -56,6 +56,11 @@
 	name = "large tactical armor vest"
 	icon_state = "marine_heavy"
 
+/obj/item/clothing/suit/armor/vest/marine/trauma
+	name = "cybersun trauma team armor vest"
+	icon_state = "traumavest"
+	desc = "A set of stamped plasteel armor plates decorated with a medical cross and colors associated with the medical division of Cybersun."
+
 /obj/item/clothing/suit/armor/vest/old
 	name = "degrading armor vest"
 	desc = "Older generation Type 1 armored vest. Due to degradation over time the vest is far less maneuverable to move in."
@@ -143,6 +148,11 @@
 	desc = "A sinister looking vest of advanced armor worn over a black and red fireproof jacket. The gold collar and shoulders denote that this belongs to a high ranking syndicate officer."
 	icon_state = "carapace_syndie"
 
+/obj/item/clothing/suit/armor/vest/capcarapace/cybersun
+	name = "cybersun captain's haori"
+	desc = "An extraordinarily fashionable haori, utilized by cybersun captains. Weaved with armored fabric to protect the user from gunshots."
+	icon_state = "cybersunhaori"
+
 /obj/item/clothing/suit/armor/vest/capcarapace/alt
 	name = "captain's parade jacket"
 	desc = "For when an armoured vest isn't fashionable enough."

code/modules/clothing/suits/miscellaneous.dm

@@ -343,6 +343,12 @@
  * Misc
  */
 
+/obj/item/clothing/suit/cybersun_suit
+	name = "cybersun suit"
+	desc = "A plain white suit commonly used by Cybersun's officers."
+	icon_state = "cybersun_suit"
+	item_state = "cybersun_suit"
+
 /obj/item/clothing/suit/straight_jacket
 	name = "straight jacket"
 	desc = "A suit that completely restrains the wearer. Manufactured by Antyphun Corp." //Straight jacket is antifun

code/modules/clothing/under/syndicate.dm

@@ -115,19 +115,33 @@
 	supports_variations = DIGITIGRADE_VARIATION | KEPORI_VARIATION
 
 /obj/item/clothing/under/syndicate/cybersun
+	name = "cybersun jumpsuit"
+	desc = "The standard jumpsuit used by the agents employed by Cybersun, in its distinctive half-black-half-white aesthetic."
+	icon_state = "cybersun_agent"
+	alt_covers_chest = TRUE
+
+/obj/item/clothing/under/syndicate/cybersun/research
 	name = "Cybersun coveralls"
 	desc = "Nomex coveralls worn by workers and research personnel employed by Cybersun industries."
 	icon_state = "cybersun"
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 100)
 	alt_covers_chest = TRUE
 	supports_variations = DIGITIGRADE_VARIATION | KEPORI_VARIATION
 
+/obj/item/clothing/under/syndicate/cybersun/officer
+	name = "cybersun officer's suit"
+	desc = "A crimson-red suit used by the officers employed by Cybersun."
+	icon_state = "cybersun_officer"
+	alt_covers_chest = TRUE
+	supports_variations = DIGITIGRADE_VARIATION
+
 /obj/item/clothing/under/syndicate/medic
 	name = "Cybersun medical jumpsuit"
 	desc = "Sterile coveralls worn by Cybersun Industries field medics for protection against biological hazards."
 	icon_state = "cybersun_med"
 	permeability_coefficient = 0.5
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
+	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION | KEPORI_VARIATION
 
 /obj/item/clothing/under/syndicate/medic/skirt
 	name = "Cybersun medical jumpskirt"

code/modules/overmap/missions/research_mission.dm

@@ -129,7 +129,7 @@
 		use_power = NO_POWER_USE
 	power_change() // calls update_appearance(), makes sure we're powered
 
-/obj/machinery/mission_scanner/update_icon_state()
+/obj/machinery/mission_scanner/update_appearance(updates)
 	. = ..()
 	if(is_operational)
 		icon_state = "scanner_power"

code/modules/overmap/ships/controlled_ship_datum.dm

@@ -77,9 +77,9 @@
 		shuttle_area.rename_area("[new_name] [initial(shuttle_area.name)]")
 	if(!force)
 		COOLDOWN_START(src, rename_cooldown, 5 MINUTES)
-		if(shuttle_port.virtual_z() == null)
+		if(shuttle_port?.virtual_z() == null)
 			return TRUE
-		priority_announce("The [oldname] has been renamed to the [new_name].", "Docking Announcement", sender_override = new_name, zlevel = shuttle_port.virtual_z())
+		priority_announce("The [oldname] has been renamed to the [new_name].", "Docking Announcement", sender_override = new_name, zlevel = shuttle_port?.virtual_z())
 	return TRUE
 
 /**

html/changelogs/AutoChangeLog-pr-2479.yml

@@ -0,0 +1,4 @@
+author: Bjarl
+changes:
+  - {bugfix: The polymodial sensor array now properly changes icon_state.}
+delete-after: true

html/changelogs/AutoChangeLog-pr-2484.yml

@@ -0,0 +1,6 @@
+author: PositiveEntropy
+changes:
+  - {bugfix: Cybersun outfits have been adjusted to be less syndicate-generalist and
+      more Cybersun.}
+  - {imageadd: 'Cybersun has received a full visual overhaul, as well as new goodies!'}
+delete-after: true

html/changelogs/archive/2023-11.yml

@@ -51,3 +51,24 @@
   - code_imp: syndicate outfits have been repathed. Please report anything weird.
   retlaw34:
   - rscadd: Adds a lot of new pAI faces! pAIs rejoice!
+2023-11-15:
+  Bjarl:
+  - rscadd: Syndicate groups have reported new models of turrets being attached to
+      their ships.
+  - rscadd: Static Anomalies are now even WORSE. Not balance wise. Roleplay wise.
+  FalloutFalcon:
+  - rscadd: 3 new Trickwines! Prism, Hearth, and Force
+  - tweak: tweaked the old Trickwines to be slightly more balanced
+  - rscadd: srm tree and Trickwine distiller
+  - tweak: copy big mortar code to small mortar so you can chose between grinding
+      and juicing
+  - refactor: splits smoke flags for more control over chemical reactions
+  - server: Blackbox now records more info about chems
+  GenericDM:
+  - tweak: you will now be warned before succumbing when talking in hardcrit
+  thgvr:
+  - rscadd: Gas overlays should now look normal on turfs with a color var set.
+  - rscadd: Saunas, craftable with wooden planks. Uses wood for fuel, and requires
+      water splashed on the sauna.
+  - rscadd: Towels. You can use them in-hand to change it from waist, chest, or head.
+  - bugfix: PGF items now have real names and descriptions.