Commit Graph

24 Commits

Author SHA1 Message Date
rosieposie 02a45309e8
Pretty Disposals (#1009)
* initial commit

* oopshit conspace should not be an overlay

* minor fixes

* fix icon when constructing

* Apply suggestions from code review

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

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

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

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

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

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

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

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

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

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

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

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

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

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

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

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

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

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

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

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

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

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

* lets try it

Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

---------

Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com>
Co-authored-by: Azzy <azzydev@icloud.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>
2024-09-05 02:46:01 -03:00
noctis e6c6652e4d
Stair, Railing and other respriting. (#1589)
* new tiles

* windows

* decals

* stairs

* railings and stair fixes
2024-08-09 12:32:43 +00:00
noctis e59ac11bd5
Wall,Tile,Airlock Resprite Fixes (#1537)
* icon smoothing for windows

* airlocks

* oops

* new wood, revert wood decals

* rusted walls

* new reinf walls

* reinf window changes

* reinf directionals changes
2024-07-25 10:34:34 -05:00
noctis 152305884a
Wall, Airlocks and Tile resprites (#1470)
* most basic door sprites, basic wall and window sprites

* most tiles, secret door and windoors

* rest of door stuff, undoes windoor sprites

* decals

* decals

* corners

* corners

* resprite directions and fix spelling error

"Detla" V :blunt:

* adjust glass tile strength

* tile and sprite adjustments

* new tiles

* windows and decals

* Fixes glaring test issues

* Fix test fail

* Noct please 😭

You can run tests local

---------

Co-authored-by: Null <56081759+NullWanderer@users.noreply.github.com>
2024-07-22 21:14:30 +02:00
Leslie 3cec1a9476
Update meta.json for pride drobe (#1461)
updating this to have my current discord tag

Signed-off-by: Leslie <47046104+vitalvitriol@users.noreply.github.com>
2024-07-16 18:19:31 +02:00
leo c82affb78b
Adds the Justice Department (#660)
* legal departmant

* god i wish i knew what i was doing

* minor rsi fixes

* i forgor the legal radio frequency

* Minor fixes to radio, stamp, PDA, etc...

* add department

hehe

* Edits from Velcroboy

* Add trial timer

* add department signs

* Changes all references of legal -> justice and adds prosecutor access

* Missed one

* Adjust lawyer

* update lawyer icon

* temp to fix

* revert to fix

* add airlock texture

adds justice department airlock texture. Still need to do the yaml part of it but the texture's there.

* fix bureaucracy meta

* More meta fixes

* Connect airlocks to yaml

* Fixes, tweaks, and last reference of "legal" maybe

* Add justice to airlock groups

* add prosc. drip and fix prosecutor typos

adds prosecutor badge and suit, as well as fixes the spelling of "prosecuter" to "prosecutor"

* Changes prosecutor's supervisor to CJ

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Attorney <- Lawyer locale edit

* Removed modified shoukou file

* Added antag objective and touched up yaml
Fixed Clerk PDA and CJ jumpsuit error. Additionally moved notary stamp from paper.yml to rubber-stamp.yml, and fixed some indentation in the meta.json of the pda.rsi file

* Attorney <- Lawyer, now including the PDA
Forgot this last commit

* Fixed typo in Clerk Vest ID

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Added Chief Justice locker, all of its contents, and a prosecutor PDA (sprite pending)

* lockers 2, electric boogaloo. Committing files I forgot to commit

* Added CJ stamp and put it into CJ locker. Fixed notary stamp and put the sprites in the correct RSI

* Attempt to resolve merge conflicts

* Remove conflict markers

* Added stamp sprite, implemented CJ cloak

* Implemented Gavel Prototype and added to CJ locker

* Removed justice access from attorney as it will be used to secure Clerk's locker. Disabled antag for all justice besides attorney.

* Added Clerk locker and placed Notary Stamp into it. Uncommented gavel in CJ locker

* Added lawyer's stamp to lawdrobe

* Added Prosecutor PDA, icon, and ID sprite

* Added gavel block and made gavel tap when clicking on it

* Add component, EmitSoundOnInteractUsing onto the gavel block

* Added sprites for CJ and Clerk locker

* Spell-checked and edited job descriptions slightly

* Fixing missing type entity access.yml

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Adjusted rsi paths for gavel and gavel block to use forward slash

* Fixed a variety of invalid rsi references, and door remote yaml issue

* Added Lawyer access to Justice access group, fixed door_remote.yml access

* Remove antagadvantage from chief justice

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Apply suggestions from code review

line at the end for readability & matching current standards... line at the end for readability & matching current standards...

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

* Hopefully remove shoukou.yml from the changed files

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Once again attempt to remove shoukou.yml from changed files

* Attempt once more to remove shoukou.yml from changed files

* Fixed justice pda box description

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Please go home, shoukou. We don't want you here

* Fixing prototype references pt1

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Renamed headsets/legal.rsi to headsets/justice.rsi

* Added hyphen to chief justice localizations

* Ordered justice accesses alphabetically

* Added prison key to justice headset

* Various yaml fixes from review

* Apply suggestions from code review

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

* Localized changes to pdas and jobs

* Removed indents in locale

* Fixed reference to chief justice stamp

* Apply suggestions from code review

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

* Renamed Lawyer to Attorney in locale, added deltav marker

* Lawyer to Attorney, Warrant Document in Clerk and CJ locker

* Apply suggestions from code review

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

* Replaced legal with justice in job-description.ftl

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Moved job-name-lawyer to DeltaV locale

* Remove added space in accesses.ftl

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Removed unneeded deletion of unneeded spaces in headsets.yml

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Changed Lawyer ID name to Attorney ID

* Updated copyrights in all of the meta.json files affected

* Added formal and white variants of CJ jumpsuit to locker

* Updated to use upstream's EmitSoundOnInteractUsing

* Removing old component stuff

* Gave Prosecutor Filled Lawyer Backpack

* Deleted old component

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Removed old comments

* Updated doors to electronics system, fixed courier spawner that I botched

* Fixed door_access indentation

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Adding a little bit of loadouts

* Add loadouts for justice

* Removed accessreader from windoors

* Added job spawner icons

* Fixed spawner sprite layering

* Added missing parent in ID cards

* Removed redundant laceup shoes loadout

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Added lawyer windoor, fixed spawner names, fixed locker names

* Added station beacons

* Softened justice dept palette

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Added justice key to telecomms

* Added deltaV comments to telecomms

---------

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>
Co-authored-by: Timemaster99 <elijahrobot@gmail.com>
Co-authored-by: luckywill339@gmail.com <luckywill339@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: Azzy <azzydev@icloud.com>
2024-06-07 15:22:37 +02:00
Danger Revolution! 2a195a6eda
Listening Post 2.0 (#639)
* updates map, lowers server volume

* Delete PLEASEWORKTHISTIMEIBEGYOUS14.yml

* Update DV-pirateradio.yml

* changes fax machine to *not* alert admins; and start with emagged by default instead of using VV

* Revert "changes fax machine to *not* alert admins; and start with emagged by default instead of using VV"

This reverts commit 05bb5f402d.

* Revert "Update DV-pirateradio.yml"

This reverts commit e77fb34e86.

* Revert "Delete PLEASEWORKTHISTIMEIBEGYOUS14.yml"

This reverts commit 2000e2c147.

* Revert "updates map, lowers server volume"

This reverts commit d99cab6f36.

* adds new syndicate fax, maps it in as well as other QOL changes

* adds cybersun pen to Syndicate PDA's

* Update DV-pirateradio.yml

* adds blacklist to CC Fax + quieter server

* Update PirateRadioSpawnRule.cs

* unfinished scuttling system

* Adding colorblind quality of life.

* Tweaks to map and guards, no more self destruct system

* added guard flavor text

* The reasons for these are now gone

* DONE

* Update events.yml

* Update PirateRadioSpawnRule.cs

* Update DV-pirateradio.yml

* fixes crew monitor server not working at *extreme* ranges

* adds delta-v comment where needed

* Small code optimization and tons of documentation

* Update outpost visuals! Guards have a PDA now

* Update DV-pirateradio.yml

* Update DV-pirateradio.yml

* Goodbye crab. Hello Content.Shared migration

* Cleaning up pirateradio spawn

* Update DV-pirateradio.yml

* reverts pen changes to upstream PDA's

* adds new PDA

* adds new PDA to loadouts.

* Update Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml

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

* Maintainer requested changes

* Update salvage.yml

* Update syndicateNPCs.yml

* Cleaning up unneeded stuff

* more code cleanup

* Update PirateRadioSpawnRule.cs

* Update computers.yml

* Revert "Update computers.yml"

This reverts commit cbd0c583d4.

* Last fixes to the math

* Update PirateRadioSpawnRule.cs

* update license.

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-03-07 22:35:45 -05:00
Debug d406524053
Revert "Signage For Meee (#799)"
This reverts commit 02b13528c1.
2024-03-07 02:13:18 +01:00
rosieposie 02b13528c1
Signage For Meee (#799)
signey
2024-02-13 09:45:27 -06:00
Debug ec51232977
Spare ID safe (#671)
* Initial commit

* Unused access level

* Update meta.json

* Update SharedBiscuitComponent.cs

* Unneeded DataField and VVAccess

Editing it in VV does nothing anyways, it wont magically unlock the item slot

* Big smart

* Add safe sprite

Thanks @TadJohnson00

Co-Authored-By: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>

* Prevent faxing slips

* Custom background for corperate slip

* Localize crack verb

* Update paperslips.yml

* Update paperslips.yml

* Remove default comments

* Update paperslips.yml

* Pro

* Remove default id card

* Update Resources/Prototypes/DeltaV/Entities/Objects/Specific/Command/safe.yml

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>

---------

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
Co-authored-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
2024-01-15 00:48:30 +01:00
Ps3Moira 71d80b86e1
Reverts Shot Gun Sprites (#594)
* Reverts Shot Gun Sprites

* Removed Held Prefix
2024-01-01 15:48:08 -06:00
leo 5ef7a9ea38
Reskin Glimmer Machines (Prober and Drain) (#421)
* glimmer machines reskin

* Update glimmer_prober.yml

add comments

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

---------

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-11-08 22:44:38 +00:00
Fluffiest Floofers 6aa5c82082
Merge MailDrobe and CourierDrobe (#412)
* merge maildrobe and courierdrobe

* combine the sprite
2023-11-07 13:28:33 -06:00
JJ ee1f346745
Updating Butlertron's Sprite. (#296) 2023-10-25 16:15:44 +02:00
Fluffiest Floofers c81912b500
Courier drip (#151)
* drip

* keeping maildrobe but lathe is changed

* Almost forgor

* Bag + Spawner

* fix pride.yml to .ftl

* Courier Drobe

* Separate mail and courier loadout

Just so we can use it in corpses idk sounds fun

* uncessary

* Update courierdrobe.ftl

grammar

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

---------

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-10-12 17:31:10 +00:00
Ps3Moira 805b0751fb
Add Station Holograph (#145) 2023-10-10 19:00:45 -05:00
Fluffiest Floofers d5ee8868e3
paintings (#103) 2023-10-09 22:42:19 -05:00
Fluffiest Floofers 8339ecca22
Logistics + Mailroom Directional sign (#118)
* logi

* mailroom sign

I think Hyenh made those
2023-10-08 17:33:01 +02:00
Fluffiest Floofers 4faff50a58
Kvass (#110)
* Kvass

* buh
2023-10-05 21:32:27 +02:00
Velcroboy a9ef5b807f
Ports mining rocks and spawner over from Nyano (#71)
Co-authored-by: Jeff <>
2023-10-01 00:40:10 +00:00
Debug 9d33614e35
Butlertron (#61)
* Butlertron, the Roboisseur (#193)

* Butlertron, the Robossieur

"Greetings meatbags!

This is Butlertron_Durandal, the latest in entrepreneurship technology! I have heard word that you all staff an exorbiant number of fleshlings to prepare food and drink aboard your stations. With my latest contract with your station owners, I am prepared and willing to deploy terminals to every station in the cosmos! I hope you all are ready, because there is a great deal of money to be made if you can source the dishes my discerning clientele desire."

Implements the new entity type 'Mr. Butlertron'. Mr. Butlertron requests specific foods from players, using the list of recipes available to the game. He has a blacklist of items he will not request, which fundamentally make up three categories: Simple, Disgusting, and Cannibalistic. He also has 3 tiers of foods he can request, and could be iterated upon in the future to add more tiers. Each tier increases the amount of zorkmids he will give in payment, and from the 2nd tier of food onward, he will dispense ice cream along with his dough. Take too long, however, and this affable automaton will begin to become upset, and may even lose his temper entirely, changing his request to something new. This change occurs after 10 minutes, and he begins getting impatient after 8 minutes have passed. I reused several of the scripts used by the Oracle to create Mr. Butlertron, and am hoping in the future to make him a roaming NPC, perhaps by splitting up his responsibilities into different chunks and having different 'styles' of Mr. Butlertron being able to spawn on different stations. Given that Delta-V does not have a significant amount of its own unique content and folders to support that unique content, I placed most of his files within Nyano's files.

Maybe this is not how it should be structure, and I open to suggestions.

* Changed a folder name.

I spelled my funny made up french word wrong on one folder name. Shouldn't affect anything anywhere, since .ftl folders aren't used anywhere either way.

* Update Content.Server/Nyanotrasen/Roboisseur/RoboisseurComponent.cs

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>

* Update Content.Server/Nyanotrasen/Roboisseur/RoboisseurComponent.cs

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>

* Apply line breaks and code from Death's code review

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>

* Code review comment addressing.

All code review comments addressed.

* Apply suggestions from code review relating to spacing, again, and indefinite tagging. Very cool.

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>

* Butlertron Testing and Data Field Addition

Done.

---------

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>

* Make RoboisseurComponent partial

---------

Co-authored-by: PHCodes <47927305+PHCodes@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
2023-09-30 10:51:58 -05:00
Fluffiest Floofers 2fd0e9ce5a
wgw restored, fix some file placements (#33)
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-09-21 19:06:35 +00:00
Dorragon 0c2f8a43d7
Pride-o-mat and refill for it (#22)
* Pride-o-mat and refill

* Made BaseVendingMachineRestockDeltaV unspawnable

* Update vending_machine_restock.yml

Signed-off-by: Dorragon <101672978+Dorragon@users.noreply.github.com>

---------

Signed-off-by: Dorragon <101672978+Dorragon@users.noreply.github.com>
2023-09-16 01:26:04 -05:00
Colin-Tel f8f29014aa
Adds a lot of DeltaV objects, textures, and others (#13)
* Adds a lot of DeltaV objects, textures, and others

Adds DeltaV-specific objects, textures, and whatnot.

* Update shotguns.yml

Fix for YAML Linter

---------

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-09-13 13:56:53 -05:00