From f59a9a9e6891a38e3f0c0d2bcd5f58e4b2121395 Mon Sep 17 00:00:00 2001 From: Morrow Date: Thu, 9 Nov 2023 15:58:42 -0500 Subject: [PATCH 1/4] sergeant huggs and UA flags --- code/game/objects/structures/signs.dm | 5 +++ icons/obj/structures/props/banners.dmi | Bin 667 -> 1154 bytes maps/map_files/golden_arrow/golden_arrow.dmm | 38 +++++++++++++------ 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index eb846e1a6c..765c717c6b 100644 --- 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/icons/obj/structures/props/banners.dmi b/icons/obj/structures/props/banners.dmi index d45574de118540f404389da7746f2399bc04d79e..a83bc6ee74494cfeb4fa277dc55e45ca6f998438 100644 GIT binary patch delta 975 zcmV;=12FuX1%e5X7Y<+u0{{R3)kcR30001KktH`vO%4u13=Lcm4^$5ihl!4@s;6#v zfV{S?m6n#Co}CgA5*QT~8W$E66B88_6iE#Y4-XJF3k#8=CWQb100DGTPE!Ct=GbNc z0054Wae99eR9%`FpO%xDj!T`gf~%hk*wFwcqBkP(A1liM00S*aL_t(&f$f&tda5uG zg@d52*n$*{5W}Iq|3h{T2?jj1rtV(sEItvEu>Q=1i3$-E6!ec2J=ro^L{W_T4QDcn zz;a4p#g2Y#YGkaYNr{qWlE7!-DE@)m=aMBVnF4>}WVK9|E7NxlyC?e~os(n*pLh-c z%N6yk&>e=kFmC7TB$?RpnFpB1uK;KS3|?6qZllO-Z$iCvdw%A}FGmn9CR5;xao!`q z#6m{1vweJN9-J+*d5tba>bBVX3lW?WWft$Ovak-K_2I zuh(J&2Yz1zyu*QGvOJ@EXx+|?TuU4Zf>~u*CSWABY_H5`y#+w}P7!2c1i*NVE6W8< zEro-JoB0ZEpl)FzxB?g>5FEkQMgWZf1dD&II03eB;9R)d^xlrZ1+ayQfB-qSr0*7h z=r_JjO$2LdxwZzb9Kfvz7?7qM!Q-MexCjUe3JUr|WqF=wPX(CI^8^t*)&KuhLGl}M zQy)cHmepkwZmnQI@$oQVC-<^05mFh zAosqhAiBp>bkJSf>aK4=^-P$bVt_OaUH~RAqMWH1(BC&jJrep388i2$QIIV-c>$#E zo0fv;x^cZ>Wl^{o==jl4`R`76v&?U5n`SVD`{?AU+T7>D!)SVBjYAdR@j(4RI8j}-L;kP6-*Dz%A! zqiE0Y+3XHojms<*7D8LPWo%MaVJUc|2tojY) zsSqezRdIaWUwn3k&~u?FlBoprho7Ut2e6l2Hxj0W%)dC*Fvz_ZplL?J;HYP?{;(za z0FI^PT@4nxFQ)$3ik+oTijHMv_f4!fWj7*4#en|sljZ{u$76*vR<%WtxYiW*R7Wp= xLV$4Fq(2w@e}ewZ39gTwhNsaI}bfzXJdO002ovPDHLkV1gz0Ec41__@R;=LrKW#%2 zZ17TT&$|7S&!ej$%rHgQ7)4S3345`mZLD>fzfeXY3zD@1;RGLxGAvd9DAu>$!`TSj z2grH8&G_2D`L6YC$75@=Bg#a)df&n6mIff%f8j`%)uBzAQJwC+ujJ@T4Lp6v06U<$ zD>78WWM$OjC_b*QG<`dPZK@^E&Ajf}fU}^`;##J+JaMtf{2FZ}m6h_mk>K@1@#d|* zto$8Vx865SA?_==Vj$l>l-hos`EzqivqPMic=o@7FgxV5sG=x}q9{M+cE8^)SA^2c ze^+jY0zDid1T#E_s(IgT(bf088Q{o&_Y6ija!*VVpP@P}grsC{1z=S%MgyH#nReFG zPhb#6Oc2d%0R1^vOa_-0;GlM1ub~1C8&0reFefmSU@8fq2!j&KjPS9gzZx1BGGvHkUG6;bZd=Kuyrh%d;$`6StrFf|UpVt8i bPIf*4zkU@_1FIJ100000NkvXXu0mjfty$a; diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index 3d465af6ce..5326cbebff 100644 --- 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 From f9a604865b2405b50fb06851ae2719ce7fca5262 Mon Sep 17 00:00:00 2001 From: Morrow Date: Thu, 9 Nov 2023 16:06:07 -0500 Subject: [PATCH 2/4] Midway naming --- maps/shuttles/dropship_midway.dmm | 92 +++++++++++++++++++++++-------- 1 file changed, 69 insertions(+), 23 deletions(-) diff --git a/maps/shuttles/dropship_midway.dmm b/maps/shuttles/dropship_midway.dmm index 4c41724f40..f55249365a 100644 --- 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) From ac70dd348ea2112582403255722297b70b789935 Mon Sep 17 00:00:00 2001 From: Morrow Date: Thu, 9 Nov 2023 16:08:16 -0500 Subject: [PATCH 3/4] vehicle construction/surg allowed --- code/game/turfs/open.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 93eb45c3b7..a86ed37f06 100644 --- 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" From 2c40fc7d74ecd8493ba9a8b49b83451643e0cca0 Mon Sep 17 00:00:00 2001 From: Morrow Date: Thu, 9 Nov 2023 16:09:31 -0500 Subject: [PATCH 4/4] no queen actions --- code/modules/mob/living/carbon/xenomorph/xeno_defines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm index f1fff4fb76..eabe4a7853 100644 --- 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