Delta-v/Resources/Prototypes
Sir Warock 08dfaf0dd5 Merge Injector & Hypospray Systems & Components (#41833)
* Merge Injector & Hyposprays

* Fixes

* Requested Changes

* Preview

* Inclusion of Prototypes

* Fix

* small oversight

* Further fixes

* A few more fixes & Bluespacesyringe buff

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>

* Final Commit, hopefully

* Merge conflict no more

* YML fix

* Add required changes

Co-Authored-By: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>

* cleanup warnings removal

* Bug fix & Maintainer Requests

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>

* Adhere to requested changes

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>

---------

Co-authored-by: āda <177162775+iaada@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:30 -06:00
..
Accents Improve lying trait grammar (#39370) 2025-12-29 11:39:25 -06:00
Access hopefully got this right too. library is from us so should be fine to remove from the upstream file 2025-08-26 17:43:28 -07:00
Actions Migrate revenant and PAI shops to use ActionGrant instead of hardcoding them (#40475) 2025-12-29 11:39:19 -06:00
AlertLevels De-metashield Epsilon part 1 + DV sound files moving (#3867) 2025-10-23 07:26:55 +11:00
Alerts Crawling Part 1: The Knockdownening (#36881) 2025-11-23 15:22:21 -06:00
Anomaly New anomaly behaviour: Invisibility (#29120) 2024-08-09 17:27:14 +01:00
AppearanceCustomization Upstream Merge (June / July) attempt 2 electric boogaloo (#4607) 2025-11-06 18:22:39 +00:00
Atmospherics Atmospherics Delta-Pressure YAML refactor (#40174) 2025-12-29 11:39:02 -06:00
Body goats eat kudzu again (#40220) 2025-12-29 11:39:29 -06:00
Catalog Toilet cistern stashes spawn containing basic loot (#41013) 2025-12-29 11:39:30 -06:00
Chat The station AI can be destroyed (#39588) 2025-12-29 11:39:07 -06:00
Chemistry Merge Injector & Hypospray Systems & Components (#41833) 2025-12-29 11:39:30 -06:00
Codewords Split codewords into its own system (#37928) 2025-08-07 00:09:11 +02:00
Damage Reorganize and refactor drinks yml (#39221) 2025-12-29 11:39:06 -06:00
Datasets Resprites and keeping consistency for forgotten figurines (#40889) 2025-12-29 11:39:25 -06:00
Decals Upstream Merge (June / July) attempt 2 electric boogaloo (#4607) 2025-11-06 18:22:39 +00:00
Device upstream merge 27/04/2025 (#3596) 2025-05-06 19:35:03 -04:00
DeviceLinking Adds default "Toggle" to "Status" linking port (#37690) 2025-12-29 11:39:14 -06:00
Entities Merge Injector & Hypospray Systems & Components (#41833) 2025-12-29 11:39:30 -06:00
EntityLists/Tools Shitmed (#869) 2024-12-27 16:47:20 +00:00
Flavors Artifact glue reagent (#38670) 2025-12-29 11:39:22 -06:00
GameRules Fixed shared radio references. Removed custom DV radio implant code for now. Will re-do later. 2025-12-29 11:39:06 -06:00
GhostRoleRaffles shorten short raffle (#28685) 2024-07-25 00:28:47 +02:00
Guidebook Adds a guidebook reference table for silicon lawsets (#38225) 2025-12-29 11:39:24 -06:00
Hydroponics Entity effects ECS refactor (#40580) 2025-12-29 11:39:22 -06:00
InventoryTemplates Scurrets - can wear pet bags, mail bags and spears (#38774) 2025-11-23 15:22:33 -06:00
Loadouts New job lizard plushies + Job-specific trinkets loadout (#34127) 2025-12-29 11:39:28 -06:00
Magic Changes Slippery Slope to not require a robe and hat for casting. (#41038) 2025-12-29 11:39:30 -06:00
Maps Pebble Event Map (#4890) 2025-12-15 23:54:09 -06:00
NPCs goats eat kudzu again (#40220) 2025-12-29 11:39:29 -06:00
Nutrition Fix Ingestion Localization Pop-ups (#39437) 2025-11-23 15:22:19 -06:00
Nyanotrasen Fix Cryptobolin and make it use NewStatusEffectSystem. (#40675) 2025-12-29 11:39:24 -06:00
Objectives Reorganize ID card sprites to use job icon sprites directly (#40414) 2025-12-29 11:39:26 -06:00
Paintables Cherrypick: "Make more objects spray paintable" and related PRs (#4480) 2025-10-06 23:56:19 +00:00
Palettes Upstream Merge (June / July) attempt 2 electric boogaloo (#4607) 2025-11-06 18:22:39 +00:00
Parallaxes Upstream Merge (June / July) attempt 2 electric boogaloo (#4607) 2025-11-06 18:22:39 +00:00
Polymorphs Vulpkanin Admin Smite (#40360) 2025-12-29 11:39:11 -06:00
Procedural I've been at this for 11 hours I am so tired 2025-08-11 19:24:08 -07:00
RCD upstream merge 27/04/2025 (#3596) 2025-05-06 19:35:03 -04:00
Reagents Fix Being Drunk! (#41002) 2025-12-29 11:39:30 -06:00
Recipes Consistency fix for soap making (#40998) 2025-12-29 11:39:29 -06:00
Research Add explosive cord. (#25875) 2025-12-29 11:39:12 -06:00
Roles Ninja headset (#40054) 2025-12-29 11:39:27 -06:00
Shaders Upstream Merge (June / July) attempt 2 electric boogaloo (#4607) 2025-11-06 18:22:39 +00:00
Shuttles Organizing Shuttle Folder (#4549) 2025-10-19 02:03:13 +00:00
SimpleStation14 Revert "Near-sighted trait from SIMPLE STATION 14 (#73)" 2024-05-18 13:38:06 +02:00
SoundCollections Two new lobby songs by Oliver Buckland (#5018) 2025-12-27 07:28:05 -06:00
Species Changed Vox Head Marking Point Limit To 4 (#40542) 2025-12-29 11:39:29 -06:00
Stacks Organize StackPrototype with inheritance (#38412) 2025-12-29 11:39:22 -06:00
StatusIcon Criminal console status expansion (#36244) 2025-12-29 11:39:29 -06:00
Store upstream merge 27/04/2025 (#3596) 2025-05-06 19:35:03 -04:00
StoryGen Random book story generator refactor (#28082) 2024-06-01 16:50:57 +02:00
Tiles Fixes all departamental typos (both just in comments) (#40502) 2025-12-29 11:39:11 -06:00
Traits ``NarcolepsySystem`` refactor (#40305) 2025-12-29 11:39:08 -06:00
Voice Migrated hitscan protos to new entity. Fixed vox emotes. 2025-12-29 11:39:27 -06:00
Wires Fix 2025-08-07 19:53:03 +02:00
World
XenoArch Prevent freindly fauna node from spawning hostile mobs (#40979) 2025-12-29 11:39:30 -06:00
_CD More ECS fixes. Will I never escape this hell? 2025-12-29 11:39:23 -06:00
_DEN Fixed some drink inheritence. 2025-12-29 11:39:06 -06:00
_DV [pre-commit.ci] auto fixes from pre-commit.com hooks 2025-12-29 11:39:28 -06:00
_EE More ECS fixes. Will I never escape this hell? 2025-12-29 11:39:23 -06:00
_Floof Migrated the psionic reolling stuff to the new ECS system. Am I out of this hellhole yet? 2025-12-29 11:39:23 -06:00
_Funkystation No one will care. 2025-12-29 11:39:23 -06:00
_Goobstation Playtime format fixes. Other minor fixes. 2025-12-29 11:39:17 -06:00
_Impstation Migrated hitscan protos to new entity. Fixed vox emotes. 2025-12-29 11:39:27 -06:00
_Mono Playtime format fixes. Other minor fixes. 2025-12-29 11:39:17 -06:00
_NF Fixed EMPs and Ion damage. Fixes #4989 2025-12-29 11:39:16 -06:00
_Nuclear14 Upstream Merge (June / July) attempt 2 electric boogaloo (#4607) 2025-11-06 18:22:39 +00:00
_Omu/Entities/Clothing Cargo Mascot Updates (#4769) 2025-11-26 23:08:22 -06:00
_RMC14 Give dummy avali and chitnid moth eye sprites (#4884) 2025-12-06 23:07:19 -07:00
_Shitmed Moved shitmed stuff to its namespace 2025-12-29 11:39:05 -06:00
_Starlight Supersynth hours 200 -> 50 (#4710) 2025-11-21 23:35:25 -06:00
_White Fixed agent visor not able to see silicon and kitsune health bars (#4864) 2025-12-05 01:58:46 +00:00
ai_factions.yml OVINIA INVASION !! (#4715) 2025-11-28 08:17:45 +01:00
audio.yml Fix space ambient music (#33594) 2024-12-07 21:48:49 +00:00
bar_signs.yml ports two barsigns from frontier (#35296) 2025-03-01 13:46:06 +00:00
borg_types.yml Give custom laws to Salv Borg (#4866) 2025-12-08 08:37:23 -06:00
chameleon.yml Syndicate locks are now selectable (#39532) 2025-11-23 15:22:31 -06:00
contraband_severities.yml Added "highly illegal" contraband to guidebook (#38176) 2025-11-23 15:22:27 -06:00
edge_spreaders.yml metal foam grenades (#29428) 2024-08-09 17:34:17 +01:00
explosion.yml upstream merge 27/04/2025 (#3596) 2025-05-06 19:35:03 -04:00
floor_trap.yml prevent repeat TriggerOnCollide triggers (#40428) 2025-12-29 11:39:10 -06:00
fonts.yml
game_presets.yml Fool players with decoy presets (#40053) 2025-12-29 11:38:59 -06:00
holidays.yml Lowercase some prototypes names (#29990) 2024-08-09 17:56:18 +01:00
hud.yml Remove Eris UI theme (#25673) 2024-03-07 01:06:04 +01:00
item_size.yml
lobbyscreens.yml Add contest winners lobby art (#4635) 2025-11-12 12:22:42 +11:00
name_identifier_groups.yml Updated various non-upstream entities components. Fixed YAML Linter errors. 2025-11-23 15:22:35 -06:00
ore.yml New sprites for Coal and Gold ore crabs, new Bananium ore crab and Bananium rock anomaly. (#37787) 2025-08-06 21:25:14 +02:00
radio_channels.yml upstream merge 27/04/2025 (#3596) 2025-05-06 19:35:03 -04:00
round_announcements.yml De-metashield Epsilon part 1 + DV sound files moving (#3867) 2025-10-23 07:26:55 +11:00
secret_weights.yml THE WIZARD (#35406) 2025-03-01 14:40:04 +00:00
silicon-laws.yml Adds a guidebook reference table for silicon lawsets (#38225) 2025-12-29 11:39:24 -06:00
status_effects.yml Crawling Part 1: The Knockdownening (#36881) 2025-11-23 15:22:21 -06:00
tags.yml Merge Injector & Hypospray Systems & Components (#41833) 2025-12-29 11:39:30 -06:00
themes.yml upstream merge 27/04/2025 (#3596) 2025-05-06 19:35:03 -04:00
threats.yml Cosmic Cult | Patch 1.1.0 (#3905) 2025-06-13 11:51:31 +02:00
tool_qualities.yml Upstream Merge (June / July) attempt 2 electric boogaloo (#4607) 2025-11-06 18:22:39 +00:00
typing_indicator.yml Add Fancy Speech Bubbles for Diona and Gingerbread (#37742) 2025-08-05 16:50:59 +02:00
weather.yml add ash storms to lavaland (#2445) 2024-12-18 01:27:23 +00:00
whitelists.yml Automated whitelists (#23985) 2024-08-30 05:37:15 +01:00
wizardsDenWhitelists.yml Automated whitelists (#23985) 2024-08-30 05:37:15 +01:00