Commit Graph

15 Commits

Author SHA1 Message Date
Stxcking 4c1ffd2cee
Fishing Vendor and Fish Basket (#4862)
* everything rah

* vending.png

* recovered files

* clean up

* .

* final touches?

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-12-04 20:58:57 -06:00
AeraAulin 1b4db9965a
Fashion (#4547)
* AAAAAA I LOVE FASHION

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* forgot to put the naval coat in

* capitalize heat so github stops yelling at me

Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* fix typo

* please spare me nukeops

* remove nukeops propaganda

* fix cost thing

---------

Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-11-02 09:38:10 +00:00
Velcroboy eaa2f0a22e
Adjusts Autoclave to sit on/not hang off tables (#3956)
* Adjusts Autoclave to sit on/not hang off tables
2025-06-16 22:24:48 +02:00
Winter 7521969343
New animated techfab sprite layers (#3452)
* Added animated sprite layers to the departmental techfabs and updated associated JSON and YML

* Updated copyright in JSON and added comments to YML

* Further updates to copyright and YML
2025-04-17 03:19:45 +00:00
pathetic meowmeow fd728fdd08
Early cherrypick of Departmental Economy (#36445) (#3458)
* Departmental Economy (#36445)

* Cargo Accounts, Request Consoles, and lock boxes

* Funding Allocation Computer

* final changes

* test fix

* remove dumb code

* ScarKy0 review

* first cour

* second cour

* Update machines.yml

* review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
(cherry picked from commit 12b75beeab27f8905d6d3f07b7bbda2cfd859b5e)

* Fix station income instantly accumulating roundstart (#36572)

Fix station money accumulating roundstart

(cherry picked from commit ed3e4c7d4ea82f000ef963e393d01f73484417a9)

* DeltaV departmental economy

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-16 22:05:13 +00:00
deltanedas e90e48622f reformat all our meta.json files 2025-04-10 01:05:32 +01:00
pre-commit-ci[bot] 21148ba733 [pre-commit.ci] auto fixes from pre-commit.com hooks 2025-04-09 18:11:20 +01:00
HTML/Crystal a7af822c42
Added roboneuro jumpskirt + more! (#3296) 2025-03-27 15:50:05 -04:00
deltanedas 858d3a1234
add syndie autodoc bundle (#3274)
* make syndie autodoc valid

* clean up chem bottles and add chloral hydrate

* clean up flatpacks and add 2

* add syndie autodoc bundle

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-03-20 14:44:06 +00:00
Lyndomen b100c5b90d
Adds Syndicate Robo-Neuroticist, a midround antag (#1582)
* new file:   Content.Shared/DeltaV/Roles/SynthesisRole.cs
	modified:   Resources/Locale/en-US/deltav/ghost/roles/ghost-role-component.ftl
	new file:   Resources/Locale/en-US/deltav/synthesis/recruiter.ftl
	new file:   Resources/Maps/Shuttles/DeltaV/synthesis_ship.yml
	modified:   Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
	modified:   Resources/Prototypes/DeltaV/GameRules/events.yml
	new file:   Resources/Prototypes/DeltaV/Objectives/synthesis_specialist.yml
	new file:   Resources/Prototypes/DeltaV/Roles/Antags/synthesis_specialist.yml
	new file:   Resources/Prototypes/DeltaV/Shuttles/synthesis.yml

* Update recruiter.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update Resources/Prototypes/DeltaV/GameRules/events.yml

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Rename recruiter.ftl to synthesis.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update synthesis_specialist.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update synthesis_specialist.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update synthesis_specialist.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update events.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* new file:   Content.Shared/DeltaV/Roles/RoboticistRole.cs
	modified:   Resources/Locale/en-US/deltav/ghost/roles/ghost-role-component.ftl
	new file:   Resources/Locale/en-US/deltav/roboticist/roboticist.ftl
	new file:   Resources/Locale/en-US/deltav/roboticist/sets.ftl
	new file:   Resources/Maps/Shuttles/DeltaV/roboticist_ship.yml
	new file:   Resources/Prototypes/DeltaV/Catalog/roboticist_sets.yml
	modified:   Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
	new file:   Resources/Prototypes/DeltaV/Entities/Objects/Devices/radio.yml
	modified:   Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml
	new file:   Resources/Prototypes/DeltaV/Entities/Objects/Specific/roboticist.yml
	new file:   Resources/Prototypes/DeltaV/Entities/Objects/Tools/rechargingradiojammer.yml
	new file:   Resources/Prototypes/DeltaV/Entities/Structures/Machines/lathe.yml
	modified:   Resources/Prototypes/DeltaV/GameRules/events.yml
	new file:   Resources/Prototypes/DeltaV/Objectives/robocyte_synarch.yml
	modified:   Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml
	new file:   Resources/Prototypes/DeltaV/Roles/Antags/robocyte_synarch.yml
	new file:   Resources/Prototypes/DeltaV/Shuttles/roboticist.yml
	new file:   Resources/Textures/DeltaV/Structures/Machines/synd_exosuit_fabricator.rsi/fab-active.png
	new file:   Resources/Textures/DeltaV/Structures/Machines/synd_exosuit_fabricator.rsi/fab-idle.png
	new file:   Resources/Textures/DeltaV/Structures/Machines/synd_exosuit_fabricator.rsi/fab-load.png
	new file:   Resources/Textures/DeltaV/Structures/Machines/synd_exosuit_fabricator.rsi/fab-o.png
	new file:   Resources/Textures/DeltaV/Structures/Machines/synd_exosuit_fabricator.rsi/meta.json

* modified:   Resources/Prototypes/DeltaV/Entities/Objects/Devices/radio.yml
	new file:   Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/rechargingsyndicatecrewmonitor.yml
	modified:   Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml
	modified:   Resources/Prototypes/DeltaV/Entities/Structures/Machines/lathe.yml
	modified:   Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml

* deleted:    Content.Shared/DeltaV/Roles/SynthesisRole.cs
	deleted:    Resources/Locale/en-US/deltav/synthesis/synthesis.ftl
	deleted:    Resources/Maps/Shuttles/DeltaV/synthesis_ship.yml
	modified:   Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
	modified:   Resources/Prototypes/DeltaV/GameRules/events.yml
	deleted:    Resources/Prototypes/DeltaV/Objectives/synthesis_specialist.yml

* deleted:    Resources/Prototypes/DeltaV/Shuttles/synthesis.yml

* deleted:    Resources/Prototypes/DeltaV/Roles/Antags/synthesis_specialist.yml

* modified:   Resources/Prototypes/DeltaV/GameRules/events.yml

* modified:   Resources/Prototypes/DeltaV/Catalog/roboticist_sets.yml
	modified:   Resources/Prototypes/DeltaV/Entities/Objects/Specific/roboticist.yml

* modified:   Resources/Locale/en-US/deltav/ghost/roles/ghost-role-component.ftl
	new file:   Resources/Locale/en-US/deltav/objectives/conditions/roboticist.ftl
	modified:   Resources/Locale/en-US/deltav/roboticist/roboticist.ftl
	new file:   Resources/Locale/en-US/deltav/robotics/syndicate-mmi.ftl
	modified:   Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml
	modified:   Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
	modified:   Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml
	new file:   Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/mmi.yml
	modified:   Resources/Prototypes/DeltaV/Entities/Objects/Specific/roboticist.yml
	modified:   Resources/Prototypes/DeltaV/Entities/Structures/Machines/lathe.yml
	modified:   Resources/Prototypes/DeltaV/GameRules/events.yml
	deleted:    Resources/Prototypes/DeltaV/Objectives/robocyte_synarch.yml
	new file:   Resources/Prototypes/DeltaV/Objectives/roboticist.yml
	modified:   Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml
	renamed:    Resources/Prototypes/DeltaV/Roles/Antags/robocyte_synarch.yml -> Resources/Prototypes/DeltaV/Roles/Antags/roboneuroticist.yml

* modified:   .vscode/settings.json
	modified:   Resources/Locale/en-US/deltav/ghost/roles/ghost-role-component.ftl
	modified:   Resources/Locale/en-US/deltav/objectives/conditions/roboticist.ftl
	modified:   Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml
	modified:   Resources/Prototypes/DeltaV/GameRules/events.yml
	modified:   Resources/Prototypes/DeltaV/Objectives/roboticist.yml
	modified:   Resources/Prototypes/DeltaV/Roles/Antags/roboneuroticist.yml

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost_roles.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update settings.json

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update settings.json

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* modified:   Resources/Locale/en-US/deltav/roboticist/sets.ftl

* modified:   Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
	modified:   Resources/Prototypes/DeltaV/GameRules/events.yml
	modified:   Resources/Prototypes/DeltaV/GameRules/unknown_shuttles.yml
	modified:   Resources/Prototypes/DeltaV/Roles/Antags/roboneuroticist.yml
	new file:   Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/roboneuroticistpurple.rsi/equipped-INNERCLOTHING.png
	new file:   Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/roboneuroticistpurple.rsi/icon.png
	new file:   Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/roboneuroticistpurple.rsi/inhand-left.png
	new file:   Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/roboneuroticistpurple.rsi/inhand-right.png
	new file:   Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/roboneuroticistpurple.rsi/meta.json

* modified:   Resources/Locale/en-US/deltav/ghost/roles/ghost-role-component.ftl

* modified:   Resources/Prototypes/DeltaV/Entities/Clothing/Head/hardsuit-helmets.yml
	new file:   Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/softsuits.yml
	modified:   Resources/Prototypes/DeltaV/Roles/Antags/roboneuroticist.yml
	new file:   Resources/Textures/DeltaV/Clothing/Head/Helmets/eva_roboneuroticist.rsi/equipped-HELMET.png
	new file:   Resources/Textures/DeltaV/Clothing/Head/Helmets/eva_roboneuroticist.rsi/icon.png
	new file:   Resources/Textures/DeltaV/Clothing/Head/Helmets/eva_roboneuroticist.rsi/inhand-left.png
	new file:   Resources/Textures/DeltaV/Clothing/Head/Helmets/eva_roboneuroticist.rsi/inhand-right.png
	new file:   Resources/Textures/DeltaV/Clothing/Head/Helmets/eva_roboneuroticist.rsi/meta.json
	new file:   Resources/Textures/DeltaV/Clothing/OuterClothing/Suits/eva_roboneuroticist.rsi/equipped-OUTERCLOTHING.png
	new file:   Resources/Textures/DeltaV/Clothing/OuterClothing/Suits/eva_roboneuroticist.rsi/icon.png
	new file:   Resources/Textures/DeltaV/Clothing/OuterClothing/Suits/eva_roboneuroticist.rsi/inhand-left.png
	new file:   Resources/Textures/DeltaV/Clothing/OuterClothing/Suits/eva_roboneuroticist.rsi/inhand-right.png
	new file:   Resources/Textures/DeltaV/Clothing/OuterClothing/Suits/eva_roboneuroticist.rsi/meta.jso	modified:   Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/roboneuroticistpurple.rsi/meta.json

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update jumpsuits.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update ghost-role-component.ftl

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update hud.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update borg_modules.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update roboticist.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update roboticist.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update borg_modules.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update robotics.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update robotics.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update radio.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update rechargingsyndicatecrewmonitor.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* idk

* namespace ops

* namespace 2

* part 1

* done

* fixes

* update mindroll

* lathe update and tweaks.

* de-cybersunning

* unfuck yaml

* clean up yaml

* add circuit board

* untroll so fish guy doesnt kill me for swapping parent and ID

* Update meta.json

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* cleanup

* fix spawner

* time

* syndicate lawset

* updating meta files to 4 spaces

* Update production.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update production.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update production.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* containercontainercontainer

* head slot

* welding protection

* fix icon

* indent spacing and reparenting

* renaming ops

* rename part 2

* renaming ops 3

* final rename ops

---------

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
2025-02-23 17:09:08 +00:00
pathetic meowmeow d0da90fa2e
Add autoclave to easily sanitize large amounts of items and faster (#2933) 2025-02-10 12:22:36 +00:00
deltanedas 916c0fff69 use upstream pride-o-mat now 2025-01-28 04:31:17 +00:00
Stop-Signs 1107520098
Add Advanced Microwave (#2670)
* Yuh

* meow

* sprite fix

* rads and time increase

* :(

Signed-off-by: Stop-Signs <stopsign221@gmail.com>

* meow

* minor comment fix

Signed-off-by: Stop-Signs <stopsign221@gmail.com>

* removed valid microwave

Signed-off-by: Stop-Signs <stopsign221@gmail.com>

* mrp

* meow

* No more rads so more cook time, still overall better

* meow

* Update advanced_microwave.yml

* Revert "Update advanced_microwave.yml"

This reverts commit 47ba535f47.

* i hate git

* meta file moment

* kaylie = meanie

* I HATE META FILES

* more cursed meta

---------

Signed-off-by: Stop-Signs <stopsign221@gmail.com>
2025-01-16 12:36:55 +00:00
Tad "Taddy" Johnson 86ce039c8c
Security resprite final cut (#2695)
* turn security gey

* correct erroneous find and replace

* Update dressers.yml

* resprite sec backpacks + holoprojector

* adjust sec whistle sprite, resprite forensic gloves

* resprite security jetpacks

* give sec whistles a sprite

* give sec whistles a sprite forreal

* reparent mantis locker, fix sec directional signs

* typo

* tidy sec resprite
2025-01-15 08:08:15 +00:00
deltanedas ec94579ebc
the great namespace refactor (#2574)
* refactor DeltaV/deltav resources to _DV

* change DeltaV namespaces to _DV

* add space before all DeltaV comments

* update xamls

* fix and move arena parallax to _DV

* more fix

* refactor even more stuff

* fix the grid fills

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-01-01 07:50:34 +00:00