From 303b5c8393e1fad157326d0718a5da47cb92df65 Mon Sep 17 00:00:00 2001 From: osjarw Date: Tue, 9 Jul 2024 23:28:28 +0300 Subject: [PATCH 001/298] Air alarms check sensors upon power returning --- Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs index c1a5256fdd..2bbd409b8f 100644 --- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs @@ -151,6 +151,7 @@ public sealed class AtmosMonitorSystem : EntitySystem } _deviceNetSystem.QueuePacket(uid, args.SenderAddress, payload); + Alert(uid, component.LastAlarmState); break; } } From fb686d687cfa74d8c7beacd36110ef3f248118ea Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Tue, 20 Aug 2024 03:41:49 +1000 Subject: [PATCH 002/298] Revert "Security Helmet Reshape" (#31198) Revert "Security Helmet Reshape (#30961)" This reverts commit 802d478e2173cfd8667b4ca986b6b793eacfc317. --- .../security.rsi/equipped-HELMET-vox.png | Bin 766 -> 1823 bytes .../Helmets/security.rsi/equipped-HELMET.png | Bin 621 -> 1718 bytes .../Head/Helmets/security.rsi/icon.png | Bin 244 -> 1282 bytes .../Head/Helmets/security.rsi/inhand-left.png | Bin 367 -> 1509 bytes .../Head/Helmets/security.rsi/inhand-right.png | Bin 366 -> 1488 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png index 02f2dded76918f7e19f9f00221510307eb93efc9..815ba143e536f400648773405f84a31c91b6c300 100644 GIT binary patch literal 1823 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IS84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fwU3rjN#3Q|*aJzRZ!T|;d2A&OBAfrz4-ZKIFH z88#r#TSW$?7U$=bf`Z@9$jrnB93&{Bh=_pbh`_1?SrlDIKt_H^J}_YwWhQ&(m82FG z6af<%#73xnxK*H=g|Iv{FSEqX2xi~sc3d|4@SJ7GrQY*`8<-E3JY5_^Dj46++TSnaC~~~LnL*khOU07c{ZZhA zg#5%m%4^nLK6c~Qji_JhHzFb=t-1fRNluiOVY{?Z$DN_NLC zjpt^vO%iKcb?5chIbXeRb-6O0lixaPQH)-9*49;@jwUHS`@GXZ?{d|Afd@5-hSeh@CaK6xWxqEfD{rGoTTWF7R zgPKU`j8~t}FkbRe6WDxj`5Z|Gm-ck!wSWH{p8oxpqu3L{T|ZyM)O~w*+5TJHe47fN zsvYYln?~N}?+|u+k!W;-?}u((eB87}`*zqnq~5p5VwPIMo_j{o`%@LWgTQ-6p=DDg zc-WFmq$+Q#RC`u#z8SOqcJ9?yB}V>z@l5Y^6Sz)=1{!EheS3AMiu$H4j?4?VTbm^K z+N)dN+W7A@ijb9+JjWKq_U3k7*Phzqd%|aL&)chhXEMHEZ2aGQAbyLRVM?5pzdERL N@^tlcS?83{1OOZVq5%K^ delta 730 zcmV<00ww*Q4*ms@Fn?b3+;GlXW7I>cCy)M@qHkKowxhG zZ{E(#Vc!FY|C=kW542ky0|1_PEgg&F69B;em(R}r{v$aEy5E50Khpxj(uIPkz^%02h4#I93X=);Q=LroUKg94j?)Ur`FLfGCO}guvTpkDg@5Up-vf0k8uAQc4p= zky8LJ`j%s*MwaOIec5CU53tl0q5ON5>HO0$`cSB@&Kcnh9MDiG)a21UE%_gKQr4s-E{Y-!_wm)oV zZJTT5f_*;b@BRAIb(@fBB%*M2I1i;14tj@RjDax*TfMbxt~EAFMVI5_P7t8R7;22+ zpmzv$(HAf&6Yo#ktpxzLZr=oOelT^r-Ac>TQd3G}58Q8Gzo+Aq9)c5ZfvjNXUVEmM zS=$9Ni?%!`q?D%0GIiDdr^d7cy)+Xi2!bF8f*=TjAP9mW2;!gT7YFb+V1>^u0RR91 M07*qoM6N<$fh?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fwU3rjN#3Q|*aJzRZ!T|;d2A&OBAfrz4-ZKIFH z88#r#TSW$?7U$=bf`Z@9$jrnB93&{Bh=_pbh`_1?SrlDIKt_H^J}_YwWhQ&(m82FG z6af<%#73xnxK*H=g|Iv{FSEqX2xi~sc3d|4@SJ7GrQY*`n}LC8r>Bc!NCo5DSr@x5JBYNoYi~6a57Sw5d)b4s zg-heO?)~PlJFqUi>Sgcyhr$)gkD4ohd*1YQ z9E&}^R@timwO%=0*VLYJSsQlxYP;;`ZFXzR51f~GEu7qJ?$&k45s|~vU6r_Q#!u+w0A4_$-d){zZ{Bq)^+9jKIvY!ch%d@?K|Bd zCo6O8ZCP}D#3D`Q(la z4iCEwv*0kH!$mt=&hBzM_^LqUWVrmD>yHG^sP%t5{G`Y3{dLd9dlT9BEi9b7=3ARY zO3#g)Y>_qP3?WZzmBDfL0%cI7;OH;3)vWbzMDQmL&jS zI++>AH@*XsgBZ`>ygRASzkhu+I{S2Px}32h&*AyL-gI@|#{G4YIX(DS|j}d%E!~wPU-{0G`&>>vF#DC?hokodhmT8`D#&8wtWc0G?n{< zfgY#Ivy|V=X5JIeMUI>BRAo%UoX@ANvP33M7sLcXEb@SNX*+RW; z_$S790B~K8cU>1k2z;5(ZI-aMxVTsuKM6yflMSl_0DyUA>U9|pF|-sxp6 z&fC$mk;)?o>|$E=2TUh3IF19yaS+~I0j15Jf%@8E80tKxlbO|;#xE@Oj6Hh12jKc8 zw5jTFmO*7wy@$Si{SKhr7M)wcRf)XI{(x%ydLA3qRU&`QhKY!Xh=_=Yh=_>(MZW;Q W)BAcR1JjKF0000znTPbd0U|>$m42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Ug$@zIU`VbYUIw7K{2HNOjvD*gZW2?xZ)Z+Y{ zQc#%N8JU^bfWrYr6cPFm9T8Y{Ad8~w2*}7U$p@yUqReE^ypq(Sf+Aqbg4hVP54Q?* zvk;bt=4F=H89@y|6Gqa76f;(iMJ46=McEVJ- UM`U3~DyaPNboFyt=akR{0OnYw>i_@% delta 203 zcmV;+05t!C3iJVxF@LT}L_t(oh3(O?4Z<)G1<(&d#s^Ep&L}Rk1e>q}6R-p&qY$$M z*tjtbSdoyB&LF3`*F-t#{C^xk2qDDG7Bx$zvzcgJ-a~l6U&pGmRyEh?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p zz)=9q2Xt=`Ln;{G&f4pD*g)WT?2+Rk5{!&Nnn6nprmgXr zSix0xE$_`59UmLU{sZT#U7A=k5?Ry|IAXe_PkYML#{{(3FVXmR^ZWO^`X@`&S@Z-L z7_p-dY8&h&p0yXwspgiDnS4>B-};i7O!j`4lgl%sJm zeHAx$^6{B=dY#zIw_sr6er?(H2lNAZ;Eko%g;S8c-{IW?X9=t>e*j+ z?n*Ph_V??~UbowF&&@BZRT#|KTY0Pe{{+_8#jm#>?JvddZ$x-B9#wG&P1)M8Yerz1 zh^XrMi~Sco3$JXIKQL7={Xc_s!@9}SH|+Q&c;gqd#)i$SXV2MPr!RbM{-*kdH;R8b za^e|O*R%hO|2*Men5&Xe;lW&pUMXfh)Kt-<Dnm{r-UW|9P$OA delta 328 zcmV-O0k{6;3-1DuFn<9lNkl$JuUdc9gJrcb`vo?YFHfV)>eaqO>(KpFSxIeg z@RSW(W*uU7m^3ywT9)NW`IcD#000000001B+9uZ_uw>OC=w>npWbllX}41b$t zhrp~KAW65&$3b3Z`1@FO2+V$g)$`k6hta4y1gU2DqwEl*UOZKYpp&5%4tCsKp diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png index 721de350112f85bb4867cb2e14ed033672a5ab40..0dbc1447027e88afc12abe267380ad004d5bdce9 100644 GIT binary patch literal 1488 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IV84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p zz)=9q2XRX6vL!IaA+MB)U0!7ch*X%CrSLzGJART9z)#8vqxvtZ>x)S%l8jI`|Voaof|Rd zw_P@QTRCs~-InXq%|Cvzx%%tnqn(?AWw~Fgrt8`KKl}aGj%^pS|4erOJKx@)_1?Xu z$3CxfEb(2R9e0ACNr3?$+QzcW$T%Uo|Kprhy7!LGWQ73K`0A*+rEvf|%iEfUt`)CmGM=ihs#DdUyknDG>PqPY3#Yt1SiE2B8q2~i3z5Yl zo>}JS)7W-2EK6gnsGAk}KuRk5dG))W?{~GD%=M4t|N0<({U?XBZg$K8#ab=wz~FEE b@B4uJ%-yaP_RBM$gGy6RS3j3^P642R5E2S3L5}LE(_HP68IUNLfCboq zf(ekAfih#H@jK{!q%@9ff3adW{v`ka00000An1Cx>&we+Z=GX` zMVUh#opV_)!ko+}u@^;gHmN-ab24v2jef<>FA6nHvyr5#s(<>f>-6>6Ns`)+L$I%v zxtUL618%QMl{a_VOFw>}_U%Q7_cm$xROV!kZh@it`7uGfzqL5Cb1ryr#M*O^JoE34 zIe)x2HS_2}HXNX?>#PpGm^Eew000000000WcWbN}SY(Yg17nW59QD>%Gce}pYa{EL zfzbRZMC$`WtUzl9{QS+sZL%>ZZGj=nnt}VLSDQ1(x@I7Y>v`*%fovARKUVWw%nJbj Z&NpI$jd5e299{qb002ovPDHLkV1gkunDhVu From b2a24f50dd7dff965a44ebeea3e7f67bf5a86976 Mon Sep 17 00:00:00 2001 From: tosatur <63034378+tosatur@users.noreply.github.com> Date: Tue, 20 Aug 2024 03:51:54 +1000 Subject: [PATCH 003/298] Change text for ghost visibility button (#30998) * add new text * changed loc names * fixes --- Content.Client/Ghost/GhostSystem.cs | 4 ++-- Resources/Locale/en-US/ghost/ghost-gui.ftl | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Content.Client/Ghost/GhostSystem.cs b/Content.Client/Ghost/GhostSystem.cs index 94872a58ef..f4f7e3459f 100644 --- a/Content.Client/Ghost/GhostSystem.cs +++ b/Content.Client/Ghost/GhostSystem.cs @@ -99,8 +99,8 @@ namespace Content.Client.Ghost if (args.Handled) return; - Popup.PopupEntity(Loc.GetString("ghost-gui-toggle-ghost-visibility-popup"), args.Performer); - + var locId = GhostVisibility ? "ghost-gui-toggle-ghost-visibility-popup-off" : "ghost-gui-toggle-ghost-visibility-popup-on"; + Popup.PopupEntity(Loc.GetString(locId), args.Performer); if (uid == _playerManager.LocalEntity) ToggleGhostVisibility(); diff --git a/Resources/Locale/en-US/ghost/ghost-gui.ftl b/Resources/Locale/en-US/ghost/ghost-gui.ftl index cd6c2f0270..cd4559e148 100644 --- a/Resources/Locale/en-US/ghost/ghost-gui.ftl +++ b/Resources/Locale/en-US/ghost/ghost-gui.ftl @@ -1,7 +1,8 @@ ghost-gui-return-to-body-button = Return to body ghost-gui-ghost-warp-button = Ghost Warp ghost-gui-ghost-roles-button = Ghost Roles ({$count}) -ghost-gui-toggle-ghost-visibility-popup = Toggled visibility of ghosts. +ghost-gui-toggle-ghost-visibility-popup-on = Enabled visibility of ghosts. +ghost-gui-toggle-ghost-visibility-popup-off = Disabled visibility of ghosts. ghost-gui-toggle-lighting-manager-popup = Toggled all lighting. ghost-gui-toggle-fov-popup = Toggled field-of-view. From 4e67f46652b932fe5b2d8941a46afab0e01b11f2 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 19 Aug 2024 17:53:02 +0000 Subject: [PATCH 004/298] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index a961b63abc..490c8b658b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: slarticodefast - changes: - - message: Fixed the flash effect getting darker with each appearence. - type: Fix - - message: Fixed short-sightedness making you immune to flashes. - type: Fix - id: 6664 - time: '2024-06-02T04:17:53.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27369 - author: AJCM-git changes: - message: Midround antags work again @@ -3859,3 +3850,10 @@ id: 7163 time: '2024-08-19T14:03:07.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31085 +- author: tosatur + changes: + - message: Changed text for ghost visibility toggle + type: Tweak + id: 7164 + time: '2024-08-19T17:51:55.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30998 From 69540163e7d6dab9217ccfb082b5af9cb0d20808 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:17:28 -0400 Subject: [PATCH 005/298] Allow lizards to eat meat dumplings (#31212) --- .../Entities/Objects/Consumable/Food/Baked/misc.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index b2cdee8280..2f4b6009a9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -492,6 +492,13 @@ Quantity: 8 - ReagentId: Protein Quantity: 2 + - type: FlavorProfile + flavors: + - meaty + - bread + - type: Tag + tags: + - Meat - type: entity name: chèvre chaud From ccef5e72f65f85dba7daf876ec994c7c3a92debe Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 19 Aug 2024 18:18:35 +0000 Subject: [PATCH 006/298] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 490c8b658b..554312951b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: AJCM-git - changes: - - message: Midround antags work again - type: Fix - id: 6665 - time: '2024-06-02T16:52:40.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28523 - author: Errant-4 changes: - message: Map labels no longer suddenly disappear for the rest of the round. @@ -3857,3 +3850,10 @@ id: 7164 time: '2024-08-19T17:51:55.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30998 +- author: themias + changes: + - message: Lizards can now eat meat dumplings. + type: Fix + id: 7165 + time: '2024-08-19T18:17:28.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31212 From b81f099d7c0f2e9bbe854bd629f263ad9e564e6b Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Mon, 19 Aug 2024 11:35:02 -0700 Subject: [PATCH 007/298] Replace NoSpawn: true with HideSpawnMenu (#31122) We don't do this anymore --- Resources/Prototypes/Alerts/alerts.yml | 2 +- .../Entities/Clothing/Head/hoods.yml | 22 +++++++++---------- .../Guns/Ammunition/Projectiles/shotgun.yml | 14 ++++++------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml index ff66f2586b..4ee4fdce0c 100644 --- a/Resources/Prototypes/Alerts/alerts.yml +++ b/Resources/Prototypes/Alerts/alerts.yml @@ -27,7 +27,7 @@ - type: entity id: AlertSpriteView - categories: [ HideSpawnMenu ] + categories: [ HideSpawnMenu ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index c9e19cb31b..96c4197bdc 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -529,7 +529,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorBlack - noSpawn: true + categories: [ HideSpawnMenu ] name: black winter coat hood components: - type: Sprite @@ -549,7 +549,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorPurple - noSpawn: true + categories: [ HideSpawnMenu ] name: purple winter coat hood components: - type: Sprite @@ -569,7 +569,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorRed - noSpawn: true + categories: [ HideSpawnMenu ] name: red winter coat hood components: - type: Sprite @@ -589,7 +589,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorBlue - noSpawn: true + categories: [ HideSpawnMenu ] name: blue winter coat hood components: - type: Sprite @@ -609,7 +609,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorBrown - noSpawn: true + categories: [ HideSpawnMenu ] name: brown winter coat hood components: - type: Sprite @@ -629,7 +629,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorGray - noSpawn: true + categories: [ HideSpawnMenu ] name: gray winter coat hood components: - type: Sprite @@ -649,7 +649,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorGreen - noSpawn: true + categories: [ HideSpawnMenu ] name: green winter coat hood components: - type: Sprite @@ -669,7 +669,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorLightBrown - noSpawn: true + categories: [ HideSpawnMenu ] name: light brown winter coat hood components: - type: Sprite @@ -689,7 +689,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorOrange - noSpawn: true + categories: [ HideSpawnMenu ] name: orange winter coat hood components: - type: Sprite @@ -709,7 +709,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorWhite - noSpawn: true + categories: [ HideSpawnMenu ] name: white winter coat hood components: - type: Sprite @@ -729,7 +729,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorYellow - noSpawn: true + categories: [ HideSpawnMenu ] name: yellow winter coat hood components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index ce79b6f417..d8c465cf9e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -44,7 +44,7 @@ - type: entity id: PelletShotgunSpread - noSpawn: true + categories: [ HideSpawnMenu ] parent: PelletShotgun components: - type: ProjectileSpread @@ -71,7 +71,7 @@ - type: entity id: PelletShotgunIncendiarySpread - noSpawn: true + categories: [ HideSpawnMenu ] parent: PelletShotgunIncendiary components: - type: ProjectileSpread @@ -95,7 +95,7 @@ - type: entity id: PelletShotgunPracticeSpread - noSpawn: true + categories: [ HideSpawnMenu ] parent: PelletShotgunPractice components: - type: ProjectileSpread @@ -120,7 +120,7 @@ - type: entity id: PelletShotgunImprovisedSpread - noSpawn: true + categories: [ HideSpawnMenu ] parent: PelletShotgunImprovised components: - type: ProjectileSpread @@ -219,7 +219,7 @@ - type: entity id: PelletShotgunUraniumSpread - noSpawn: true + categories: [ HideSpawnMenu ] parent: PelletShotgunUranium components: - type: ProjectileSpread @@ -247,7 +247,7 @@ - type: entity id: PelletGrapeshotSpread - noSpawn: true + categories: [ HideSpawnMenu ] parent: PelletGrapeshot components: - type: ProjectileSpread @@ -278,7 +278,7 @@ - type: entity id: PelletGlassSpread parent: PelletGlass - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: ProjectileSpread proto: PelletGlass From ee4729fed3a5a2a2d2a29a024c5b8818431ae185 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Mon, 19 Aug 2024 20:47:23 +0200 Subject: [PATCH 008/298] Revert "Tweaking things that restrict freedom (#31095) (#31197) * Revert "Tweaking things that restrict freedom (#31095)" This reverts commit 171884df8f8ef76027f1de76e46d488326fd0110. * keep the unequip time * keep alphabetical order --- Resources/Prototypes/Entities/Clothing/Eyes/misc.yml | 4 ++-- Resources/Prototypes/Entities/Clothing/Masks/masks.yml | 4 ++-- .../Prototypes/Entities/Structures/Machines/lathe.yml | 1 - Resources/Prototypes/Recipes/Lathes/security.yml | 8 -------- Resources/Prototypes/Research/arsenal.yml | 1 - 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml index 9599b11bb1..81de8a61bc 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml @@ -8,8 +8,8 @@ sprite: Clothing/Eyes/Misc/blindfold.rsi - type: Clothing sprite: Clothing/Eyes/Misc/blindfold.rsi - equipDelay: 5 - unequipDelay: 5 + equipDelay: 3 + unequipDelay: 3 - type: Blindfold - type: Construction graph: Blindfold diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 94351cc126..7d270b8ee7 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -315,8 +315,8 @@ sprite: Clothing/Mask/muzzle.rsi - type: Clothing sprite: Clothing/Mask/muzzle.rsi - equipDelay: 5 - unequipDelay: 5 + equipDelay: 3 + unequipDelay: 3 - type: IngestionBlocker - type: AddAccentClothing accent: ReplacementAccent diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 6c97f9fd5f..bf4d4de783 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -763,7 +763,6 @@ - BoxShotgunUranium - BoxShellTranquilizer - ClothingBackpackElectropack - - ClothingOuterStraightjacket - ExplosivePayload - FlashPayload - GrenadeBlast diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 2e3d5c7fc6..a54d5b6235 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -710,11 +710,3 @@ Plastic: 1000 Plasma: 500 Glass: 500 - -- type: latheRecipe - id: ClothingOuterStraightjacket - result: ClothingOuterStraightjacket - completetime: 4 - materials: - Steel: 200 - Cloth: 500 diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 01198d7d76..553258fdb3 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -126,7 +126,6 @@ cost: 5000 recipeUnlocks: - ClothingBackpackElectropack - - ClothingOuterStraightjacket # Tier 2 From ed34e4cbcd8db02ef7c9f32bd5f5c23cf7bea782 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 19 Aug 2024 18:48:30 +0000 Subject: [PATCH 009/298] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 554312951b..5f469bfd78 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Errant-4 - changes: - - message: Map labels no longer suddenly disappear for the rest of the round. - type: Fix - id: 6666 - time: '2024-06-02T17:30:27.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28518 - author: Whisper changes: - message: Renamed the player-obtainable "admin cloak" to "weh cloak". @@ -3857,3 +3850,10 @@ id: 7165 time: '2024-08-19T18:17:28.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31212 +- author: slarticodefast + changes: + - message: Made the straitjacked non-printable again. + type: Remove + id: 7166 + time: '2024-08-19T18:47:24.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31197 From 6ba7d268b0918a4e3dc3dd0aa65d00d73319c79e Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:57:29 -0400 Subject: [PATCH 010/298] Uplink: Combat Bakery Kit (#31179) * save * sprites * mime survival kit has baguette * add weapon/uplink * cherry-pick croissant changes * uplink * Switch baguette to slashing damage * fixes * update attribution * fix typos * review comments * reduce TC cost * switch to regular box * fix regular baguette rotation --- .../en-US/preferences/loadout-groups.ftl | 1 + .../Locale/en-US/store/uplink-catalog.ftl | 3 ++ .../Catalog/Fills/Boxes/emergency.yml | 32 ++++++++++++++++++ .../Catalog/Fills/Boxes/syndicate.yml | 16 +++++++++ .../Prototypes/Catalog/uplink_catalog.yml | 16 +++++++++ .../Objects/Consumable/Food/Baked/bread.yml | 15 ++++++++ .../Objects/Consumable/Food/Baked/misc.yml | 4 +++ .../Objects/Weapons/Melee/baguette.yml | 17 ++++++++++ .../Objects/Weapons/Throwable/croissant.yml | 25 ++++++++++++++ .../Loadouts/Miscellaneous/survival.yml | 20 +++++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 10 ++++++ .../Prototypes/Loadouts/role_loadouts.yml | 2 +- .../bread.rsi/baguette-equipped-BELT.png | Bin 0 -> 440 bytes .../Baked/bread.rsi/baguette-inhand-left.png | Bin 0 -> 454 bytes .../Baked/bread.rsi/baguette-inhand-right.png | Bin 0 -> 485 bytes .../Food/Baked/bread.rsi/baguette.png | Bin 393 -> 303 bytes .../Consumable/Food/Baked/bread.rsi/meta.json | 14 +++++++- .../Objects/Storage/boxes.rsi/france.png | Bin 0 -> 139 bytes .../Objects/Storage/boxes.rsi/meta.json | 3 ++ 19 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-equipped-BELT.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-right.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/france.png diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 84738eadec..b7e8616da2 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -15,6 +15,7 @@ loadout-group-survival-syndicate = Github is forcing me to write text that is li loadout-group-breath-tool = Species-dependent breath tools loadout-group-tank-harness = Species-specific survival equipment loadout-group-EVA-tank = Species-specific gas tank +loadout-group-survival-mime = Mime Survival Box # Command loadout-group-captain-head = Captain head diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 47eb671619..27ecdc98f0 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -439,3 +439,6 @@ uplink-barber-scissors-desc = A good tool to give your fellow agent a nice hairc uplink-backpack-syndicate-name = Syndicate backpack uplink-backpack-syndicate-desc = Lightweight explosion-proof а backpack for holding various traitor goods + +uplink-combat-bakery-name = Combat Bakery Kit +uplink-combat-bakery-desc = A kit of clandestine baked weapons. Contains a baguette which a skilled mime could use as a sword and a pair of throwing croissants. Once the job is done, eat the evidence. \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index c2b0660dc0..540e05b453 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -189,6 +189,38 @@ - type: Label currentLabel: reagent-name-nitrogen +- type: entity + parent: BoxSurvival + id: BoxMime + name: survival box + description: It's a box with basic internals inside. + suffix: Emergency + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodBreadBaguette + - id: DrinkWaterBottleFull + +- type: entity + parent: BoxSurvivalNitrogen + id: BoxMimeNitrogen + suffix: Emergency N2 + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyNitrogenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodBreadBaguette + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-nitrogen + - type: entity parent: BoxCardboard id: BoxSurvivalSyndicate diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml index 80c20a1a04..27df984f25 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml @@ -67,3 +67,19 @@ contents: - id: DeathRattleImplanter amount: 6 + +- type: entity + parent: [BoxCardboard, BaseSyndicateContraband] + id: CombatBakeryKit + name: combat bakery kit + description: A kit of clandestine baked weapons. + components: + - type: Sprite + layers: + - state: box_of_doom + - state: france + - type: StorageFill + contents: + - id: WeaponCroissant + amount: 2 + - id: WeaponBaguette \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 5a92bc77f8..613b7bcded 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1743,3 +1743,19 @@ blacklist: components: - SurplusBundle + +- type: listing + id: UplinkCombatBakery + name: uplink-combat-bakery-name + description: uplink-combat-bakery-desc + icon: { sprite: Objects/Consumable/Food/Baked/bread.rsi, state: baguette} + productEntity: CombatBakeryKit + cost: + Telecrystal: 3 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Chef + - Mime \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 51d9465073..31e92931db 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -624,6 +624,21 @@ Quantity: 1 - ReagentId: Blackpepper Quantity: 1 + - type: Clothing + slots: [ BELT ] + equippedPrefix: baguette + quickEquip: false + - type: Item + inhandVisuals: + left: + - state: baguette-inhand-left + right: + - state: baguette-inhand-right + - type: MeleeWeapon + wideAnimationRotation: -120 + damage: + types: + Blunt: 1 # bonk # Tastes like France. - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index 2f4b6009a9..8b455fe872 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -682,3 +682,7 @@ Quantity: 2 - ReagentId: Vitamin Quantity: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml new file mode 100644 index 0000000000..46bd430e5a --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml @@ -0,0 +1,17 @@ +- type: entity + name: baguette + parent: FoodBreadBaguette + id: WeaponBaguette + description: Bon appétit! + suffix: Weapon + components: + - type: MeleeWeapon + wideAnimationRotation: -120 + damage: + types: + Slash: 16 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Reflect + reflectProb: 0.05 + spread: 90 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml new file mode 100644 index 0000000000..8ae52f4d73 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml @@ -0,0 +1,25 @@ +- type: entity + parent: FoodBakedCroissant + id: WeaponCroissant + name: croissant + description: Buttery, flaky goodness. + suffix: Weapon + components: + - type: Fixtures + fixtures: + fix1: + shape: !type:PhysShapeCircle + radius: 0.2 + density: 5 + mask: + - ItemMask + restitution: 0.3 + friction: 0.2 + - type: EmbeddableProjectile + sound: /Audio/Weapons/star_hit.ogg + - type: LandAtCursor + - type: DamageOtherOnHit + damage: + types: + Slash: 5 + Piercing: 10 \ No newline at end of file diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml index 2716310ecf..c84caeb99d 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml @@ -64,6 +64,26 @@ back: - BoxHugNitrogen +# Mime +- type: loadout + id: EmergencyOxygenMime + effects: + - !type:GroupLoadoutEffect + proto: OxygenBreather + storage: + back: + - BoxMime + +- type: loadout + id: EmergencyNitrogenMime + effects: + - !type:GroupLoadoutEffect + proto: NitrogenBreather + storage: + back: + - BoxMimeNitrogen + + # Engineering / Extended - type: loadout id: EmergencyOxygenExtended diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index da49a16ed2..685b0c784f 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -479,6 +479,16 @@ loadouts: - MimeWintercoat +- type: loadoutGroup + id: SurvivalMime + name: loadout-group-survival-mime + minLimit: 2 + hidden: true + loadouts: + - EmergencyNitrogenMime + - EmergencyOxygenMime + - LoadoutSpeciesVoxNitrogen + - type: loadoutGroup id: MusicianJumpsuit name: loadout-group-musician-jumpsuit diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 4a6ca60426..e4c5c0aafb 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -169,7 +169,7 @@ - MimeBackpack - MimeOuterClothing - Glasses - - Survival + - SurvivalMime - Trinkets - type: roleLoadout diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-equipped-BELT.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..93437dd65872e15487bf635580772235480f2c51 GIT binary patch literal 440 zcmV;p0Z0CcP)Px$a!Eu%RCt{2+OcZGFc1ddzom;wp&hgZ(>?SJ`~Z2Qjv6}p6-pjQc>)(owqQCn ztuZ*WIs}!F#gZety5#?M!*O?#1$O`u5fKp)5s|m5gf&{(|BmBaw?jUvO4xak$Bsn~ zqm{L*nfU4h13I88VHe8`@8A0|;+foC=m%}508``n1vg^^G_{}(Fk0EgGCL&U8dW7O z=IlE`9WXC)thd=%u|)Ir_T*h8?*vpO?BmDJu!tt)-X5*G#^mGAUkoL&o7jcYwR?Q$F*dNeEt%NxALaBsltxkc7$uhu^SEg6|RaUXVz+^2d&o i5QWhy$qSE&qWA?bBDypyPSni+0000Px$fJsC_RCt{2+A(gzFcb#hKiv>W(8_DnwF?)3<8Y5ibmR`)g~gnJffYq;5h)U= zqdQQiRaL2q?U(Z4|8_(D{5M!H4Lg^bAK;dK2LS6`uStd`!3prP*||x=YCcw%gk&e?lkoQP zgvV*ACJE6A@O%>Xwp9I0h-M4pd>ZbS_MgV2HVZ@*BX<2?l05@{6MJLy>r^MoKNH%X z#_UpL0%$+TK`JQ=l@DB{XNOPpmPx$pGibPRCt{2+A(gzFcb#hpSBAE30irLx_03L_V05F`SEhjVb?ArE+nU3V+n#(UEW70d@2Yv_|_wCd|i!+A^W?Wb5u3Fq!c7aEIIB+WGjEGQdaAfXRf7 zUVD8z6yo#z(46u4_^-lzf3*CG!`deF3>+)<3}`~nfVC#|3>>>Ddf_ftNb+!7Vu^@| bh<^G6-nrk?cvltO00000NkvXXu0mjfI0N1X literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette.png index de137b2a6268b491d92530e467a51b7ee386593f..e5de3c0bc09387457d0a15996b29c9b41c38c7c0 100644 GIT binary patch delta 288 zcmV+*0pI?K1Fr&*7=Hu<0001iRAA~1T6&4(`l0000i|;Oy!{xO8#yEu00x%}sEUA`U`ZXrKyBEy!(yy?9k3agc;sXqz?>m-{W3 zUocpCyDpI830HY+?yu3RzC@N!3;+b@4L|J$sNXbkm4|x& ziX;b^pY(uTvv9;`&~AT?Lk=Nlz|7{z7Yo6?uH8Ys%BiM(<^Vn?TPbhwI;vQs(P(_W Y0pO&=5t%G(82|tP07*qoM6N<$f<6bbH~;_u diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json index 29bd53c9f0..2761d79f98 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58", + "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955", "size": { "x": 32, "y": 32 @@ -34,6 +34,18 @@ { "name": "baguette" }, + { + "name": "baguette-equipped-BELT", + "directions": 4 + }, + { + "name": "baguette-inhand-left", + "directions": 4 + }, + { + "name": "baguette-inhand-right", + "directions": 4 + }, { "name": "banana" }, diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/france.png b/Resources/Textures/Objects/Storage/boxes.rsi/france.png new file mode 100644 index 0000000000000000000000000000000000000000..f18dd0ca93f8f72e9b872e378c5ef8e1f76fbbfb GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}uAVNAArY-_ z&utWJP!M6ccvVP;sW^L~cemm(H4Vn>2mHqNH>ck}+oa+dv`Kl3Rw>h&e@qwFNjId| koUTvTNKj_J#H`|JpL&Cxt7^HsGtfW=Pgg&ebxsLQ0ADdHCjbBd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index cdae38099d..32b23ef30a 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -223,6 +223,9 @@ }, { "name": "envelope" + }, + { + "name": "france" } ] } From a4bbd133b2dc845f349966000f15ec73561f63cc Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 19 Aug 2024 18:58:36 +0000 Subject: [PATCH 011/298] Automatic changelog update --- Resources/Changelog/Changelog.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5f469bfd78..b478d66fc3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Whisper - changes: - - message: Renamed the player-obtainable "admin cloak" to "weh cloak". - type: Tweak - id: 6667 - time: '2024-06-03T02:18:49.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28540 - author: Vermidia changes: - message: Glass shards are no longer weldable with an unlit welder. @@ -3857,3 +3850,15 @@ id: 7166 time: '2024-08-19T18:47:24.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31197 +- author: themias + changes: + - message: Added the Combat Bakery Kit to the syndicate uplink. Includes a deadly + edible baguette sword and throwing star croissants for 3 TC. + type: Add + - message: Baguettes can be worn on the belt and normal ones do one blunt damage. + type: Tweak + - message: Mimes have a baguette instead of an MRE in their survival kits. + type: Tweak + id: 7167 + time: '2024-08-19T18:57:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31179 From 14ae5fd4287a7ea8d5c0c24a84b7113713c14d24 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Tue, 20 Aug 2024 05:50:03 +1000 Subject: [PATCH 012/298] Bandaid wire sounds (#31067) Issue was tools was predicted but wires aren't so this would exclude user from audio. For now we just do the non-predicted version and I or someone else will fully predict wires later. --- Content.Server/Wires/WiresSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Wires/WiresSystem.cs b/Content.Server/Wires/WiresSystem.cs index e4439ae1da..92dcbb504f 100644 --- a/Content.Server/Wires/WiresSystem.cs +++ b/Content.Server/Wires/WiresSystem.cs @@ -725,7 +725,7 @@ public sealed class WiresSystem : SharedWiresSystem break; } - Tool.PlayToolSound(toolEntity, tool, user); + Tool.PlayToolSound(toolEntity, tool, null); if (wire.Action == null || wire.Action.Cut(user, wire)) { wire.IsCut = true; @@ -746,7 +746,7 @@ public sealed class WiresSystem : SharedWiresSystem break; } - Tool.PlayToolSound(toolEntity, tool, user); + Tool.PlayToolSound(toolEntity, tool, null); if (wire.Action == null || wire.Action.Mend(user, wire)) { wire.IsCut = false; From 6aada0dfad249e74259654b514f2d2acb86b0844 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 19 Aug 2024 19:51:09 +0000 Subject: [PATCH 013/298] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b478d66fc3..e25ecbf8b8 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Vermidia - changes: - - message: Glass shards are no longer weldable with an unlit welder. - type: Fix - id: 6668 - time: '2024-06-03T03:28:53.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27959 - author: AJCM-git changes: - message: Biomass reclaimers no longer act as a void to any unfortunate belongings @@ -3862,3 +3855,10 @@ id: 7167 time: '2024-08-19T18:57:30.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31179 +- author: metalgearsloth + changes: + - message: Fix wire sounds not playing. + type: Fix + id: 7168 + time: '2024-08-19T19:50:03.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31067 From 2742adb881d091582f603a2bf176dff9ef2085c6 Mon Sep 17 00:00:00 2001 From: Red Mushie <82113471+redmushie@users.noreply.github.com> Date: Mon, 19 Aug 2024 22:36:36 +0200 Subject: [PATCH 014/298] Add Communications Console button tooltips (#31217) * Finally, people can learn what the Broadcast button does! * Also add for Alert level * Add alert level and shuttle button tooltips * Fix dumdum, tweak Broadcast tooltip --- .../Communications/UI/CommunicationsConsoleMenu.xaml | 8 ++++---- .../communications/communications-console-component.ftl | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml index ea2f77d457..83dc42c4a4 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml +++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml @@ -4,14 +4,14 @@ MinSize="400 225"> -