* feat: blue and purple tomato soup
* tweak(bluepurpletomatosoup): incorporate description feedback
* style: Add newline at end of soup.yml
---------
Co-authored-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>
* add MailMetricsCartridge prototype
using the CrimeAssist UI until i make the courier performance ui
* add sprite for mail courier cartridge
* Add MailMetricUI
YAYYYYY IT WORKS
UI Contents pending
* Mail earnings live update mailmetrics
* LO can have mailmetrics too
* Add rest of mail metrics
Also removes some loggers
* Add additional metrics to MailMetric
Also fixes some bugs related to stat counting
* MailMetric updates on mail added
* change sprite credit name
decided id rather be credited as Portfiend
* display all mail numbers now
* remove comment
* style mailmetrics, add heading
* mailmetric UI polish
* fixed unopened mail counting bug oopsie
* wtf is this import
get out of here
* move StationLogisticStats to BaseStationMail
* FOUR SPACES
sirry
* fix: newlines
* address reviews
* address reviews
SORRYYYY this is unexpectedly big
* wtf
* semicolon
---------
Co-authored-by: byte <50130120+huckleton@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
* basic AAC tablet prototype
using station map as a base
* set up aac component/system
* quick phrase prototype
will probably touch this up later
* basic example phrases
just so i have data to work with
* get AACWindow to iterate over quick phrases
* add the rest of the job phrases
* fix this one job name
* actually fix prison guard name
* buttons for aac window
* fix phrase inheritance
* add tabs to aac contaner
* fix column spacing and add button padding
* aac tablet button colors
* AAC tablet sends messages now
* add aac tablet voice sound yay
* add a 1 second cooldown between phrases
* subjects for most departments
* location phrases
* more phrases
* cleanup + sort buttons alphabetically
* fix these phrases
* even more departmental subject phrases
* common phrases
* cleanup imports
* show name of player that pressed button
* aac tablet can be used by multipel people
after all it does not rely on state changes and also multiple people can press buttons on a tablet at once
* capitalize aac
its an acronym
* you know what it is its more phrases!!!!
* SAFETY PHRASES
* last second phrases
* redundant phrase
* and one more hazard phrase for the road
* change voice of aac tablet from borg to alto
just sounds nicer
* localize ALL Phrases
i love utility scripting to automate tedious tasks
* add AAC tablet to loadout
* add AAC tablet to medfab
* tweak: use multiple parents instead of whatever this is
* add: justice department phrases
* add: time quantity phrases
* add: ores and kitchen appliance phrases
* fix: resolve duplicate phrases
* add: aac tablet sprites
* add: justice button style
* fix: misplaced this line oops
* add: justice dept locations
* remove: redundant phrase
* re-run tests
* fix: move aac tablet loadout format
* fix: use Identity instead of Name for aac tablet sender
* fix: return on send phrase if id is invalid
* fix: remove redundant line
* fix: use LocId instead of String for phrase text type
* add: new phrases bc upstream updates
* fix: newlines
* tweak: add end comments to these style comments
* fix: this phrase was broken lol
---------
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
* aPDA Resprite
* Fix Sprites Not Showing Up!
* Provide Compatibility with new Job Titles
* Comment out the recent changes
* Change PDA sprite scale to 0.75
# DeltaV aPDA Resprite PDA Size change, makes it smaller for the full detail.
* add SignAttemptEvent and minor signature refactor
* add recruiter pen
* add the recruiter ship
* add recruiter antag and event
* fixes
* real
* bad popup spam
* more fix
* fix blood visual maybe
* fix greentext
* more fixy
* fix fill state not being coloured
* give btamp instead of paper in pocket 2
* f
* brighter filled state
* fix greentext
* fix error on spawn
* pro
* prevent using a syringe to inject anything into the pen
* update stuff after upstream merge
---------
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
* 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>
* test
please work
* cleanup
removing old assets causing issues
* addition to uplink
both traitors and nukeops can buy this absurdly powerful cannon
* Update railgun_ammo.yml
* laser variant
shrimple as adding a new variant with two firemodes, overkill, and overkiller
* laser railgun cleanup
fixing some trash
* adds the caninator
shoot cans and scare security
* admeme variant and removal of clown variant for now
* Slowdown in Hands
Slows you down when any variant is held as to make the weapon more balanced
* Laser railgun Sprite
adds a unique sprite for the laser variant of the railgun
* fix the sprite
i am dumb
* Issue Cleanup
Dusts off some of the code and makes some balance changes, along with better parenting.
* purchasable ammo and charge sound update
made the charge sound slightly less annoying and added ammo purchasable by both traitors and syndicate
* QA pass
various little fixes to improve the code and general cleanup
* error fixing
Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
* Sprite Update + Reverse Engineering
This adds reverse engineering, the new sprites, and a host of balance changes.
- The Railgun now does 80 stamina damage again on hit with normal bolts.
* reverse engineered fast firerate
as a reward for researching new technology, you've made it slightly faster. yay. also resprites the non-lethal variant to look more plunger-like
* Final Changes
ready for merge, sir!
* Copyright Update
Makes the sounds all under free use creative commons to avoid copyright issues.
* Update license.txt
* remove old attributions
this sound has been altered as to not use pixabay
* price increase
sorry danger but 14 tc is way too low lmao, nukies get it for 20 tc
* requested changes
hopefully
* conversion to mono
yipeeee
* fix of that other fix for the new file rename shit
pure agony
* proper noun
the Decimator is now a proper noun similar to other weapons
* Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/railgun.yml
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
* Update duffelbag.yml
* Update uplink_catalog.yml
* Update rod_impact.ogg
* Update uplink_catalog.yml
---------
Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
* added De' Jure and Sugar Rush cigarettes
* making life easier in the future
* candy carton :)
* trying to get this to work
* !!!
* YOU CAN EAT EM NOW >:D
* added to cig machine / loot spawners
* # DeltaV (thank you Death)
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: KittenColony <149278380+KittenColony@users.noreply.github.com>
* thank also
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: KittenColony <149278380+KittenColony@users.noreply.github.com>
---------
Signed-off-by: KittenColony <149278380+KittenColony@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
* fix dulleaveanee icon weirdness
hmm yes 13x17 sprite
* First batch
* fixes
* imsmart
* elp
Some DV drink sprites are way too different from the base game sprites
* oops
* soju and sake
* fix flavor
* small fix to kvass
* prevent funny meta
* Totally didn't forget about drinks
* damn chocolate bar
* big but less and more or something
* while im here fix the empty orange carton
Apparently people don't want empty orange cartons???
* juicebox + more random stuff
* fix that
* Adds Sprites, courtesy of Noctrn
* Adds lunchboxes
* Adds the "notes from mom" that can spawn inside
* Adds to vendors.
* shrunk storage by one row
* update the locale to have "note from mom"
* new sprites :O
* Update lunchbox.yml to have higher price
Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
* Update chefvend.yml
Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
* why the fuck did they remove tap.ogg?
Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
* update credits
* One RSI, many states
---------
Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
* Finished
* Revert "Finished"
This reverts commit 4ab2d612a8.
* Finished actual
* Update general.yml
* Update general.yml
* making changes
added prison coms to security key and removed it from hos headset
* I think this is correct
* Move localisations into Delta-V directory
* file fix
* file location change
---------
Co-authored-by: Nova <stellar_novas@riseup.net>
* Fix weird firerates
The .45 magnum firerate is around 2 to 3 so it was extremely funny how the .38 would be slower than a .45 and even the snubbed version.
* change ejection port placement on psibreaker
* Rubber nerf + new ammo + fix recipe costs
Everyone gets incendiary and uranium bullets so why not.
* Make lucky available in salvage
Alongside the other revolvers
* Update look of speedloader
So it matches the other revolver speedloader. Slightly smaller just because.
* Fix mistakes 🍞
* Add extra speedloaders
* mindbreaker ammo box
* New markers, update old .38 markers
* commentfix
* firerate pass 2
* Fixes
* cleanup
* Add new colored tips to cartridges
* Fix typo
* holy update after someone pointed out the damage
It's technically still a bullet but coated in silver/holy magic whatever, so it should still pierce. Still have to print them one by one and they are not as good as normal bullet against normal things
* someone did the math for silver bullets
I guess.
* Completely untested first commit
* Get basic program flow working
* Add Innocent
* Add Fancy Rich Text
* Icon
Thanks, IcedQuinn!
* Add Cartridge icons
* New image from IcedQuinn
* Add explanation on what a Sophont is, to be automatically appended to any text referencing a Sophont later on
* Convert tabs to spaces
* remove [bold] tags from loc
* Make text bold again
* Alter formatting, reduce text length for sophont explanation to fit it on the screen
* Update Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Signed-off-by: Tim Falken <timfalken@hotmail.com>
* Add program to more PDA's
* Add a tip about the app
* Recreate flow in yaml
todo: actually load and use this yaml
* Remove the old state machine, and add configurable yaml prototypes to define pages
* Move page to its own file
---------
Signed-off-by: Tim Falken <timfalken@hotmail.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
* gee
* forgor comments
* licence for audio
* Update equipped-BELT.png
* Makes the sprite change but shitcode
Because shitcode makes everyone happy
* it only got two of them firemodes lets not lie
* We can name this appropriately now
* Apply 3 suggestions from code review
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com>
* update sources
* Energy Gun + more firemodes
its still energygun only
---------
Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
* Arsenal Expansion
Basically my Arsenal Expansion PR on oldrepo now on rebase. Balances some cargo prices, fixes a few item appearances and descriptions, adds new weapons, cleans sprites... yada yada.
* Revert "Arsenal Expansion"
Reverts erroneous parts of the expansion
* Fix tags
Prevent merge conflicts, keep maintainers happy
* Restrict Universal to semi
Ew why did they make pistols full-auto by default? cring
* Update ammunition.yml
fix erroneous comment
Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>
* Update magnum.yml
fix erroneous comment
Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>
* Update pistols.yml
comment properly
Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>
---------
Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>
Tad "Taddy" Johnson
DisposableCrewmember42
beck-thompson
Alchebun
portfiend
ZweiHawke
Danger Revolution!
deltanedas
WarMechanic
Nairod
leo
Tryded
Null
Firewatch
KittenColony
Adrian16199
rosieposie
Fluffiest Floofers
Debug
BonkTrauma
Guess-My-Name
Velcroboy
Ps3Moira
Tim Falken
2digitman