Merge remote-tracking branch 'upstream/master' into vehicle-autofire

cmss13-devs · Nov 10, 2023 · a418e1b · a418e1b
2 parents d779fe0 + 2c40fc7
commit a418e1b
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 38 deletions.
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
@@ -108,6 +108,11 @@
 	desc = "This banner depicts Delta Squad's motto. The Marines of Delta Squad adopted it after picking an old bomber movie for movie night a while back."
 	icon_state = "maximumeffort"
 
+/obj/structure/sign/banners/united_americas_flag
+	name = "\improper United Americas flag"
+	desc = "A flag of the United Americas. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
+	icon_state = "ua_flag"
+
 //=====================//
 // SEMIOTIC STANDARD  //
 //===================//

diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
@@ -907,8 +907,6 @@
 	name = "floor"
 	icon_state = "floor"
 	icon = 'icons/turf/shuttle.dmi'
-	allow_construction = FALSE
-	supports_surgery = FALSE
 
 /turf/open/shuttle/dropship
 	name = "floor"

diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
@@ -293,7 +293,7 @@
 	var/evolution_rate = 3 // Only has use if dynamic_evolution is false
 	var/evolution_bonus = 0
 
-	var/allow_no_queen_actions = FALSE
+	var/allow_no_queen_actions = TRUE
 	var/allow_no_queen_evo = FALSE
 	var/evolution_without_ovipositor = TRUE //Temporary for the roundstart.
 	/// Set to false if you want to prevent evolutions into Queens

diff --git a/icons/obj/structures/props/banners.dmi b/icons/obj/structures/props/banners.dmi
diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm
@@ -2249,6 +2249,10 @@
 "nM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/sign/banners/united_americas_flag{
+	pixel_x = -16;
+	pixel_y = 30
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -2888,9 +2892,6 @@
 "rX" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet,
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
-	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -5305,6 +5306,15 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/engineering)
+"Hd" = (
+/obj/structure/closet,
+/obj/structure/sign/banners/united_americas_flag{
+	pixel_y = 30
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/golden_arrow/dorms)
 "Hh" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -5801,6 +5811,11 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/prep_hallway)
