Commit Graph

36638 Commits

Author SHA1 Message Date
Hmeister-real 0129a6e5b6
Update cargo guidebook entry and other minor guidebook changes (#24828)
* Minor cloning change in guidebook

Cloning this should be removed at some point anyway, but im unsure if it can still be found in salv? can anyone confirm?

* Changes and updates to survival, removed fluff

* Create TradeStation.xml

* Forgor

* Change hex

* Rework this cause it was out of date

* Pointless spacing fixed (copy and pasted made it funny,)

* revert (somewhat)

Science cant set up cloning, so i just removed that part

* Remove more space

(cherry picked from commit 7ba6a278a4)
2024-03-08 12:54:52 +01:00
themias 554f664994
Fix centcom cargo gifts (#24701)
(cherry picked from commit 3933490962)
2024-03-08 12:54:52 +01:00
metalgearsloth 5c7b5ac280
Resave trading outpost (#24536)
Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

(cherry picked from commit 6ae4537871)
2024-03-08 12:54:51 +01:00
Ubaser 0f85467949
Update Trade Station (#24295)
add

(cherry picked from commit 00e770d4dc)
2024-03-08 12:54:51 +01:00
metalgearsloth fa3e17de86
Clear cargo orders on approval (#24278)
(cherry picked from commit f82fd23f2c)
2024-03-08 12:54:51 +01:00
Ubaser b3304295f6
Update Trading Outpost (#24281)
* add

* yes

(cherry picked from commit 8364086369)
2024-03-08 12:54:50 +01:00
metalgearsloth 8246734283
Run fixgridatmos on trading outpost (#24264)
(cherry picked from commit 129892f144)
2024-03-08 12:54:50 +01:00
Debug 76d06416ab
Modify trade station for Delta 2024-03-08 12:54:50 +01:00
metalgearsloth fa61952f51
Add trade stations (#23863) 2024-03-08 09:52:50 +01:00
Debug e271a5da59
Revert "Revert AME buff" (#939)
Revert "Revert AME buff (#930)"

This reverts commit 152a190d01.
2024-03-08 09:35:57 +01:00
DeltaV-Bot d8f082193a Automatic Changelog Update (#884) 2024-03-08 03:49:41 +00:00
Adeinitas 4a87ac100f
Makes Vulpkanin able to howl + adds some growling noises (#884)
* Adds howling / growling noises

* revenge of the spelling error!! grahh!!

* trying to fix that error with the schema validator

* Fixing copyright + adds vulp growls to harpy emote

* The case of the missing attributions dashes.

* Fixes up attributions.yml with license.txt info

* Update Resources/Audio/DeltaV/Voice/Vulpkanin/attributions.yml

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: Adeinitas <147965189+adeinitas@users.noreply.github.com>

---------

Signed-off-by: Adeinitas <147965189+adeinitas@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
2024-03-07 22:49:28 -05:00
Velcroboy d54b539cbe
Adds DV fluff to captain's nolaser locker (#905)
* Adds DV fluff to captain's nolaser locker

* I ALREADY DELETED THS, WTF

---------

Co-authored-by: Velcroboy <>
2024-03-07 22:47:51 -05:00
DeltaV-Bot a9f9b82128 Automatic Changelog Update (#871) 2024-03-08 03:46:49 +00:00
dge21 1c0c087e8a
Cap Gun Crate (#871)
* Update cargo_fun.yml

Signed-off-by: dge21 <129136517+dge21@users.noreply.github.com>

* Update cargo_fun.yml

Signed-off-by: dge21 <129136517+dge21@users.noreply.github.com>

* Update fun.yml

Signed-off-by: dge21 <129136517+dge21@users.noreply.github.com>

---------

Signed-off-by: dge21 <129136517+dge21@users.noreply.github.com>
2024-03-07 22:46:36 -05:00
BriBrooo 29a7e25e43
Personal Protective Equipment - The Polished Version (#854)
* Added chemical resistant apron

* Added formal chemistry suit

* Added chemist's tie

* Added enclosed shoes

* Added chemistry gloves

* Added glasses + fixed errors on modifiers

* Updated the ChemDrobe with new items

* modified the chemdrobe file

* modified the outerclothing misc file

* modified glasses file

* modified the gloves file

* modified ties file

* modified specific shoes file

* modified jumpsuits file

* Update glasses.yml

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update gloves.yml

Touching up descriptions

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update misc.yml

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
2024-03-08 03:42:59 +00:00
DeltaV-Bot 1e1aee8ade Automatic Changelog Update (#639) 2024-03-08 03:35:57 +00: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
DeltaV-Bot 511b9955f5 Automatic Changelog Update (#846) 2024-03-08 03:28:58 +00:00
Tryded aa238da3cc
Energy Gun Rebalancing (#846)
Half all energy requirements
2024-03-07 22:28:44 -05:00
DeltaV-Bot 1fcd282313 Automatic Changelog Update (#715) 2024-03-08 03:23:01 +00:00
BonkTrauma 9b783aff90
Prison communications (#715)
* 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>
2024-03-07 22:22:48 -05:00
DeltaV-Bot 3684aa2262 Automatic Changelog Update (#779) 2024-03-08 03:18:16 +00:00
JoeHammad1844 9dbb2eb8a0
nukie medic medical medhud (#779)
* nukie medhud

Signed-off-by: JoeHammad1844 <130668733+JoeHammad1844@users.noreply.github.com>

* Update meta.json

Signed-off-by: JoeHammad1844 <130668733+JoeHammad1844@users.noreply.github.com>

* should solve conflict

Signed-off-by: JoeHammad1844 <130668733+JoeHammad1844@users.noreply.github.com>

* that took too long to fix

Signed-off-by: JoeHammad1844 <130668733+JoeHammad1844@users.noreply.github.com>

* Update hud.yml

Signed-off-by: JoeHammad1844 <130668733+JoeHammad1844@users.noreply.github.com>

* hmmm

Signed-off-by: JoeHammad1844 <130668733+JoeHammad1844@users.noreply.github.com>

* might fix it

Signed-off-by: JoeHammad1844 <130668733+JoeHammad1844@users.noreply.github.com>

* Update hud.yml

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

---------

Signed-off-by: JoeHammad1844 <130668733+JoeHammad1844@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
2024-03-07 22:18:03 -05:00
Guess-My-Name 344aa7bff7
Psychologist & Lawyer stamp (#849)
* new stamps

* add stamps to cmos locker and lawdrobe

* adds stamps to starting gear of psychologist and lawyer

* move locale to deltav
2024-03-07 22:14:24 -05:00
DeltaV-Bot 8373ac5190 Automatic Changelog Update (#930) 2024-03-08 03:14:02 +00:00
Velcroboy 152a190d01
Revert AME buff (#930)
Co-authored-by: Velcroboy <>
2024-03-07 22:13:49 -05:00
Velcroboy f831b475f4
Remove Hive maxpop (#938)
Co-authored-by: Velcroboy <>
2024-03-07 21:03:16 -06:00
Debug 717e81c255
SignDirectionalICU > SignDirectionalIcu
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-03-08 02:00:43 +01:00
Adrian16199 e0b006768b
Fixes the 2 pixels in the fluffy tail. (#865)
It has bothered me and today felt like fixin it.
2024-03-07 23:00:16 +00:00
DeltaV-Bot 3a50aed85a Automatic Changelog Update (#855) 2024-03-07 22:49:36 +00:00
Fluffiest Floofers 560dd82952
Recipe for the Pumpkin Pie (#855)
Finally add the recipe

I swear I hadn't forgot about it
2024-03-07 23:49:21 +01:00
Fluffiest Floofers 5ac3da210b
Another .38 special clean up / balance (#852)
* 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.
2024-03-07 23:47:51 +01:00
DeltaV-Bot f767c45fd2 Automatic Changelog Update (#706) 2024-03-07 22:22:56 +00:00
Danger Revolution! d50483485b
More Borg Lawsets (#706)
* Add Station Efficiency Lawset from YogStation

* Adds Clown & Cowboy LawSets

* adds research lawset & shuffles laws

* adds janitor lawset

* adds engineer lawset, moves station efficiency to a ion storm lawset

* Medical Lawset

* Apply lawsets to Borg Chassis'

* Medical Lawset

* errors >:(

* Adds the Druid and Tyrant Lawsets

* adds the chaplain lawset

* adds chaplain (& maybe clown) to ion storm pool

* chaplain locale >:(

* adds reporter & live and let live lawsets

* and their locale >:(

* and their chance to spawn >:(

* drone --> cyborg

* dungeon master, silicon police, nutimov

* paladin lawset

* Update silicon-laws.yml using the horrific git mobile interface

* i don't really like the engineering lawset, so replaced until further notice

* moved things to delta-v places

* more fixing

* Update silicon-laws.yml

* adds clown lawset to ionstorm pool

* added "ObeysTo" fields as per Wizden merge

* spelling mistake >:(

* added custom "obeyTo" for Cowboy

* adds delta-v tags

---------

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
2024-03-07 23:22:42 +01:00
Debug 9b2d304326
Merge pull request #937 from DebugOk/2024/03/05-Merge-Master
2024/03/05 merge master
2024-03-07 18:18:05 +01:00
Debug 98b1a39fed
Fix SyndicateMonitoringServer prototype 2024-03-07 18:07:23 +01:00
Debug 25de1b3534
Migrate LockableButtonBrig 2024-03-07 18:03:02 +01:00
Debug 189230aa52
News cartridge migration 2024-03-07 17:51:59 +01:00
Debug 0dc9fe6bd0
Some drone tags 2024-03-07 17:51:51 +01:00
Debug 852f64605b
Wacklights, untested 2024-03-07 17:51:31 +01:00
Debug d406524053
Revert "Signage For Meee (#799)"
This reverts commit 02b13528c1.
2024-03-07 02:13:18 +01:00
Debug fc7e32f9cc
Fixes 2024-03-07 02:10:29 +01:00
Debug fc764f383b
Update uplink_catalog.yml (#934)
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-03-07 01:07:01 +00:00
Debug 9642ded02e
Update base.yml
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-03-07 01:58:36 +01:00
Mr. 27 974c8b6cc2
Monkeys can wear all types of masks, not just breath/gas masks (#25816)
* clown mask real

* Update masks.yml

(cherry picked from commit 2c2be09956)
2024-03-07 01:52:57 +01:00
exincore d4d8898496
fix(emag): Emagging a lock properly unlocks the component (#25858)
* fix(emag): Emagging a lock properly unlocks the component

Fixes #24860

* fix(emag): Emagging a lock no longer duplicates the unlock sound

(cherry picked from commit 370a79fbc8)
2024-03-07 01:52:55 +01:00
PJBot 2062e6dfde
Automatic changelog update
(cherry picked from commit 6da400980b)
2024-03-07 01:52:53 +01:00
Tayrtahn 6feaad0b97
Make flasks fit in dispensers again (#25883)
Added FitsInDispenser to FlaskBase

(cherry picked from commit 56454b6c16)
2024-03-07 01:52:51 +01:00
Tayrtahn 3f54180d28
Hotfix for errors in handheld lights and radio jammers (#25880)
(cherry picked from commit e5536e0652)
2024-03-07 01:52:49 +01:00