Commit Graph

20 Commits

Author SHA1 Message Date
Ed
b89117f8e6 Revert "Ed 09 06 2024 upstream (#230)" (#233)
This reverts commit 50470c3aaa.
2024-06-11 15:19:27 +03:00
Ed
50470c3aaa Ed 09 06 2024 upstream (#230)
* Revert "Buff the AME until somebody fixes engineering" (#28419)

* Automatic changelog update

* hand teleport portals now may start in the same grid. (#28556)

* Microwave recipes now uses stacktype id instead of entity prototype id for stacked entities (#28225)

* Automatic changelog update

* Add "fill level" sprites to mops and damp rag (#28590)

* Automatic changelog update

* Reword some criminal records text (#28597)

* Update criminal-records.ftl

* Update criminal-records.ftl

* Update criminal-records.ftl

* Remove obsolete VisibilitySystem functions (#28610)

Remove obsolete visibility functions

Co-authored-by: plykiya <plykiya@protonmail.com>

* Prayable datafield typo (#28622)

* notifiactionPrefix -> notificationPrefix

* notifiactionPrefix -> notificationPrefix

* Update engine to v224.1.0 (#28624)

* Use dummy sessions in NukeOpsTest (#28549)

* Add dummy sessions

* Update NukeOpsTest

* Fix PvsBenchmark

* Update engine to v224.1.1 (#28632)

* Add Job preference tests (#28625)

* Misc Job related changes

* Add JobTest

* A

* Aa

* Lets not confuse the yaml linter

* fixes

* a

* Add logs that provide session to player admin logs (#28628)

* Cluster Update (#28627)

done here

* Automatic changelog update

* minor banner changes (#28636)

* minor banner changes

* Uhrmm actchually it's you're, not your

* Update banners.yml

props Hyenh

* Revenant spell catalog locale (#28638)

locale

* Make cuff default range again (#28576)

* Make cuff default range again

* uncuff distance

* how about ONE

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

* Automatic changelog update

* Machine-code cleanup (#28489)

* Make Projectiles Only Hit a Variety of Station Objects Unless Clicked on (#28571)

* Automatic changelog update

* Fix Smoke-grenade.ogg not being mono (#28593)

* Fix Cigars Sprites + YAML fix for Inhand unlit cigars/cigs (#28641)

* Automatic changelog update

* Clean up Eva and Hardsuit helm yml + Lets atmos firesuit helm work as a BreathMask (#28602)

* Shifts borgs hats to the right a bit (#28600)

* Fix mouse inhands (#28623)

* Adjust some touch reaction damage levels (#28591)

* Automatic changelog update

* Add closing storage UIs to StorageInteractionTest (#28633)

* Update rules (#28452)

* Add support for LocalizedDatasets to RandomMetadata (#28601)

* Fix Admin Object tab sorting and search (#28609)

* Automatic changelog update

* Internals are kept on as long as any breathing tool is on (#28595)

* Automatic changelog update

* Convert rules to use guidebook parsing (#28647)

* Gives Insulation and NoSlip to all bots (#28621)

* Gives Insulation and NoSlip to all bots

* remove NoSlip from children

* Automatic changelog update

* Nerfs welderbombing (#28650)

nerf welderbombing

* Automatic changelog update

* Give jobs & antags prototypes a guide field (#28614)

* Give jobs & antags prototypes a guide field

* A

* space

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Add todo

* Fix merge errors

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Automatic changelog update

* Fix typo in Space Law's restricted gear (#28668)

This typo was included in the wiki as well.

Reported-by: Bobberson in the Discord

* Automatic changelog update

* fixed "silicones" typo in new rules (#28671)

fixed all appearances of silicone where it should have been silicon

* fix janitor not spawning with a survival box (#28669)

hi

* Automatic changelog update

* Fix typo in slime naming conventions (#28682)

* Flatpacker fixes (#28417)

* Return medicine recipe solid material costs to 1 (#28679)

Set material costs of medicine recipes to 1

* Automatic changelog update

* Update Core (#28689)

add

* Fixed the guidebook listing every single rule (#28680)

* Well i tried this way

* New approach (start)

* Did it

* makes spacelaw available, put it under sec

* Automatic changelog update

* rule fixes first pass (#28701)

update

* Add JobRequirementOverride prototypes (#28607)

* Add JobRequirementOverride prototypes

* a

* invert if

* Add override that takes in prototypes directly

* Tweak chapel salvage wreck (#28703)

add

* Fixes client having authority over rules popup cvars (#28655)

* Fixes client having authority over rules popup cvars

* Delete duplicate migration

* Pre-update

* Post-update

* Add locale support for booze and soda jugs labels (#28708)

* Swap some InRangeUnobstructed for InRangeUnoccluded (#28706)

Swap InRangeUnobstructed to InRangeUnoccluded

Co-authored-by: plykiya <plykiya@protonmail.com>

* Automatic changelog update

* Ports the singularity's values from vgstation (#28720)

* ports the singularity values from vgstation

* guidebook fix

* 5000 energy level 6 singulo

* Fix action icons when dragging an active action to another slot (#28692)

* Add DoPopup data field to OnUseTimerTrigger (#28691)

* Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709)

* Update DevourSystem.cs

* Update DevourSystem.cs

* Update Content.Server/Devour/DevourSystem.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Automatic changelog update

* Improve grammar of various petting messages (#28715)

Improve grammar of various petting message

* Fix DamageOtherOnHit.OnDoHit when the target is terminating or deleted (#28690)

* Update Core (#28735)

add

* Fix flatpacker (#28736)

* Fix flatpacker

* a

* rn, atp (#28674)

* Update speech-chatsan.ftl

* Update word_replacements.yml

* Atm-at the moment

* Atm

* Update Resources/Locale/en-US/speech/speech-chatsan.ftl

* Update Resources/Prototypes/Accents/word_replacements.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Add loadout group check for role proto (#28731)

MFW same bug twice at 2 layers because I'm stupid.

* Automatic changelog update

* Try fix RGBee (#28741)

* Automatic changelog update

* Ensure packager creates a release folder (#28426)

I was screaming at the github actions runner before i noticed something i had done before caused me to never have a release folder and thus fail.

* allow ' in character names (#28652)

* Automatic changelog update

* Make freeze, freeze & mute, and unmute verbs work on disconnected players. (#28664)

* Automatic changelog update

* fix singulo decay (#28743)

* Automatic changelog update

* Don't use invalid defaults for loadouts (#28729)

At the time it made more sense but now with species specific stuff it's better to have nothing.

* Maybe fix invalid loadout prototypes (#28734)

* Maybe fix invalid loadout prototypes

So if we have existing data SetDefault is not normally called iirc. So what I think is happening is that if we have old loadout groups that get saved to DB and loaded these get dropped entirely and nothing is used to replace the group unless the person specifically looks at their loadout.

Need someone affected to send me their loadout to confirm it's fixed.

* Better fix

* Automatic changelog update

* Fix null ref exception in PrayerSystem (#28712)

* Fix null ref exception in PrayerSystem

* Also check that prayable ent/comp still exist

* Guidebook Updates for the Amateur Spessman (#28603)

* Created NewPlayer.xml

* Created NewPlayer.yml and added it to guides.ftl

* shifted some controls from Space Station 14 to New? Start here!, as well as made a character creation xml to be written later

* switched some stuff between the New? entry and the Space Station 14 entry

* Made everything so nice!!!!!!!!!!!!!!

* fixed formatting inconsistencies

* added a How to use this guidebook section

* build correction and guidebook clarification for other servers

* wrote character creation ig probs fo shizzle

* added new terms to the glossary and alphabetized it

* meh this seems important enough to add

* okay no more shitsec bad idea

* I HATED Roleplaying.xml ANYWAY!!!

* I REALLY REALLY HATED IT ACTUALLYLLL

* Moved Controls and Radio into newplayer.yml, making meta.yml and radio.yml obsolete

* Separated the character creation bits that are just cosmetic from the ones that matter

* also put all the related new player xml files in their own folder

* expanded Radio.xml, kinda fixed survival.xml

* removed the line that mighta maybe sorta possibly could encourage self antag

* thought about this randomly but ICK OCK

* talking is no longer a key part of this game

* moves stuff around, a lot of stuff. basically moves everything but the jobs themselves around

* ah probably should make sure this works first also me when i lie on the internet

* don't be such a grammar nukie

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* okay nevermind that's justified

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* prepare. it is coming. the great reorganization...

* yesyes that's all well and goo- THE REORG IS COMING. THE REORG IS COMING. WAKE UP.

* rename that real quick

* step one begins. first, consolidate existing service entries into their own yaml. this makes botany.yml obsolete.

* update shiftandcrew.yml to only have departments as children also fuck it alphabetization

* consolidated salvage into cargo

* made a new entry for command

* gave salvage a home and service an existence

* made some XML files to be filled out later

* quick rename...

* took some stuff from Intro.txt and i think Gameplay.txt and put it in NewPlayer.xml

* The Great Writing about Departments (25XX, black and white)

* added a bunch of links everywhere

* biochemical is no longer a thing

* service formatinaaaaaaa

* shiny...,,,,,,,,, colo(u)rz..,,,,,,,,,,,,,

* let's get that fixed

* second time i made a typo there as well

* we hate fun around here

* grammar?!???/

* various fixes and more linkings

* oops

* wewlad lol!!

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>

* Automatic changelog update

* Add suffixes to excap survival boxes (#28755)

Update emergency.yml

* Add Jani lobby background (#28724)

* Add jani lobby background

* Actually make new lobby screen functional

* Fix license

* Automatic changelog update

* Strip markdown from silicon laws before saying them (#28596)

* saltern update (#28773)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* revert Tornado regex

* Update HumanoidCharacterProfile.cs

* Update arenas.yml

* test

* fix locale

* Update options-menu.ftl

* Update species-names.ftl

* Update debug.yml

* aaaaaa

---------

Co-authored-by: Moony <moony@hellomouse.net>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com>
Co-authored-by: blueDev2 <89804215+blueDev2@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: Hmeister-real <118129069+Hmeister-real@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: Ps3Moira <113228053+ps3moira@users.noreply.github.com>
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com>
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: MerrytheManokit <167581110+MerrytheManokit@users.noreply.github.com>
Co-authored-by: Vasilis <vasilis@pikachu.systems>
Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: UBlueberry <161545003+UBlueberry@users.noreply.github.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2024-06-09 23:53:10 +03:00
Kevin Zheng
6b1524138b Add popup message for activating trigger with hand (#24858) 2024-02-02 19:00:06 +11:00
Aexxie
467e983ba9 Move grenade components to shared (#22691)
* Moves FlashComponent.cs, FlashOnTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared

* Moves ExplodeOnTriggerComponent.cs, OnUseTimerTriggerComponent.cs, ActiveTimerTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared

* Delete .run/Content Server+Client.run.xml

HOW DID THIS GET IN HERE ITS NOT AHHHH

* Update Content.Client/Explosion/SmokeOnTriggerSystem.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update ExplodeOnTriggerComponent.cs

* Revert "Delete .run/Content Server+Client.run.xml"

This reverts commit 29ee05f57de60eab5c92158d8eba5e3acba483c2.

* Fix?

* cannot figure out how to get this to go back please forgive

* Fixes a network issue

* leftovers

* Fixes

---------

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-02-02 00:29:01 +11:00
KP
e5fb3552a7 Prevent entities who do not have hands from setting off bombs. (#22250) 2023-12-10 14:12:59 +11:00
Nemanja
e2eb80c0fe RNG timers for IEDs + small tweaks (#22099) 2023-12-03 13:21:51 +11:00
Psychpsyo
008f2d9d1c Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311)
* Explosive wet floor sign & janitorial suicide vest

* fix attributions

* Remove name & desc from explosive wet floor sign

* Make wet floor sign chameleonable
2023-09-28 00:09:44 -04:00
deltanedas
24810d916b ninja 2 electric boogaloo (#15534)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:20:27 +10:00
Slava0135
25e5930c07 Explosive grenade sound (#15582) 2023-05-02 11:13:39 -04:00
keronshb
ac87effca0 [Revert] Reverts Ninja (#15516)
* Revert "[Antag] add space ninja as midround antag (#14069)"

This reverts commit c1cda0dbf8.

* Revert "[Fix] move ninja objectives into NinjaRole (#15490)"

This reverts commit 251f429fb3.
2023-04-19 01:43:09 -06:00
deltanedas
c1cda0dbf8 [Antag] add space ninja as midround antag (#14069)
* start of space ninja midround antag

* suit has powercell, can be upgraded only (not replaced with equal or worse battery)

* add doorjacking to ninja gloves, power cell, doorjack objective (broken), tweaks

* 💀

* add basic suit power display that uses stamina rsi

* add draining apc/sub/smes - no wires yet

* add research downloading

* ninja starts implanted, move some stuff to yaml

* add Automated field to OnUseTimerTrigger

* implement spider charge and objective

* fix client crash when taking suit off, some refactor

* add survive condition and tweak locale

* add comms console icon for objective

* add calling in a threat - currently revenant and dragon

* combine all glove abilities

* locale

* spark sounds when draining, refactoring

* toggle is actually toggle now

* prevent crash if disabling stealth with outline

* add antag ctrl for ninja, hopefully show greentext

* fix greentext and some other things

* disabling gloves if taken off or suit taken off

* basic energy katana, change ninja loadout

* recallable katana, refactoring

* start of dash - not done yet

* katana dashing ability

* merge upstream + compiling, make AutomatedTimer its own component

* docs and stuff

* partial refactor of glove abilities, still need to move handling

* make dooremaggedevent by ref

* move bunch of stuff to shared - broken

* clean ninja antag verb

* doc

* mark rule config fields as required

* fix client crash

* wip systems refactor

* big refactor of systems

* fuck

* make TryDoElectrocution callable from shared

* finish refactoring?

* no guns

* start with internals on

* clean up glove abilities, add range check

* create soap, in place of ninja throwing stars

* add emp suit ability

* able to eat chefs stolen food in space

* stuff, tell client when un/cloaked but there is bug with gloves

* fix prediction breaking gloves on client

* ninja soap despawns after a minute

* ninja spawns outside the station now, with gps + station coords to navigate

* add cooldown to stun ability

* cant use glove abilities in combat mode

* require empty hand to use glove abilities

* use ghost role spawner

* Update Content.Server/Ninja/Systems/NinjaSuitSystem.cs

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* some review changes

* show powercell charge on examine

* new is needed

* address some reviews

* ninja starts with jetpack, i hope

* partial feedback

* uhh

* pro

* remove pirate from threats list

* use doafter refactor

* pro i gave skeleton jetpack

* some stuff

* use auto gen state

* mr handy

* use EntityQueryEnumerator

* cleanup

* spider charge target anti-troll

* mmmmmm

---------

Co-authored-by: deltanedas <deltanedas@laptop>
Co-authored-by: deltanedas <user@zenith>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
2023-04-17 01:33:27 -06:00
deltanedas
93425f0dd5 add exploding pen from goldeneye (#14421) 2023-03-20 15:32:28 -04:00
Leon Friedrich
881a2b2ece PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
keronshb
21c1cb57ce Makes adjustment to macro bomb implants and how mobstate trigger handles suicide (#12682) 2022-11-20 20:51:44 -06:00
keronshb
671324bef8 Implanters and Subdermal Implants (#11840)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-11-20 17:49:37 +11:00
Veritius
51fa58673a Allow C4's auto-starting when stickied quality to be toggled (#10434) 2022-08-13 22:48:02 -07:00
Alex Evgrashin
fe4dbfd2f6 C4 (#7486) 2022-04-14 15:00:50 -07:00
Leon Friedrich
1b0e7ae0f5 Add Modular grenades (chemnades). (#7138) 2022-03-25 15:17:29 +11:00
Leon Friedrich
b1e719c70d Remove IUse (#7074) 2022-03-12 23:33:23 +11:00
metalgearsloth
803d6056d8 ECS OnUseTimerTrigger (#6369) 2022-01-29 22:45:50 +11:00