+"KE" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/item/toy/plush/therapy,
+/turf/open/floor/plating/plating_catwalk,
+/area/golden_arrow/prep_hallway)
 "KH" = (
 /obj/vehicle/powerloader,
 /turf/open/floor/almayer,
@@ -5876,20 +5891,19 @@
 	pixel_y = 13
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/toy/plush/farwa{
+/obj/item/clothing/head/cmcap{
+	layer = 4.1;
+	pixel_x = -1;
+	pixel_y = 22
+	},
+/obj/item/toy/plush/therapy/red{
 	desc = "A USCM approved plush doll. It's not soft and hardly comforting!";
 	force = 15;
-	icon_state = "therapyred";
 	layer = 4.1;
 	name = "Sergeant Huggs";
 	pixel_y = 15;
 	throwforce = 15
 	},
-/obj/item/clothing/head/cmcap{
-	layer = 4.1;
-	pixel_x = -1;
-	pixel_y = 22
-	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -17325,7 +17339,7 @@ iK
 SO
 SY
 SO
-iK
+KE
 wn
 iK
 SO
@@ -18383,7 +18397,7 @@ ol
 rV
 Vr
 Vp
-Tk
+Hd
 wl
 FE
 wl

diff --git a/maps/shuttles/dropship_midway.dmm b/maps/shuttles/dropship_midway.dmm
@@ -5,7 +5,9 @@
 	},
 /area/shuttle/midway)
 "bm" = (
-/obj/structure/shuttle/part/dropship1/transparent/engine_right_exhaust,
+/obj/structure/shuttle/part/dropship1/transparent/engine_right_exhaust{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "bs" = (
@@ -26,7 +28,9 @@
 	},
 /area/shuttle/midway)
 "dB" = (
-/obj/structure/shuttle/part/dropship1/left_inner_wing_connector,
+/obj/structure/shuttle/part/dropship1/left_inner_wing_connector{
+	name = "\improper Midway"
+	},
 /turf/open/space/basic,
 /area/shuttle/midway)
 "dD" = (
@@ -40,7 +44,9 @@
 	},
 /area/shuttle/midway)
 "eu" = (
-/obj/structure/shuttle/part/dropship1/transparent/left_outer_bottom_wing,
+/obj/structure/shuttle/part/dropship1/transparent/left_outer_bottom_wing{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "go" = (
@@ -58,7 +64,9 @@
 	},
 /area/shuttle/midway)
 "gw" = (
-/obj/structure/shuttle/part/dropship2/transparent/engine_right_cap,
+/obj/structure/shuttle/part/dropship2/transparent/engine_right_cap{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "hl" = (
@@ -87,7 +95,9 @@
 /area/shuttle/midway)
 "im" = (
 /obj/structure/shuttle/part/dropship1/transparent/nose_top_left,
-/obj/structure/shuttle/part/dropship1/transparent/nose_top_left,
+/obj/structure/shuttle/part/dropship1/transparent/nose_top_left{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "iv" = (
@@ -145,15 +155,21 @@
 	},
 /area/shuttle/midway)
 "mh" = (
-/obj/structure/shuttle/part/dropship1/right_inner_wing_connector,
+/obj/structure/shuttle/part/dropship1/right_inner_wing_connector{
+	name = "\improper Midway"
+	},
 /turf/open/space/basic,
 /area/shuttle/midway)
 "mE" = (
-/obj/structure/shuttle/part/dropship1/transparent/left_inner_bottom_wing,
+/obj/structure/shuttle/part/dropship1/transparent/left_inner_bottom_wing{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "mG" = (
-/obj/structure/shuttle/part/dropship1/transparent/upper_left_wing,
+/obj/structure/shuttle/part/dropship1/transparent/upper_left_wing{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "mL" = (
@@ -173,11 +189,15 @@
 /turf/template_noop,
 /area/shuttle/midway)
 "nH" = (
-/obj/structure/shuttle/part/dropship1/transparent/nose_center,
+/obj/structure/shuttle/part/dropship1/transparent/nose_center{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "od" = (
-/obj/structure/shuttle/part/dropship1/transparent/middle_left_wing,
+/obj/structure/shuttle/part/dropship1/transparent/middle_left_wing{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "ro" = (
@@ -234,11 +254,15 @@
 	},
 /area/shuttle/midway)
 "tP" = (
-/obj/structure/shuttle/part/dropship1/transparent/right_outer_bottom_wing,
+/obj/structure/shuttle/part/dropship1/transparent/right_outer_bottom_wing{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "ul" = (
-/obj/structure/shuttle/part/dropship2/transparent/engine_left_cap,
+/obj/structure/shuttle/part/dropship2/transparent/engine_left_cap{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "ux" = (
@@ -258,7 +282,9 @@
 	},
 /area/shuttle/midway)
 "vN" = (
-/obj/structure/shuttle/part/dropship1/transparent/middle_right_wing,
+/obj/structure/shuttle/part/dropship1/transparent/middle_right_wing{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "wB" = (
@@ -292,7 +318,9 @@
 	},
 /area/shuttle/midway)
 "yN" = (
-/obj/structure/shuttle/part/dropship1/right_outer_wing_connector,
+/obj/structure/shuttle/part/dropship1/right_outer_wing_connector{
+	name = "\improper Midway"
+	},
 /turf/open/space/basic,
 /area/shuttle/midway)
 "yO" = (
@@ -326,7 +354,9 @@
 	},
 /area/shuttle/midway)
 "BU" = (
-/obj/structure/shuttle/part/dropship1/transparent/engine_left_exhaust,
+/obj/structure/shuttle/part/dropship1/transparent/engine_left_exhaust{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "Cc" = (
@@ -388,7 +418,9 @@
 /turf/template_noop,
 /area/shuttle/midway)
 "Fu" = (
-/obj/structure/shuttle/part/dropship1/transparent/lower_right_wing,
+/obj/structure/shuttle/part/dropship1/transparent/lower_right_wing{
+	name = "\improper Midway"
+	},
 /obj/effect/attach_point/weapon/midway/right_wing,
 /turf/template_noop,
 /area/shuttle/midway)
@@ -411,7 +443,9 @@
 	},
 /area/shuttle/midway)
 "Go" = (
-/obj/structure/shuttle/part/dropship1/transparent/outer_left_weapons,
+/obj/structure/shuttle/part/dropship1/transparent/outer_left_weapons{
+	name = "\improper Midway"
+	},
 /obj/effect/attach_point/weapon/midway/left_fore,
 /turf/template_noop,
 /area/shuttle/midway)
@@ -421,7 +455,9 @@
 	},
 /area/shuttle/midway)
 "Hz" = (
-/obj/structure/shuttle/part/dropship1/left_outer_wing_connector,
+/obj/structure/shuttle/part/dropship1/left_outer_wing_connector{
+	name = "\improper Midway"
+	},
 /turf/open/space/basic,
 /area/shuttle/midway)
 "HY" = (
@@ -449,7 +485,9 @@
 	},
 /area/shuttle/midway)
 "Ks" = (
-/obj/structure/shuttle/part/dropship1/transparent/lower_left_wing,
+/obj/structure/shuttle/part/dropship1/transparent/lower_left_wing{
+	name = "\improper Midway"
+	},
 /obj/effect/attach_point/weapon/midway/left_wing,
 /turf/template_noop,
 /area/shuttle/midway)
@@ -478,7 +516,9 @@
 	},
 /area/shuttle/midway)
 "LZ" = (
-/obj/structure/shuttle/part/dropship1/transparent/upper_right_wing,
+/obj/structure/shuttle/part/dropship1/transparent/upper_right_wing{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "Mf" = (
@@ -562,11 +602,15 @@
 	},
 /area/shuttle/midway)
 "SZ" = (
-/obj/structure/shuttle/part/dropship1/transparent/right_inner_bottom_wing,
+/obj/structure/shuttle/part/dropship1/transparent/right_inner_bottom_wing{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "Tl" = (
-/obj/structure/shuttle/part/dropship1/transparent/nose_top_right,
+/obj/structure/shuttle/part/dropship1/transparent/nose_top_right{
+	name = "\improper Midway"
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "UI" = (
@@ -617,7 +661,9 @@
 	},
 /area/shuttle/midway)
 "Zr" = (
-/obj/structure/shuttle/part/dropship1/transparent/outer_right_weapons,
+/obj/structure/shuttle/part/dropship1/transparent/outer_right_weapons{
+	name = "\improper Midway"
+	},
 /obj/effect/attach_point/weapon/midway/right_fore,
 /turf/template_noop,
 /area/shuttle/midway)