From 826a3408cdeb7c9dbbfe81e36638f011374a9095 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Mon, 23 Sep 2024 22:53:23 -0400 Subject: [PATCH 1/4] Uncoloured prefab window (#470) --- code/game/objects/structures/window.dm | 9 +++++++++ code/game/objects/structures/window_frame.dm | 6 ++++++ icons/turf/walls/ice_colony/shiva_windows.dmi | Bin 1814 -> 2865 bytes 3 files changed, 15 insertions(+) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 14e15de246..0404d3f09b 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -817,6 +817,15 @@ health = 40 window_frame = /obj/structure/window_frame/shiva +/obj/structure/window/framed/prefab + name = "poly-kevlon framed window" + icon = 'icons/turf/walls/ice_colony/shiva_windows.dmi' + icon_state = "prefab_window0" + basestate = "prefab_window" + desc = "A semi-transparent (not entirely opaque) pane of material set into a poly-kevlon frame. Very smashable." + health = 40 + window_frame = /obj/structure/window_frame/prefab + //Solaris windows /obj/structure/window/framed/solaris diff --git a/code/game/objects/structures/window_frame.dm b/code/game/objects/structures/window_frame.dm index ae40be1472..53be33959e 100644 --- a/code/game/objects/structures/window_frame.dm +++ b/code/game/objects/structures/window_frame.dm @@ -277,6 +277,12 @@ icon_state = "shiva_window0_frame" basestate = "shiva_window" +/obj/structure/window_frame/prefab + name = "poly-kevlon window frame" + icon = 'icons/turf/walls/ice_colony/shiva_windows.dmi' + icon_state = "prefab_window0_frame" + basestate = "prefab_window" + //Solaris frames /obj/structure/window_frame/solaris diff --git a/icons/turf/walls/ice_colony/shiva_windows.dmi b/icons/turf/walls/ice_colony/shiva_windows.dmi index 2e65944a09fa34bcfed53a876f4ce02ff91f67b9..998900bbfc477b1ab86132e1622b5b3b359d222a 100644 GIT binary patch delta 2828 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 delta 1769 zcmXX{c~nz(7XH1wkfabvR4Ng{grUk_0?1-n5*7u8f&v0Zp@e}VL9i@AG9r2J;oveX zvRFW>7)ogY3x=|k3X-Q%z+rWnVC`7aDoY9sAW4A`%%pSXkNe&4p1b{V?>)C|SEb>; ztH(kDw&|Pb0|2%i3G@%sY4lH_z&cdQ%Qke%w``vug5&ttM?WginUEkXBph&OUL@%Z z@%e~of&Zsj37PzK0sphJ00?h}N2X_HuPMXRS5$9og6wU^M#jS>C)iJ%<-ggD2U|Y| znMK9j?#^M(&zz64ZvIx@Umn29k0n^1XgeN=8}TU^Ufif8tyl%aS^@QVQ`SOLyU4>DlwKqbJkL8KvFVZEd^N zKcHDKC?PM8GQUiz1wc=B#NQ`EcysY&VdS(8)r)QD9?(+nrPa1neK0XtmKealfA?`% z)q#%GbExk<2kZV)k*8q6vS)p~;S93yPvxEHrcz^$w)n?C-UVg!E7$KNT(f=}`z8uV zZkteIPXS`{4!=Hq)Yf>;1`3Q=QM4t5D&_qmJ+KiAc4%|+c7gGzKI;>p&BzFt5A=&% zh)>?nf2pk+z=Njc?f``p2*0ZYx)kPsgi=zp7XhXCqAMkvlt}-bigfr;eDM`&a?!4CNYa8-Ie6?^4AI?gW4uB0a za8kPm9l(IqJW`=A=AM?4P)%))&!Uzf&XhQ@RUp`#)XmX{4@#seM2}@UA$^FSnT#YE zB_LhE&Ocr21}Y~T*~{vlguAwIL%|qrGkokk<#(3hs}Jc{d|TOKkW5Vm$wJFB^e{ge z!+K|GHO7PFIad|TB;3WIh;Kvf{n#uw%Mp>JiCucr0Axfu06rn5Ts;2EImam&rwT^L z(dbl<+HQq837t9k_IuLN&EeWm_vHds)7jSYQYkbP-!p6QlNsTpWrDMLj=d}koBqrz zc+)HH?PXSLz1!+8QTTN-i(}tf_A->f+MZv{*-mJ=Y)`C=Gr7|HfDeSyo%gB8-*0&= z1!-K{w@gWAIj*4XFU!SPC-Sr@&(Rzy@p)P0W*TR~E5bYJujR?7j@W*e>8KW!%^;mRw$BQ9TVWnCr%@0Zvmb=}~uP$t++}?+r+Y z27Wanh#%ddq3;v6goe-rva%INkl!{XSa1MDTw`_kigm&0oH^}3DT6XBgTxpzh9>Sm z0!11?EcJX5Pf7zc-20O+W(kSk9hWSYFA)8lLJs?M z6*gDwW@|KAKC`*6Q?Ec1tyBUmAwni8|JTTF(^!?hvzSU{E6&u?Ef)DJUo-aGKQ zLm&qS-{f>{xElA2hSkKVfq)~Uxr1mmpn$yIa}ZkzF~ItTC5Weh`}EKT+IlTQXQ;tA zt3w5U2<~|UXQ0%POFDuo;aW%D9Lz?kO4tyzXqOglOnt8g0hH7&l+0aR5bV^Zz0~>P zK#n{f?eTn7BV|SZ+2AQnIEg8`)V5?1$!-gb5*ML8d0am7+SssW>K=2R{GAG&Zg3mT z)q1vgAZDwgb(QB&v_>_`?^`n_)@`(G{yLd8#%y%_iXZy!=KyWm{N&Ogl{gQbV6x?d zYAoAmd=XmRvg5WB#|S|jiKp1Vv&LUz1p+w}d%3UgDPYEfIx0hrsX+?zFETyfVmEti zO$Gh?-C^c2x+xKFpj9VFE~y}af&q}ddH8|6=j7mk0=%9koL9iVlo(*yq8tT$iNT%C zz2?okf>|h`1S;_sCVx&Ya^&5fidCbpW!SaZoGNdgz-(@oT)HJcb=+R_`0yx=RiS~J z3#4{Um%|e?g@-!XKqV}JCRVmMK)z&%)iQCAe1k#KZJBAin8iS9_0Eg%2V5Wa2wKbJ z?%#kThPM;!Iq3hEPN@MTZqG~xND<+XxOe{`)VKj9KEtTWRd}cxig-N8T}%H*aL9OL zWd-Iyu%Z^h>yOYHU7c@EM+^_*QM$7pfaY{LBcS Date: Thu, 26 Sep 2024 02:30:24 -0400 Subject: [PATCH 2/4] Medical vendor Create&Destroy fix (#478) --- code/game/machinery/vending/vendor_types/medical.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm index e73add9046..9137ab35c1 100644 --- a/code/game/machinery/vending/vendor_types/medical.dm +++ b/code/game/machinery/vending/vendor_types/medical.dm @@ -268,6 +268,7 @@ ) /obj/structure/machinery/cm_vending/sorted/medical/Destroy() + STOP_PROCESSING(SSslowobj, src) QDEL_NULL(last_health_display) . = ..() From b0e7f821643f6cd03f5f2b73ddc0751dc8604276 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Fri, 27 Sep 2024 17:49:19 -0400 Subject: [PATCH 3/4] M41 Magazine Can Sprite Fix (#475) --- code/modules/projectiles/ammo_boxes/magazine_boxes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm index 9146922bea..881a730bcc 100644 --- a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm @@ -557,7 +557,7 @@ /obj/item/ammo_box/magazine/mk1 name = "magazine box (M41A MK1 x 10)" overlay_ammo_type = "_reg_mk1" - overlay_gun_type = "_mk1" + overlay_gun_type = "_m41" overlay_content = "_reg" magazine_type = /obj/item/ammo_magazine/rifle/m41aMK1 allowed_magazines = list(/obj/item/ammo_magazine/rifle/m41aMK1/recon) From fdf2f5d2a12c299abef5475169fcd515cbb25cf0 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Fri, 27 Sep 2024 17:52:36 -0400 Subject: [PATCH 4/4] literally just empty gun racks (#466) Co-authored-by: Doubleumc --- code/game/objects/structures/gun_rack.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/game/objects/structures/gun_rack.dm b/code/game/objects/structures/gun_rack.dm index 45a63e46f3..40e5bfe17f 100644 --- a/code/game/objects/structures/gun_rack.dm +++ b/code/game/objects/structures/gun_rack.dm @@ -53,6 +53,9 @@ /obj/structure/gun_rack/m41/unloaded populate_type = /obj/item/weapon/gun/rifle/m41aMK1/unloaded +/obj/structure/gun_rack/m41/empty + initial_stored = 0 + /obj/structure/gun_rack/type71 icon_state = "type71" desc = "Some off-branded gun rack. Per SOF and UPPA regulations, weapons should be stored in secure safes and only given out when necessary. Of course, most (but not all!) units overlook this regulation, only storing their firearms in safes when inspection arrives." @@ -64,6 +67,9 @@ /obj/structure/gun_rack/type71/unloaded populate_type = /obj/item/weapon/gun/rifle/type71/unloaded +/obj/structure/gun_rack/type71/empty + initial_stored = 0 + /obj/structure/gun_rack/apc name = "APC ammo compartment" icon_state = "frontal" @@ -104,6 +110,9 @@ /obj/structure/gun_rack/flamer/unloaded populate_type = /obj/item/weapon/gun/flamer/unloaded +/obj/structure/gun_rack/flamer/empty + initial_stored = 0 + /obj/structure/gun_rack/mk221 name = "M120 shotgun rack" icon_state = "mk221" @@ -112,3 +121,6 @@ initial_stored = 2 allowed_type = /obj/item/weapon/gun/shotgun/combat populate_type = /obj/item/weapon/gun/shotgun/combat + +/obj/structure/gun_rack/mk221/empty + initial_stored = 0