Commit Graph

30 Commits

Author SHA1 Message Date
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
Velcroboy
c7c09e33b9 Bbgun (#580)
* Add BB gun

* Clean up back sprite

* Replace old code

* Case?

* Guess I didn't need that

* Proper attribution

---------

Co-authored-by: Jeff <>
2024-01-02 16:03:49 -06:00
Ps3Moira
71d80b86e1 Reverts Shot Gun Sprites (#594)
* Reverts Shot Gun Sprites

* Removed Held Prefix
2024-01-01 15:48:08 -06:00
Tim Falken
11d4a399f0 Crime Assist pda program (#464)
* 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>
2023-12-29 20:34:56 +01:00
Ps3Moira
6df7ba714b Reverts New E-Sword Sprites (#591)
No more laser pointer.
2023-12-24 03:56:01 +01:00
Ps3Moira
62ebf43290 Added Mouse Ops...again 🐭 (#515)
* Update RobustToolbox

* Mouse Ops

* Revert "Update RobustToolbox"

This reverts commit 0f04bb7ce0640024b8197ea2f4c75ef04f7aa9f7.
2023-12-06 17:03:07 +01:00
Tryded
f7fa33fd62 More energy guns (#463)
* RSIs

* Energy Guns

* Names

* Orderable Energy gun

* Mini Energy Gun

* Update armory.yml

* Research and Printing

* Update Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-armory.ftl

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

* fix

* Fix 2.0

* Update cargo-armory.ftl

* Revert "Update cargo-armory.ftl"

This reverts commit f78756eeb344edd961120c3f6cd43cc49b9f3974.

* ACtual fix (I'm dumb)

* Fixing IDs

* Update armory-crates.ftl

* Balance

* Missing value

* Gun Safes

* Mag unshaded stuff

---------

Signed-off-by: Tryded <139474617+Tryded@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-11-27 16:42:26 -06:00
Fluffiest Floofers
bad35e181a Energy Guns (#385)
* 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>
2023-11-15 19:41:00 +01:00
Fluffiest Floofers
3f436dab40 Corpsman PDA and Headset sprite update (#333)
* buh

* ye rip

* copypaste is fun
2023-10-27 19:25:38 +02:00
2digitman
efe109cf69 Added Scrambled Eggs (#189)
* Added Scrambled Eggs

* Fixed YML fail

Signed-off-by: 2digitman <twodigitman@yahoo.com>

* Changed TableSalt to Protein for the Scrambled Eggs reagent

Signed-off-by: 2digitman <twodigitman@yahoo.com>

* Correctly added Scrambled Eggs to DeltaV

* Update meta.json to reflect copyright

Signed-off-by: 2digitman <twodigitman@yahoo.com>

---------

Signed-off-by: 2digitman <twodigitman@yahoo.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-18 17:07:50 -04:00
Fluffiest Floofers
0a71952b3e Pumpkin Pie (#181)
* no pumpkin

* no pumkon

* Readds a bunch of spawner stuff
2023-10-17 16:31:33 -04:00
leo
78a32788c2 adds mothamphetamine and changes dulleavene (#186)
renames dulleavene to health violation and adds new drink mothamphetamine
2023-10-16 23:25:27 +00:00
Tad "Taddy" Johnson
640d7a7af0 Arsenal Expansion (#154)
* 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>
2023-10-13 13:28:50 -05:00
Tad "Taddy" Johnson
ef6579d7b7 Quickfix on melee (#157)
Wakizashi, e-cutlass, and katana sheathes should be all good to go now :3
2023-10-11 14:27:37 -05:00
Fluffiest Floofers
8281f889db HoP's Photobook steal objective (#142)
* ian

* Update heads.yml

added comment

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

* more pictures

* wrong reference

* update pictures

---------

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-09 15:08:18 -05:00
Fluffiest Floofers
ff899c13a5 Psibreaker (#99) 2023-10-05 21:28:00 +02:00
rosieposie
8940aecd99 Paramedic Lockers, Portafibs, and Chemvend Tweaks (#53)
* add paramedic-only access

* edit chemvend

upped jug amounts in each vend to accomodate for their use, and adds all emagged chemicals from the dispenser to them

* add portafib

* added comments and tweaked rollerbed

* one line comments

* Update IdCardConsoleComponent.cs

* increase crate price

* Comment, misspelling adjustments

removed unnecessary comments (ones indicating a Delta V change while already in the Delta V directory)

* not all jugs are created equal

this wont work btw

* chemvend restock price

---------

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-05 21:25:48 +02:00
Fluffiest Floofers
5699d38866 Martial Artist PDA (#89)
Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com>
2023-10-03 19:20:48 -05:00
Fluffiest Floofers
0cc1c098d7 .38 special and revolvers (#92)
* Port all the things

* Fix all the things

* Bluespace doesn't exist apparently

* Add missing lathe recipes

* Not in this PR's scope

* Not necessary for this
2023-10-03 15:01:47 -05:00
Fluffiest Floofers
e3c9a66a28 Praying Mantis (#86)
* Mantis mail for detective

Forensic Pads are no longer for Mantis, as the detective will take over the investigating crimes job.

* Mantis

* Remove forensic and pill

* Doesn't need this headset

* buh

* Fix capitalization

I swear I have a brain

* Minor spelling mistake, PR closed

* bread

* Rename to psionic mantis + antag advantage

* Zipties and mindbreaker pills

Mindbreaker doesn't do anything yet

* Update job-description.ftl

minor spelling mistake

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-03 17:47:54 +00:00
Fluffiest Floofers
2fb3198114 clean up id card sprites (#70) 2023-09-30 15:50:43 +00:00
Fluffiest Floofers
d3bb5e4996 HoL steal objective (#58)
* funny bill for hol

* change name and desc

Didn't like the first one

* Change IDs for stuff
2023-09-29 15:28:42 +02:00
Fluffiest Floofers
b8b25d64f1 Science to Epistemics (#47)
* RD to Mystagogue

* Science to Epistemics

* fix

* Delete steal-research-condition.ftl

* Remove duplicate headset

Those were simply renamed in the base files

* coats and mysta hat

* additional comments

* epi sign

replaces science sign

* Chaplain

* Give chaplain science headset

* mystagogue's turban

* Forgot about the dead chaplain spawner

* Update Traitors.xml

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

---------

Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.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-09-28 17:32:46 -05:00
Fluffiest Floofers
73fd7a7f5f grilledcheese (#55) 2023-09-28 19:53:04 +02:00
AR
9afee27f68 zero toy (#36)
* zero toy

adds a toy

* makes it obtainable

soup i want soup

* fixes thingys

* fix mapping error?

qdfwqegwhretjrytuyhjm

* adds `components:` into it

* fixes error

bsdsdsvdgbw ewbd

---------

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-09-27 10:22:54 -05:00
Fluffiest Floofers
0ba68b44be Logistics Dept (#24)
* Replace every Cargo with Logistics

That's a lot of changes damn
Might replace logitech back to cargotech

* logitech -> cargotech

the funny was reverted

* Courier

They do things

* mail bag and maildrobe

* Mail access

* Update comments

* Forgot about them

* MailDrobe textures

* Mailbag fix attempt 1

:clueless:

* Update headsets_alt.yml

grammar check

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

* Update hoods.yml

grammar check

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

* Update soft.yml

grammar check

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

* Update cloaks.yml

what do you think

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

* Revert "Update cloaks.yml"

This reverts commit 9d95d51a63555ac7486c44b2184ed475352d4cf9.

* Revert "Update soft.yml"

This reverts commit a6142b7b29ae1bd6e4c8274d99eb12b953c5abfb.

* Revert "Update hoods.yml"

This reverts commit 1d5665abac5b223bf235934548ec3530c1d07fce.

* Revert "Update headsets_alt.yml"

This reverts commit fa4feb6675160075369675a63299974cf4efb6f0.

* Update jobs.yml

small reversion

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

---------

Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.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-09-21 04:37:30 +00:00
Fluffiest Floofers
795fe5c244 Martial Artist, Prison Guard, Prisoner and Gladiator (#21)
* Martial, Guard, Prisoner, Gladiator

Prisoner is like halfway in wizden so that's a bit funky

* Boxing for Boxer, add jobicons to agent ID

* DataDefinition partial

* change geta equiped textures

* Fixes

* Fix copyrights

* New prisonguard icon

* Preference, martial civilian colors

* add ref to boxer nyano component

* comment out whitelistrequired and spawner

* Remove prisoner and guard from specific

Not that specific

* Fix prisonguard id card

For some reason the security officer id card icon is not at the correct place.

* Update comments

---------

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-09-19 09:22:56 -05: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
Colin-Tel
840665eb30 Adds flavors, foods, drinks (#12)
Adds most of the flavors, foods, and drinks from Nyano/DeltaV.

Some things have been commented out.
2023-09-13 18:40:16 +02:00