Merge branch 'XM4_MD' of https://github.com/MobiusWon/cmss13 into XM4_MD

code/game/area/almayer.dm

@@ -423,7 +423,7 @@
 
 /area/almayer/maint/lower
 	name = "\improper Lower Deck Maintenance"
-	icon_state = "lowerhull"//tempory until i get a proper one.
+	icon_state = "lowerhull"
 	fake_zlevel = 2 // lowerdeck
 
 /area/almayer/maint/lower/constr
@@ -435,16 +435,33 @@
 /area/almayer/maint/lower/cryo_cells
 	name = "\improper Lower Deck Cryo Cells Maintenance"
 
-// hull areas
+// Upper maintainance areas
+/area/almayer/maint/upper
+	name = "\improper Upper Deck Maintenance"
+	icon_state = "upperhull"
+	fake_zlevel = 1 // upperdeck
 
+/area/almayer/maint/upper/mess
+	name = "\improper Upper Deck Mess Maintenance"
+
+/area/almayer/maint/upper/u_m_p
+	name = "\improper Upper Deck Port-Midship Maintenance"
+
+/area/almayer/maint/upper/u_m_s
+	name = "\improper Upper Deck Starboard-Midship Maintenance"
+
+// hull areas
 /area/almayer/maint/hull
 
 // lower deck hull areas
-
 /area/almayer/maint/hull/lower
 	name = "\improper Lower Deck Hull"
 	icon_state = "lowerhull"
 	fake_zlevel = 2 // lowerdeck
+// stairs.
+
+/area/almayer/maint/hull/lower/stairs
+	name = "\improper Lower Deck Stairs Hull"
 
 /area/almayer/maint/hull/lower/stern
 	name = "\improper Lower Deck Stern Hull"
@@ -480,6 +497,22 @@
 	icon_state = "upperhull"
 	fake_zlevel = 1 // upperdeck
 
+// Stairs.
+/area/almayer/maint/hull/upper/stairs
+	name = "\improper Upper Deck Stairs Hull"
+
+/area/almayer/maint/hull/upper/p_bow
+	name = "\improper Upper Deck Port-Bow Hull"
+
+/area/almayer/maint/hull/upper/s_bow
+	name = "\improper Upper Deck Starboard-Bow Hull"
+
+/area/almayer/maint/hull/upper/p_stern
+	name = "\improper Upper Deck Port-Stern Hull"
+
+/area/almayer/maint/hull/upper/s_stern
+	name = "\improper Upper Deck Starboard-Stern Hull"
+
 /area/almayer/maint/hull/upper/u_f_s
 	name = "\improper Upper Deck Fore-Starboard Hull"
 

code/modules/clothing/under/ties.dm

@@ -377,7 +377,8 @@
 
 /obj/item/clothing/accessory/poncho/Initialize()
 	. = ..()
-	select_gamemode_skin(type)
+	// Only do this for the base type '/obj/item/clothing/accessory/poncho'.
+	select_gamemode_skin(/obj/item/clothing/accessory/poncho)
 	inv_overlay = image("icon" = 'icons/obj/items/clothing/ties_overlay.dmi', "icon_state" = "[icon_state]")
 	update_icon()
 

code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm

@@ -313,7 +313,7 @@
 	if(!choice)
 		return
 	var/evo_points_per_larva = 250
-	var/required_larva = 3
+	var/required_larva = 1
 	var/mob/living/carbon/xenomorph/target_xeno
 
 	for(var/mob/living/carbon/xenomorph/xeno in user_xeno.hive.totalXenos)

html/changelogs/AutoChangeLog-pr-5505.yml

@@ -0,0 +1,4 @@
+author: "InsaneRed"
+delete-after: True
+changes:
+  - balance: "You now only need 1 burrowed larva to trade it for evolution as Queen instead of 3 burrowed larva."

html/changelogs/AutoChangeLog-pr-5572.yml

@@ -0,0 +1,10 @@
+author: "Huffie56"
+delete-after: True
+changes:
+  - bugfix: "fix upper deck having disposal pipes west of CIC going on a loop."
+  - bugfix: "fix south of alpha briefing having disconnected pipes and disposal from the main loops."
+  - bugfix: "fix south shooting range having is disposal outside and disposal pipe east going over vents."
+  - bugfix: "fix pipes in req rest room going in the walls or windows."
+  - bugfix: "fix pipes in control tower in hangar going bellow the windows instead of the doors."
+  - refactor: "added a few maintenance areas(mess, Port and starboard Midship) ,a few other hull areas( lower and upper stair hull, Port and starboard stern and bow hull)"
+  - maptweak: "corrected a colored tile west of CIC being the wrong sprite."

html/changelogs/AutoChangeLog-pr-5581.yml

@@ -0,0 +1,5 @@
+author: "mullenpaul"
+delete-after: True
+changes:
+  - code_imp: "fixes sticky messages in STUI"
+  - refactor: "STUI is now a TSX component"

html/changelogs/AutoChangeLog-pr-5582.yml

@@ -0,0 +1,4 @@
+author: "SabreML"
+delete-after: True
+changes:
+  - bugfix: "Fixed ponchos not having icon states on specific maps."