From 288dd7099395072801f0f5510e3e0158f41880e9 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Sat, 16 Nov 2024 19:46:38 -0500 Subject: [PATCH 01/16] Adds Cybersun Attorney Jumpsuit (#2217) * meow * meow * meow --- .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 ++++++++ .../DeltaV/Roles/Antags/recruiter.yml | 3 +- .../equipped-INNERCLOTHING.png | Bin 0 -> 1504 bytes .../Jumpsuit/cybersunattorney.rsi/icon.png | Bin 0 -> 496 bytes .../cybersunattorney.rsi/inhand-left.png | Bin 0 -> 597 bytes .../cybersunattorney.rsi/inhand-right.png | Bin 0 -> 586 bytes .../Jumpsuit/cybersunattorney.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index 5d950e6e426..3646bbe0c9c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -407,3 +407,14 @@ sprite: DeltaV/Clothing/Uniforms/Jumpsuit/black_turtleneck.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/black_turtleneck.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformCybersunAttorney + name: cybersun attorney suit + description: This durable Suit Jacket and Turtleneck Combo doubles as an Accounting suit, and includes an extra button. Take that, Nerd-otrasen! + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi diff --git a/Resources/Prototypes/DeltaV/Roles/Antags/recruiter.yml b/Resources/Prototypes/DeltaV/Roles/Antags/recruiter.yml index 2098b1675a5..fa06809b46d 100644 --- a/Resources/Prototypes/DeltaV/Roles/Antags/recruiter.yml +++ b/Resources/Prototypes/DeltaV/Roles/Antags/recruiter.yml @@ -13,8 +13,7 @@ - type: startingGear id: SyndicateRecruiterGear equipment: - jumpsuit: ClothingUniformJumpsuitDetectiveGrey - jumpskirt: ClothingUniformJumpskirtDetectiveGrey + jumpsuit: ClothingUniformCybersunAttorney back: ClothingBackpackSatchel head: ClothingHeadHatFedoraBrown eyes: ClothingEyesGlassesSunglasses diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..d87ce6f08e21457e5a2ed5b7c3aa3ec2a30a459b GIT binary patch literal 1504 zcmV<61t0o}P)Px)fJsC_RCt{2nr}!OXB@}BF%^{5OI#!_Zt)Kho<99UUE=Q;XrlPi`olbZDUW#5t6%D_2ct6jeDO zTk%Smq6VrMpf)}0lsv_GVDlYOMH&c{NO6!U5iDZw3JLhXVkY zcF<^saO~iB1?v}NfN=2wUfzPQ*c~`23d<}DFKfy3wD!9e16A?Du+ufAlG?v$(Ei$l3x{mnOt`dMl`MxFqMSE=`CgoU|1P z`qNXB*x#800Ic_b##zHZ$moDS)kG=$Z=`zMbF~qs3s4tjR2zd>- z@?sMMB_nv`GD+fs+Z}!XO7;aFxl9-+8Nrno(l{x(^Z{Tj6vOYc>tgeltDkoic@ZelGK<^aw9xoD>N*m?UDjb3@*ceT(ehfu&_FMS0K-+9{I&RYS%(470k~bq z{b!PYglOX`sWkpWdUhxp1V-1WM~cJcXV!hsVNQ;5EavWt3gE(%v`m$=Qb zVd9*!z6Rr56p6hUR+lDF|Co1e8WMKRW(rfYt?Q zjc$O}1!#?KfYt?QjjZ>8%moSp-&eL2<-_RfZU2!eFS&~(hz(%E0lwd82I7E;vg2+t z1OV7gCP`DB2w{D~En`jU&rqWoAY2;&$XFqgKJ&WbAI2>zRlv0*haPU6m%CJ@PxgS0!rfbrx8F%^N7feb^tYc3PXSz|Q!%@{jc8epqL0AcbE8V8D~g6<25c{BCS|HVgug&_)|W8JFyp2w4g%SSfr8Iiyf(lG!OA|`FVPfuWM`v zb+$%~G0d_!TTEJj9OmgkzQ*B!)#?;u?8}g3HCraRR;v@Y0AU#%`!e+nQ0$8rY6t~= zV3=h9$6tItPW|VwZh+PWXw8WyMnVVE;#v?2`Xn7;K5}*TvJFU|lP_imn65cb5Awd5 zUyCiRqw^~9A1?H7X-F@uVgLXD4rN$LW=%~1DgXcg2mk;800000(o>TF0000cG3mysu3e4y+$Wwk$vS$I zYsJ006$~Ofdu~l}*;isx7n|#)Q6wp0otVbNVCCPxXywkXx83JgN+`@cd3)2gTydSB zOi3>aS1Gm4uH0?0NwMc!ZP@9K_lGq5SY|kX50hV(q#p54c-EefyradMoBNFf|93TH z=$t+DXw!{Kqsi$DzW=PKUwn7fzcmf{>Jk?tq9V?TT+Iv3wLWn4=+pQQtU|hze;$9I kb^{nue5nzhX}-P;T0k}j5QD&_;K?A$)78&qol`;+039XLNdN!< literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..018c6b3199c44ab902fe98b2517ca145266115c8 GIT binary patch literal 597 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zzk0ejhE&XX zdvl{VQ=km{hxHdl3M1Se1vs@Ta&ZPl_h)2vNHxFE-=WH}Xs_<9n3$Nw8!b7MqMD+* zx;TtF+9nyjT9HxBTXcM8)bf8meEa5m-hX-h`1`$|5B_CPf`P0Mm5G<^j~98pd>64R z>5uu{ja$xXhJKuz_4Dkj30z$&K~`2qfnTGH=6$pI>7lfA^2d^^*%v2repKoZJuq#~ zoMN>Z!CvVl8y3##;XAaK`_9fuR;o^KuD+M=dHDCKpykpp8xj@rBQ4_j6YJE|>O<^f z=CSR0#&F=@n>FX6#f+q0$bXp@%s+8Lj@jz+^>%Z=Z(rUX!M8_gakGS%W_pd_}RMTF*G(Vs$gTwP*yvB94^Ve$)?ZhNtO)0KW(e7BtcCcnh`#J=6E zAo4b&*-E}m@5>ryyRhH9&N|_R!tY%S4xeRH?#njky-^Sj+`NzR6q|xN8zaw2U~1q? ejqptK^<~fkvN?bl1TFDpXFs2Ov*vWn zgdI<{xfK_`Y%(hEzdikl5$pA%hgY6FAf`C;?CFPBmb~5=vuwecyFm=mfyW-$a2ExC zZoE@roPKVTz$T64-0SUgnRj^r>E8!~4tyy?Rdwl->hbj;h;_1m(p9>|q@p|}0D+oYR&=FEs}3tj!_iwfvR^RZZ;PK?kaqq9Ua+l{(CsXfoDG}4qLqV^DIn^ z;m5jXHSZUi?caCS|J{aH2i{&4WJuWmNy00wd}{?8!!tHY&45XOFEzq5&DWPf3&`dG UVi33#JQ+lJy85}Sb4q9e0BBSd;s5{u literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/meta.json new file mode 100644 index 00000000000..e0f7bbd7d96 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustanOrange", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 222c9e8ac99939c019ba19298ecbd41bc3ac4a7f Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 17 Nov 2024 01:46:57 +0100 Subject: [PATCH 02/16] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 20173be5b1b..b5e4c268313 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Loonessia - changes: - - message: Deep fried burned food items should now have a description - type: Fix - id: 177 - time: '2023-12-21T02:15:30.0000000+00:00' - author: Adrian16199 changes: - message: Head of personel has gotten back their armoured coat. @@ -3733,3 +3727,10 @@ id: 676 time: '2024-11-16T14:09:13.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2209 +- author: JustAnOrange, Lyndomen + changes: + - message: Syndicate recruiters arrive with more swagger + type: Add + id: 677 + time: '2024-11-17T00:46:38.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2217 From 4d1a2f028885668b46def7208b3f930ae29673dc Mon Sep 17 00:00:00 2001 From: DisposableCrewmember42 Date: Sun, 17 Nov 2024 00:48:14 +0000 Subject: [PATCH 03/16] tweak: Make maroon towel require Justice instead of Lawyer time (#2215) tweak: Maroon towel should require Justice time, not Lawyer time --- Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index a6b106953da..1144af73d72 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -322,8 +322,8 @@ effects: - !type:JobRequirementLoadoutEffect requirement: - !type:RoleTimeRequirement - role: JobLawyer + !type:DepartmentTimeRequirement # DeltaV - Use Justice department time instead of Lawyer job time + department: Justice time: 360000 # 100hr storage: back: From d406781bff6abcc7cef237e48f9e9eba1ca52eea Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 17 Nov 2024 01:48:33 +0100 Subject: [PATCH 04/16] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index b5e4c268313..9c53f7c583d 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Adrian16199 - changes: - - message: Head of personel has gotten back their armoured coat. - type: Add - id: 178 - time: '2023-12-21T02:17:25.0000000+00:00' - author: DebugOk changes: - message: Merged wizden. The upstream changelog may contain incorrect entries. @@ -3734,3 +3728,10 @@ id: 677 time: '2024-11-17T00:46:38.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2217 +- author: DisposableCrewmember42 + changes: + - message: Prosecutors now get the towels they deserve. + type: Tweak + id: 678 + time: '2024-11-17T00:48:14.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2215 From bcd792a68a71431e4f623721c71f0149c9724054 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2024 03:50:42 +0000 Subject: [PATCH 05/16] Update Credits (#2218) Co-authored-by: DeltaV-Bot --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index da920361921..d63e8432bfe 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, avghdev, Awlod, azzy, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, eternally-confused, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, HighTechPuddle, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, IamVelcroboy, ian, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, LittleNyanCat, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, MilonPL, Minemoder5000, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PPooch, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samsterious, SaphireLattice, SapphicOverload, sarahon, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThataKat, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, theOperand, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vitalvitriol, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex +0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, avghdev, Awlod, azzy, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, Eternally-Confused, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, HawkeyeBlade, he1acdvv, Hebi, Henry, HerCoyote23, HighTechPuddle, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, IamVelcroboy, ian, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, LittleNyanCat, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, MilonPL, Minemoder5000, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PPooch, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samsterious, SaphireLattice, SapphicOverload, sarahon, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThataKat, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, theOperand, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomce795, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vitalvitriol, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex From a262626131250982edb00ced5480a836ce25eb05 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 17 Nov 2024 01:45:10 -0300 Subject: [PATCH 06/16] Buff beanbags shells (#2219) * Restored beanbag stam damage * Maybe drop that 5 * Let's NOT drop that 5 --- .../Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d8c465cf9e8..92847d211e1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -26,7 +26,7 @@ types: Blunt: 10 - type: StaminaDamageOnCollide - damage: 40 # 3 hits to stun + damage: 55 # DeltaV - Modified the beanbag stamina damage, was 40. - type: entity id: PelletShotgun From 55a4ca00d0ade9d30dec048a9c16da860f2e616c Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 17 Nov 2024 05:45:29 +0100 Subject: [PATCH 07/16] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 9c53f7c583d..eb81f392590 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,12 +1,4 @@ Entries: -- author: DebugOk - changes: - - message: Merged wizden. The upstream changelog may contain incorrect entries. - type: Add - - message: The random client freezes/crashes should be mostly gone. - type: Fix - id: 179 - time: '2023-12-22T23:46:32.0000000+00:00' - author: ps3moira changes: - message: Reverted in-hand E-Sword sprites. @@ -3735,3 +3727,10 @@ id: 678 time: '2024-11-17T00:48:14.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2215 +- author: Radezolid + changes: + - message: Beanbags hits hard again, bartenders rejoice! + type: Tweak + id: 679 + time: '2024-11-17T04:45:10.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2219 From 129b8f7cf3b93651f1a7b3453a11de2dd5b3c926 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Sun, 17 Nov 2024 07:10:01 -0600 Subject: [PATCH 08/16] Adds the Energy Shotgun to HOS lockers (#2182) * Adds e-shotgun Signed-off-by: Stop-Signs * Fixed the projectiles Signed-off-by: Stop-Signs * 3-5 buisness days later Signed-off-by: Stop-Signs * Typo Signed-off-by: Stop-Signs * Requested Changes * Update projectiles.yml Signed-off-by: Stop-Signs --------- Signed-off-by: Stop-Signs --- Resources/Prototypes/Catalog/Fills/Lockers/heads.yml | 2 +- .../Objects/Weapons/Guns/Projectiles/projectiles.yml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 9694ba828e5..5d704b40a47 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -327,7 +327,7 @@ - !type:NestedSelector # DeltaV tableId: LockerFillHeadOfSecurityDeltaV - id: BookSecretDocuments - #- id: WeaponEnergyShotgun # DeltaV - replaced by X-01 + - id: WeaponEnergyShotgun - id: BookSpaceLaw - id: BoxEncryptionKeySecurity - id: CigarGoldCase diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 184b2c2391b..167a51e402c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1030,15 +1030,16 @@ bounds: "-0.15,-0.3,0.15,0.3" hard: false mask: - - Impassable - - BulletImpassable + # - Impassable + # - BulletImpassable + - Opaque # Delta-V changed from impassable so that they can go through windows fly-by: *flybyfixture - type: Ammo - type: Projectile impactEffect: BulletImpactEffectOrangeDisabler damage: types: - Heat: 13 + Heat: 10 # DeltaV changed from 13 to 10 - type: entity name: wide laser barrage From a3e234c60f842b37a65ae3453feba76169ddeeb7 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 17 Nov 2024 14:10:20 +0100 Subject: [PATCH 09/16] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index eb81f392590..b38f09083e0 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: ps3moira - changes: - - message: Reverted in-hand E-Sword sprites. - type: Tweak - id: 180 - time: '2023-12-24T02:56:01.0000000+00:00' - author: deltanedas changes: - message: Ore Bags of Holding now use bluespace crystals instead of uranium. @@ -3734,3 +3728,10 @@ id: 679 time: '2024-11-17T04:45:10.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2219 +- author: Stop-Signs + changes: + - message: Heads of Security will now have an energy shotgun in their locker. + type: Add + id: 680 + time: '2024-11-17T13:10:01.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2182 From 6f12c412bbf941a6dfd70ae3ea334a2f462f6959 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 17 Nov 2024 10:24:03 -0300 Subject: [PATCH 10/16] Removed the CJ cloak from the uniform printer. (#2180) --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 6761b7f1812..9d36f2ce94c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1233,7 +1233,6 @@ - ClothingOuterWinterQM - ClothingOuterWinterRD - ClothingOuterChiefJustice # DeltaV - Chief Justice - - ClothingNeckCloakCJ # DeltaV - Chief Justice - ClothingOuterStasecSweater # DeltaV - added stasec sweater to uniform printer. - ClothingOuterWinterMusician - ClothingOuterWinterClown From 4046b133aa2e67fd8a9f8174273206f70ad113ef Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 17 Nov 2024 14:24:22 +0100 Subject: [PATCH 11/16] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index b38f09083e0..c6c5f5e417b 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Ore Bags of Holding now use bluespace crystals instead of uranium. - type: Tweak - id: 181 - time: '2023-12-24T19:58:23.0000000+00:00' - author: Adrian16199 changes: - message: Fixes cyborgs spawning with nearsighted trait. @@ -3735,3 +3729,10 @@ id: 680 time: '2024-11-17T13:10:01.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2182 +- author: Radezolid + changes: + - message: Removed the Chief Justice cloak from the uniform printer. + type: Remove + id: 681 + time: '2024-11-17T13:24:04.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2180 From 15c8f47204a476e59efd8e34e808ff5308ac5d6e Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Sun, 17 Nov 2024 11:06:47 -0800 Subject: [PATCH 12/16] Genaric radio implants are no longer syndicate branded (#2159) * First commit * Minor fix * Requested changes * grammar --- .../Locale/en-US/deltav/store/uplink-catalog.ftl | 3 --- .../DeltaV/Catalog/Cargo/cargo_medical.yml | 10 ++++++++++ .../DeltaV/Catalog/Fills/Crates/medical.yml | 10 ++++++++++ .../Prototypes/DeltaV/Catalog/uplink_catalog.yml | 15 --------------- .../DeltaV/Entities/Objects/Misc/implanters.yml | 2 +- .../Entities/Objects/Misc/subdermal_implants.yml | 2 +- 6 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Catalog/Fills/Crates/medical.yml diff --git a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl index 204ab670aab..f1dd8e2ee01 100644 --- a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl @@ -11,9 +11,6 @@ uplink-syndicate-radio-implanter-desc = A cranial implant that lets you talk on uplink-syndicate-radio-implanter-bundle-name = Syndicate Radio Implanter Bundle uplink-syndicate-radio-implanter-bundle-desc = Two implanters for the price of one and a half! Share one with your Syndicate friend. -uplink-generic-radio-implanter-name = Generic Radio Implanter -uplink-generic-radio-implanter-desc = A cranial implant with a bluespace compartment for a single encryption key (not included). Put in a key of your choice, and you can talk using it like you would with any headset. - uplink-doorjack-name = Airlock Access Override uplink-doorjack-desc = A specialized cryptographic sequencer, designed solely to doorjack NanoTrasen's updated airlocks. Does not tamper with anything else. diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml index 503fb675ff1..16a6d2c883e 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml @@ -7,3 +7,13 @@ cost: 500 category: Medical group: market + +- type: cargoProduct + id: RadioImplantCrate + icon: + sprite: Objects/Specific/Medical/implanter.rsi + state: implanter0 + product: CrateGenericRadioImplants + cost: 1500 + category: Medical + group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/medical.yml new file mode 100644 index 00000000000..edcfcab151b --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/medical.yml @@ -0,0 +1,10 @@ +- type: entity + id: CrateGenericRadioImplants + parent: CrateMedical + name: radio implant crate + description: Communicate without having a pesky headset on your ear. + components: + - type: StorageFill + contents: + - id: GenericRadioImplanter + amount: 3 diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml index 35375518abe..05a7582cd35 100644 --- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml @@ -75,21 +75,6 @@ categories: - UplinkImplants - -- type: listing - id: UplinkGenericRadioImplanter - name: uplink-generic-radio-implanter-name - description: uplink-generic-radio-implanter-desc - icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: crypt_rusted } - productEntity: GenericRadioImplanter - discountCategory: usualDiscounts - discountDownTo: - Telecrystal: 1 - cost: - Telecrystal: 2 - categories: - - UplinkImplants - - type: listing id: UplinkDoorjack name: uplink-doorjack-name diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml index 4ab1652850c..b0f8741d81f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml @@ -7,7 +7,7 @@ implant: BionicSyrinxImplant - type: entity - parent: BaseImplantOnlyImplanterSyndi + parent: BaseImplantOnlyImplanter id: GenericRadioImplanter suffix: generic radio components: diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml index 279dc25cbed..883c48bccf3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml @@ -21,7 +21,7 @@ parent: StorageImplant id: RadioImplant name: generic radio implant - description: This implant contains a radio augmentation with a bluespace compartment for an encryption key. It allows its user to communicate on the key's channels. + description: This implant contains a radio augmentation with a hidden compartment for an encryption key. It allows its user to communicate on the key's channels. components: - type: SubdermalImplant implantAction: ActionOpenRadioImplant From 177f4e1568edd3ad46aa23e4d7ccda7d5eb6ab05 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 17 Nov 2024 20:07:06 +0100 Subject: [PATCH 13/16] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index c6c5f5e417b..ee2b195beb6 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Adrian16199 - changes: - - message: Fixes cyborgs spawning with nearsighted trait. - type: Fix - id: 182 - time: '2023-12-27T17:55:07.0000000+00:00' - author: Adrian16199 changes: - message: 'Added 3 classic hairstyles: Long hair, Long hair 2, Long hair 3.' @@ -3736,3 +3730,10 @@ id: 681 time: '2024-11-17T13:24:04.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2180 +- author: Beck Thompson + changes: + - message: Generic radio implants are no longer syndicate branded. + type: Tweak + id: 682 + time: '2024-11-17T19:06:47.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2159 From 561f9e0edc8b87d1dc5e6ba68b72a42d603e1a38 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Sun, 17 Nov 2024 21:08:58 -0500 Subject: [PATCH 14/16] Adjust Security Loadouts, adds alternative firearms (#2214) * meow * meow * meow * meow * meow * Update security_officer.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update role_loadouts.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update loadout_groups.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update loadout_groups.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * meow * Update security_cadet.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --------- Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --- .../deltav/preferences/loadout-groups.ftl | 7 ++ .../Weapons/Guns/Revolvers/revolvers.yml | 4 +- .../Loadouts/Jobs/Security/detective.yml | 50 +++++++++++++ .../Jobs/Security/security_officer.yml | 31 ++++++++ .../DeltaV/Loadouts/loadout_groups.yml | 71 +++++++++++++++++++ .../DeltaV/Loadouts/role_loadouts.yml | 2 + .../DeltaV/Roles/Jobs/Security/brigmedic.yml | 4 +- .../Prototypes/Loadouts/role_loadouts.yml | 8 +++ .../Nyanotrasen/Loadouts/role_loadouts.yml | 2 + .../Roles/Jobs/Security/prisonguard.yml | 7 +- .../Roles/Jobs/Security/detective.yml | 2 +- .../Roles/Jobs/Security/head_of_security.yml | 4 +- .../Roles/Jobs/Security/security_cadet.yml | 2 +- .../Roles/Jobs/Security/security_officer.yml | 4 +- .../Prototypes/Roles/Jobs/Security/warden.yml | 4 +- 15 files changed, 189 insertions(+), 13 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/detective.yml create mode 100644 Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/security_officer.yml diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index 696289c12a9..f51713b0d42 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -93,6 +93,13 @@ loadout-group-brig-medic-outerclothing = Corpsman outer clothing loadout-group-prison-guard-head = Prison Guard head loadout-group-prison-guard-jumpsuit = Prison Guard jumpsuit +loadout-group-security-gun = Security Sidearm +loadout-group-revolver-gun = Security Revolver +loadout-group-all-gun = Security Sidearm +loadout-group-security-gun-ammo = Ammunition +loadout-group-revolver-ammo = Ammunition +loadout-group-all-ammo = Ammunition + # Justice loadout-group-chiefjustice-head = Chief Justice head loadout-group-chiefjustice-jumpsuit = Chief Justice jumpsuit diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index a19a21dd924..615f45bfc01 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -42,7 +42,7 @@ tags: - CartridgeSpecial - SpeedLoaderSpecial - proto: CartridgeSpecialRubber + proto: CartridgeSpecial capacity: 6 chambers: [ True, True, True, True, True, True ] ammoSlots: [ null, null, null, null, null, null ] @@ -67,7 +67,7 @@ tags: - CartridgeSpecial - SpeedLoaderSpecial - proto: CartridgeSpecialRubber + proto: CartridgeSpecial capacity: 6 chambers: [ True, True, True, True, True, True ] ammoSlots: [ null, null, null, null, null, null ] diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/detective.yml new file mode 100644 index 00000000000..5687a12c82e --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/detective.yml @@ -0,0 +1,50 @@ +- type: loadout + id: SecurityRevolverWeaponRevolverLucky + storage: + belt: + - WeaponRevolverLucky + +- type: loadout + id: SecurityRevolverInspector + storage: + belt: + - WeaponRevolverInspector + +- type: loadout + id: SecurityFirearmSpeedLoaderMagnumRubber + storage: + back: + - SpeedLoaderMagnumRubber + +- type: loadout + id: SecurityFirearmSpeedLoaderMagnum + storage: + back: + - SpeedLoaderMagnum + +- type: loadout + id: SecurityFirearmSpeedLoaderSpecialRubber + storage: + back: + - SpeedLoaderSpecialRubber + +- type: loadout + id: SecurityFirearmSpeedLoaderSpecial + storage: + back: + - SpeedLoaderSpecial + +- type: loadout + id: SecurityFirearmWeaponRevolverFitz + equipment: + pocket1: WeaponRevolverFitz + +- type: loadout + id: SecurityFirearmWeaponRevolverK38Master + equipment: + pocket1: WeaponRevolverK38Master + +- type: loadout + id: SecurityFirearmWeaponRevolverDeckard + equipment: + pocket1: WeaponRevolverDeckard diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/security_officer.yml new file mode 100644 index 00000000000..00b5ff1dd97 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/security_officer.yml @@ -0,0 +1,31 @@ +- type: loadout + id: SecurityFirearmWeaponPistolPollock + equipment: + pocket1: WeaponPistolPollock + +- type: loadout + id: SecurityFirearmWeaponPistolSLP57 + equipment: + pocket1: WeaponPistolSLP57 + +- type: loadout + id: SecurityFirearmWeaponPistolMk58 + equipment: + pocket1: WeaponPistolMk58 + +- type: loadout + id: SecurityFirearmWeaponDisabler + equipment: + pocket1: WeaponDisabler + +- type: loadout + id: SecurityFirearmMagazinePistolRubber + storage: + back: + - MagazinePistolRubber + +- type: loadout + id: SecurityFirearmMagazinePistol + storage: + back: + - MagazinePistol diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index 7fd6c8d0bf1..1c59146021f 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -140,6 +140,77 @@ loadouts: - MimeHead +## Security Guns +- type: loadoutGroup + id: SecurityFirearm + name: loadout-group-security-gun + minLimit: 0 + maxLimit: 1 + loadouts: + - SecurityFirearmWeaponPistolPollock + - SecurityFirearmWeaponPistolSLP57 + - SecurityFirearmWeaponPistolMk58 + - SecurityFirearmWeaponDisabler + +- type: loadoutGroup + id: SecurityRevolverFirearm + name: loadout-group-revolver-gun + minLimit: 0 + maxLimit: 1 + loadouts: + - SecurityRevolverInspector + - SecurityFirearmWeaponRevolverFitz + - SecurityRevolverWeaponRevolverLucky + +- type: loadoutGroup + id: SecurityFirearmAmmo + name: loadout-group-security-gun-ammo + minLimit: 0 + maxLimit: 2 + loadouts: + - SecurityFirearmMagazinePistol + - SecurityFirearmMagazinePistolRubber + +- type: loadoutGroup + id: SecurityRevolverAmmo + name: loadout-group-revolver-ammo + minLimit: 0 + maxLimit: 2 + loadouts: + - SecurityFirearmSpeedLoaderMagnumRubber + - SecurityFirearmSpeedLoaderMagnum + - SecurityFirearmSpeedLoaderSpecialRubber + - SecurityFirearmSpeedLoaderSpecial + +- type: loadoutGroup + id: SecurityAllFirearm + name: loadout-group-all-gun + minLimit: 0 + maxLimit: 1 + loadouts: + - SecurityFirearmWeaponPistolPollock + - SecurityFirearmWeaponPistolSLP57 + - SecurityFirearmWeaponPistolMk58 + - SecurityFirearmWeaponDisabler + - SecurityRevolverInspector + - SecurityFirearmWeaponRevolverFitz + - SecurityRevolverWeaponRevolverLucky + - SecurityFirearmWeaponRevolverDeckard + - SecurityFirearmWeaponRevolverK38Master + +- type: loadoutGroup + id: SecurityAllAmmo + name: loadout-group-all-ammo + minLimit: 0 + maxLimit: 2 + loadouts: + - SecurityFirearmMagazinePistol + - SecurityFirearmMagazinePistolRubber + - SecurityFirearmSpeedLoaderMagnumRubber + - SecurityFirearmSpeedLoaderMagnum + - SecurityFirearmSpeedLoaderSpecialRubber + - SecurityFirearmSpeedLoaderSpecial + # Justice ## Chief Justice - type: loadoutGroup diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index d6b9a35b865..9fdfac860e7 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -28,6 +28,8 @@ - SurvivalSecurity - Trinkets - GroupSpeciesBreathToolCorpsman + - SecurityFirearm + - SecurityFirearmAmmo # Justice - type: roleLoadout diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml index ade0e69ba77..92531a870d9 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml @@ -34,7 +34,7 @@ id: CorpsmanPDA ears: ClothingHeadsetBrigmedic belt: ClothingBeltCorpsmanWebbingFilled - pocket1: WeaponPistolMk58Nonlethal + # pocket1: WeaponPistolMk58Nonlethal # DeltaV - loadouts storage: back: - EmergencyRollerBedSpawnFolded @@ -44,4 +44,4 @@ - BruteAutoInjector - BurnAutoInjector - BurnAutoInjector - - MagazinePistol + # - MagazinePistol # DeltaV - loadouts diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index e23906e6ccd..df45e3199ed 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -370,6 +370,8 @@ - Trinkets - SecurityStar - GroupSpeciesBreathToolSecurity + - SecurityAllFirearm # DeltaV - loadouts + - SecurityAllAmmo # DeltaV - loadouts - type: roleLoadout id: JobWarden @@ -385,6 +387,8 @@ - Trinkets - SecurityStar - GroupSpeciesBreathToolSecurity + - SecurityAllFirearm # DeltaV - loadouts + - SecurityAllAmmo # DeltaV - loadouts - type: roleLoadout id: JobSecurityOfficer @@ -401,6 +405,8 @@ - Trinkets - SecurityStar - GroupSpeciesBreathToolSecurity + - SecurityFirearm # DeltaV - loadouts + - SecurityFirearmAmmo # DeltaV - loadouts - type: roleLoadout id: JobDetective @@ -416,6 +422,8 @@ - Trinkets - SecurityStar - GroupSpeciesBreathToolSecurity + - SecurityRevolverFirearm # DeltaV - loadouts + - SecurityRevolverAmmo # DeltaV - loadouts - type: roleLoadout id: JobSecurityCadet diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml index 5a7f6576a80..5c6cf00d2ae 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml @@ -40,6 +40,8 @@ - SurvivalSecurity - Trinkets - GroupSpeciesBreathToolSecurity + - SecurityFirearm # DeltaV - loadouts + - SecurityFirearmAmmo # DeltaV - loadouts # Wildcards - type: roleLoadout diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml index 48cf45ea679..ae458736491 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml @@ -30,4 +30,9 @@ equipment: eyes: ClothingEyesGlassesSecurity id: PrisonGuardPDA - ears: ClothingHeadsetPrisonGuard #DeltaV + ears: ClothingHeadsetPrisonGuard # begin DeltaV + storage: + back: + - Flash + # - MagazinePistol # end DeltaV + diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 99a23c07f65..90d8cb55d6b 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -29,7 +29,7 @@ eyes: ClothingEyesGlassesSecurity id: DetectivePDA ears: ClothingHeadsetSecurity - belt: ClothingBeltHolsterFilled + belt: ClothingBeltHolster # DeltaV - loadouts storage: back: - Flash diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 7c95ec3c948..563d83357e2 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -52,8 +52,8 @@ id: HoSPDA gloves: ClothingHandsGlovesCombat ears: ClothingHeadsetAltSecurity - pocket1: WeaponPistolMk58Nonlethal + # pocket1: WeaponPistolMk58Nonlethal # DeltaV - loadouts storage: back: - Flash - - MagazinePistol + # - MagazinePistol # DeltaV - loadouts diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index b3a4087f469..990bae155fb 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -33,7 +33,7 @@ id: SecurityCadetPDA ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled -# pocket1: WeaponPistolMk58Nonlethal # DeltaV - Security Cadet doesn't spawn with a gun + pocket1: WeaponDisabler # DeltaV - loadouts, Security Cadet doesn't spawn with a gun pocket2: BookSecurity storage: back: diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index dc8da68f50a..1a1756f7a2e 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -27,8 +27,8 @@ equipment: eyes: ClothingEyesGlassesSecurity ears: ClothingHeadsetSecurity - pocket1: WeaponPistolMk58Nonlethal + # pocket1: WeaponPistolMk58Nonlethal # DeltaV - loadouts storage: back: - Flash - - MagazinePistol + # - MagazinePistol # DeltaV - loadouts diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 2ed3edfb751..582eb160ddf 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -35,8 +35,8 @@ eyes: ClothingEyesGlassesSecurity id: WardenPDA ears: ClothingHeadsetSecurity - pocket1: WeaponPistolMk58Nonlethal + # pocket1: WeaponPistolMk58Nonlethal # DeltaV - loadouts storage: back: - Flash - - MagazinePistol + # - MagazinePistol # DeltaV - loadouts From 5335074ee55dba8228fcc4083c38d50cc277bf56 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 18 Nov 2024 03:09:17 +0100 Subject: [PATCH 15/16] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index ee2b195beb6..7529c355db4 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Adrian16199 - changes: - - message: 'Added 3 classic hairstyles: Long hair, Long hair 2, Long hair 3.' - type: Add - id: 183 - time: '2023-12-27T18:23:39.0000000+00:00' - author: BramvanZijp changes: - message: Security dogs now can wear an id card and radio, are able to drag things, @@ -3737,3 +3731,11 @@ id: 682 time: '2024-11-17T19:06:47.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2159 +- author: Lyndomen + changes: + - message: Security roles may select their service weapon in loadouts, along with + their ammunition of choice + type: Add + id: 683 + time: '2024-11-18T02:08:58.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2214 From 39d9ea854d66a1397bed89b6cb40179a358c7ca2 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Sun, 17 Nov 2024 22:33:27 -0500 Subject: [PATCH 16/16] Change Kill Person to "Teach person a lesson" (#2184) * bogos binted * bogos binted * bogos binted * bogos binted * bogos binted * bogos binted * bogos binted * fixes, still doesnt stay completed. * fixed real * meow * meow --- .../TeachLessonConditionComponent.cs | 10 ++++ .../Systems/TeachLessonConditionSystem.cs | 48 +++++++++++++++++++ .../objectives/conditions/teach-person.ftl | 1 + .../Prototypes/DeltaV/Objectives/traitor.yml | 29 +++++++++++ .../Prototypes/Objectives/objectiveGroups.yml | 3 +- 5 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 Content.Server/DeltaV/Objectives/Components/TeachLessonConditionComponent.cs create mode 100644 Content.Server/DeltaV/Objectives/Systems/TeachLessonConditionSystem.cs create mode 100644 Resources/Locale/en-US/deltav/objectives/conditions/teach-person.ftl diff --git a/Content.Server/DeltaV/Objectives/Components/TeachLessonConditionComponent.cs b/Content.Server/DeltaV/Objectives/Components/TeachLessonConditionComponent.cs new file mode 100644 index 00000000000..ee86f4851b3 --- /dev/null +++ b/Content.Server/DeltaV/Objectives/Components/TeachLessonConditionComponent.cs @@ -0,0 +1,10 @@ +using Content.Server.Objectives.Systems; + +namespace Content.Server.Objectives.Components; + +/// +/// Requires that a target dies once and only once. +/// Depends on to function. +/// +[RegisterComponent, Access(typeof(TeachLessonConditionSystem))] +public sealed partial class TeachLessonConditionComponent : Component; diff --git a/Content.Server/DeltaV/Objectives/Systems/TeachLessonConditionSystem.cs b/Content.Server/DeltaV/Objectives/Systems/TeachLessonConditionSystem.cs new file mode 100644 index 00000000000..8e3ca19f885 --- /dev/null +++ b/Content.Server/DeltaV/Objectives/Systems/TeachLessonConditionSystem.cs @@ -0,0 +1,48 @@ +using Content.Server.Objectives.Components; +using Content.Shared.GameTicking; +using Content.Shared.Mind; +using Content.Shared.Objectives.Components; + +namespace Content.Server.Objectives.Systems; + +/// +/// Handles teach a lesson condition logic, does not assign target. +/// +public sealed class TeachLessonConditionSystem : EntitySystem +{ + [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private readonly TargetObjectiveSystem _target = default!; + + private readonly List _wasKilled = []; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnGetProgress); + SubscribeLocalEvent(OnRoundEnd); + } + + private void OnGetProgress(Entity ent, ref ObjectiveGetProgressEvent args) + { + if (!_target.GetTarget(ent, out var target)) + return; + + args.Progress = GetProgress(target.Value); + } + + private float GetProgress(EntityUid target) + { + if (TryComp(target, out var mind) && mind.OwnedEntity != null && !_mind.IsCharacterDeadIc(mind)) + return _wasKilled.Contains(target) ? 1f : 0f; + + _wasKilled.Add(target); + return 1f; + } + + // Clear the wasKilled list on round end + private void OnRoundEnd(RoundRestartCleanupEvent ev) + { + _wasKilled.Clear(); + } +} diff --git a/Resources/Locale/en-US/deltav/objectives/conditions/teach-person.ftl b/Resources/Locale/en-US/deltav/objectives/conditions/teach-person.ftl new file mode 100644 index 00000000000..292db0a91ac --- /dev/null +++ b/Resources/Locale/en-US/deltav/objectives/conditions/teach-person.ftl @@ -0,0 +1 @@ +objective-condition-teach-person-title = Teach {$targetName}, {CAPITALIZE($job)} a lesson diff --git a/Resources/Prototypes/DeltaV/Objectives/traitor.yml b/Resources/Prototypes/DeltaV/Objectives/traitor.yml index cb8f5455823..28bd9a1f895 100644 --- a/Resources/Prototypes/DeltaV/Objectives/traitor.yml +++ b/Resources/Prototypes/DeltaV/Objectives/traitor.yml @@ -50,3 +50,32 @@ - type: StealCondition stealGroup: AnimalSilvia owner: job-name-cmo + +# teach lesson +- type: entity + abstract: true + parent: BaseTargetObjective + id: BaseTeachLessonObjective + components: + - type: Objective + unique: false + icon: + sprite: Objects/Weapons/Guns/Pistols/viper.rsi + state: icon + - type: ObjectiveBlacklistRequirement + blacklist: + components: + - SocialObjective + +- type: entity + parent: [BaseTraitorObjective, BaseTeachLessonObjective] + id: TeachLessonRandomPersonObjective + description: Kill them, and show everyone we mean business. They only need to die once. + components: + - type: Objective + difficulty: 1.75 + unique: false + - type: TargetObjective + title: objective-condition-teach-person-title + - type: PickRandomPerson + - type: TeachLessonCondition diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index d870db5d364..bfc7122c6d6 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -32,7 +32,8 @@ - type: weightedRandom id: TraitorObjectiveGroupKill weights: - KillRandomPersonObjective: 1 + # KillRandomPersonObjective: 1 # DeltaV Replaced for Teach Lesson + TeachLessonRandomPersonObjective: 1 KillRandomHeadObjective: 0.25 - type: weightedRandom