Will-Oliver-Br
07d2610a86
Port Medical Patches ( #2185 )
...
Port medical patches from
[Goob-Station](https://github.com/Goob-Station/Goob-Station ).
Prs:
https://github.com/space-wizards/space-station-14/pull/30230
https://github.com/Goob-Station/Goob-Station/pull/493
https://github.com/Goob-Station/Goob-Station/pull/663
https://github.com/Goob-Station/Goob-Station/pull/1086
https://github.com/Goob-Station/Goob-Station/pull/1072
https://github.com/Goob-Station/Goob-Station/pull/1243
https://github.com/Goob-Station/Goob-Station/pull/1246
https://github.com/Goob-Station/Goob-Station/pull/1707
---
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
---
🆑 deltanedas, jorgun, fishbait_x, Huffs-The-Frezone, Teapug, Speebr0,
CerberusWolfie, yglop, botanySupremist, Will-Oliver-Br
- add: Added medical patches
- add: Added a guidebook entry for medical patches.
---------
Signed-off-by: Will-Oliver-Br <164823659+Will-Oliver-Br@users.noreply.github.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: fishbait <gnesse@gmail.com >
Co-authored-by: unknown <Administrator@DESKTOP-PMRIVVA.kommune.indresogn.no >
Co-authored-by: Fishbait <Fishbait@git.ml >
Co-authored-by: Theapug <159912420+Teapug@users.noreply.github.com >
Co-authored-by: Speebro <100388782+Speebr0@users.noreply.github.com >
Co-authored-by: Speebro <speebro@notreal.com >
Co-authored-by: John Willis <143434770+CerberusWolfie@users.noreply.github.com >
Co-authored-by: yglop <95057024+yglop@users.noreply.github.com >
Co-authored-by: botanySupremist <160211017+botanySupremist@users.noreply.github.com >
Co-authored-by: botanySupremist <definitelyrealBotSupremist@gmail.com >
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
2025-07-20 13:21:18 +10:00
sleepyyapril
885ee5a831
Wizmerge for Station AI ( #1351 )
...
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
the adding AI is now up to y'all because i'm not touching loadout code
for name datasets, but it shouldn't be too bad from here
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com >
Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com >
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: themias <89101928+themias@users.noreply.github.com >
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com >
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com >
Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com >
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com >
Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
Co-authored-by: Intoxicating-Innocence <188202277+Intoxicating-Innocence@users.noreply.github.com >
Co-authored-by: Saphire <lattice@saphi.re >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: CaasGit <87243814+CaasGit@users.noreply.github.com >
Co-authored-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com >
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com >
Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com >
Co-authored-by: Kara <lunarautomaton6@gmail.com >
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com >
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com >
Co-authored-by: Doomsdrayk <robotdoughnut@comcast.net >
Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com >
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com >
Co-authored-by: Julian Giebel <juliangiebel@live.de >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com >
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com >
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com >
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com >
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com >
Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com >
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com >
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com >
Co-authored-by: TGRCDev <tgrc@tgrc.dev >
Co-authored-by: Milon <milonpl.git@proton.me >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com >
Co-authored-by: Fildrance <fildrance@gmail.com >
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru >
Co-authored-by: chavonadelal <156101927+chavonadelal@users.noreply.github.com >
Co-authored-by: SolStar <44028047+ewokswagger@users.noreply.github.com >
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com >
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: ArchRBX <5040911+ArchRBX@users.noreply.github.com >
Co-authored-by: archrbx <punk.gear5260@fastmail.com >
Co-authored-by: Radezolid <snappednexus@gmail.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
Co-authored-by: EmoGarbage404 <retron404@gmail.com >
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com >
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com >
Co-authored-by: Velcroboy <velcroboy333@hotmail.com >
Co-authored-by: neuPanda <chriseparton@gmail.com >
Co-authored-by: neuPanda <spainman0@yahoo.com >
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com >
Co-authored-by: Whatstone <whatston3@gmail.com >
Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com >
(cherry picked from commit 93ed70acfeda357133a701f637d3faeec02749bb)
2025-01-14 00:13:42 +03:00
Kevin Zheng
1376f8f0ba
Add popup message for activating trigger with hand ( #24858 )
...
(cherry picked from commit 6b1524138b02e1a573f70364e5766705c7cd5e26)
2024-02-08 12:27:10 +01:00
Aexxie
16d77d483e
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 >
(cherry picked from commit 467e983ba972a7ae749c95448febd19c7c285514)
2024-02-08 12:22:56 +01:00
KP
5ddae5059c
Prevent entities who do not have hands from setting off bombs. ( #22250 )
2023-12-16 19:37:30 +01:00
Nemanja
3f70a52bab
RNG timers for IEDs + small tweaks ( #22099 )
2023-12-16 19:13:08 +01:00
Debug
fd2cc8570d
Sync master up to 1/10 ( #74 )
...
* Automatic changelog update
* Make NPC names proper nouns & fix some genders (#20534 )
* Proper names & genders
* Uppercase proper names
* Make Smile female
* fix bingus wrinkly head (#20531 )
* rouny meat and steak (#20526 )
* lost friendship flavor
* add rouny steak
* rouny special meat
* rouny meat textures
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Automatic changelog update
* 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
* Automatic changelog update
* Minor slippery stuff (#20535 )
* Update submodule to 162.2.0 (#20570 )
* Predicted armor (#20560 )
* clean up some lines in smile the slime prototype (#20552 )
* Revert "Use full file path for temp replays (#19002 )" (#20545 )
* Add EyesGlasses into ClothesMate (#20523 )
* Automatic changelog update
* Fix Punpun crew monitor sensor (#20484 )
* Automatic changelog update
* EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394 )
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
* Automatic changelog update
* Make arcades hackable again (#20555 )
* Automatic changelog update
* Health alert tweaks (#20557 )
* Automatic changelog update
* Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564 )
* Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent
* Nukeops todo and cleanup
* Remove Active field
* Add EndedGameRuleComponent
* bartender suit (#20521 )
* give me a drink bartender
* guh
* aARG
* Necropolis and mine walls (#20578 )
* Automatic changelog update
* archaic accent tweaks (#20567 )
* Automatic changelog update
* Add confirmation to kick and respawn in the admin player actions panel (#20542 )
* Remove windows-latest CI runs, remove unused build-test-release.yml (#20540 )
* Change .editorconfig to keep existing attribute arrangement (#20538 )
* Automatic changelog update
* Catch replay start and end errors on round restarts (#20565 )
* Update trivial components to use auto comp states (#20539 )
* Fix role unbans not applying in real time (#20547 )
* Disable AHelp buttons when no player is selected, update button styling (#20568 )
* Automatic changelog update
* Added a toggle fullscreen button (default F11) (#20272 )
* Added a toggle fullscreen button (default F11)
* Removed un-needed comments
* Review Requested Changes
* Fixed Acidental Spacing Change
* bwoink, removed extraneous code
* nothing, litterally
* Automatic changelog update
* Fix not networking markings (#20588 )
* Automatic changelog update
* Update RobustToolbox to v162.2.1 (#20590 )
* Automatic changelog update
* Glorfcode (force say on damage/stun/crit) (#20562 )
* Automatic changelog update
* Fix AHelp progressively showing more AHelp panels (#20591 )
* Automatic changelog update
* caninsert entitystorage tweaks (#20589 )
* Automatic changelog update
* Fix mapping actions crashing on load (#20592 )
* Fix loading a map with a ThirstComponent crashing the game (#20594 )
* Fix electrocution displaying real name of disguised players (#20603 )
* Organ fixes (#20488 )
* Automatic changelog update
* Kettle medical rework (#20435 )
* Initial try at medical rework for kettle
* Re-add decal decorations to Kettle's medical
* Add more lockers to kettle's med
* Actually upload kettle's map, not its proto
* Automatic changelog update
* Added blocked visuals to volumetric pump (#20610 )
* Automatic changelog update
* Move TimedDespawn to engine (#20515 )
* Update submodule to 163.0.0 (#20616 )
* Remove v0.1 version number from local main menu screen (#20617 )
* Remove cloneData parameter from AutoNetworkedField (#20596 )
* Update submodule to 164.0.0 (#20618 )
* fix cognizine ghost role (#20632 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Automatic changelog update
* Move ID layer one pixel to correct alignment (#20630 )
* Update nukie hardsuit descriptions (#20529 )
* Make holofans destructable (#20445 )
* Automatic changelog update
* bowl is open (#20453 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Add TestPair.WaitCommand() (#20615 )
* Rename ThreatPrototype and mark fields as required (#20611 )
* Adjust hard bomb shape (#20608 )
* dragon refactor, objectives and use GenericAntag (#20201 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Automatic changelog update
* Added generic empty liquids tank (#20563 )
* Move view variables verb to the top of the list with no category and localize it (#20546 )
* saltern update (#20325 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Fix followers leaking (#20643 )
* Add Winter Boots (#20622 )
* add
* fix prototype
* Add QM mantle (#20621 )
* add
* fix prototype
* Automatic changelog update
* Slime mobs breathe nitrogen and resprite their organs (#20577 )
* Slimes breathe nitrogen and resprite their organs
* ups
* mmm
* Automatic changelog update
* Fix the new lizard horn's consistency + issue (#20620 )
* fix
* add
* Revert "add"
This reverts commit a054a3204a8f185a94ceb80b1bd3bc9f30423711.
* Add RandomHumanoidAppearance component to for space ninjas (#20605 )
* Automatic changelog update
* Space cat breathes space (#20550 )
* Space cat breathes space
Made Space Cat lungs ROBUST
* Made Space Cat's lungs ROBUST 2.0
* Automatic changelog update
* Wide anomaly locator (#20581 )
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* add textures
* fix encoding
* fix 2
* Automatic changelog update
* Fixed Telescopic Shield Lighting (#20650 )
* Fixed Telescopic Shield Lighting Bug fix #20199
* no need for these at all
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
* Automatic changelog update
* Add a special hardsuit for nukie medic (#20471 )
* Automatic changelog update
* Carry over other mutations when doing species mutation (#20551 )
* Automatic changelog update
* Add Spanish accent to poncho and sombrero (#20377 )
---------
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com >
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: LEVELcat <68501903+LEVELcat@users.noreply.github.com >
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
Co-authored-by: Doru991 <75124791+Doru991@users.noreply.github.com >
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com >
Co-authored-by: Skarletto <122584947+Skarletto@users.noreply.github.com >
Co-authored-by: NULL882 <104377798+NULL882@users.noreply.github.com >
Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com >
Co-authored-by: Miro Kavaliou <miraslauk@gmail.com >
Co-authored-by: Kara <lunarautomaton6@gmail.com >
Co-authored-by: Kacper Urbańczyk <kacperjaroslawurbanczyk@gmail.com >
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com >
Co-authored-by: daerSeebaer <61566539+daerSeebaer@users.noreply.github.com >
Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com >
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com >
Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com >
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com >
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com >
Co-authored-by: Kacper Urbańczyk <mikrel071204@gmail.com >
Co-authored-by: Tox Cruize <141375638+TexCruize@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Michael Cu <43478115+michaelcu@users.noreply.github.com >
2023-10-03 14:15:46 -05: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#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
