Commit Graph

7929 Commits

Author SHA1 Message Date
Ed
36da152d73 Clothing update (#231)
* added cotton shirts

* pants update

* add new cloaks

* Update misc_startinggear.yml

* glasses update

* Update migration.yml

* remove yellow hoodie helmet
2024-06-11 13:48:01 +03:00
Ed
50470c3aaa Ed 09 06 2024 upstream (#230)
* Revert "Buff the AME until somebody fixes engineering" (#28419)

* Automatic changelog update

* hand teleport portals now may start in the same grid. (#28556)

* Microwave recipes now uses stacktype id instead of entity prototype id for stacked entities (#28225)

* Automatic changelog update

* Add "fill level" sprites to mops and damp rag (#28590)

* Automatic changelog update

* Reword some criminal records text (#28597)

* Update criminal-records.ftl

* Update criminal-records.ftl

* Update criminal-records.ftl

* Remove obsolete VisibilitySystem functions (#28610)

Remove obsolete visibility functions

Co-authored-by: plykiya <plykiya@protonmail.com>

* Prayable datafield typo (#28622)

* notifiactionPrefix -> notificationPrefix

* notifiactionPrefix -> notificationPrefix

* Update engine to v224.1.0 (#28624)

* Use dummy sessions in NukeOpsTest (#28549)

* Add dummy sessions

* Update NukeOpsTest

* Fix PvsBenchmark

* Update engine to v224.1.1 (#28632)

* Add Job preference tests (#28625)

* Misc Job related changes

* Add JobTest

* A

* Aa

* Lets not confuse the yaml linter

* fixes

* a

* Add logs that provide session to player admin logs (#28628)

* Cluster Update (#28627)

done here

* Automatic changelog update

* minor banner changes (#28636)

* minor banner changes

* Uhrmm actchually it's you're, not your

* Update banners.yml

props Hyenh

* Revenant spell catalog locale (#28638)

locale

* Make cuff default range again (#28576)

* Make cuff default range again

* uncuff distance

* how about ONE

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

* Automatic changelog update

* Machine-code cleanup (#28489)

* Make Projectiles Only Hit a Variety of Station Objects Unless Clicked on (#28571)

* Automatic changelog update

* Fix Smoke-grenade.ogg not being mono (#28593)

* Fix Cigars Sprites + YAML fix for Inhand unlit cigars/cigs (#28641)

* Automatic changelog update

* Clean up Eva and Hardsuit helm yml + Lets atmos firesuit helm work as a BreathMask (#28602)

* Shifts borgs hats to the right a bit (#28600)

* Fix mouse inhands (#28623)

* Adjust some touch reaction damage levels (#28591)

* Automatic changelog update

* Add closing storage UIs to StorageInteractionTest (#28633)

* Update rules (#28452)

* Add support for LocalizedDatasets to RandomMetadata (#28601)

* Fix Admin Object tab sorting and search (#28609)

* Automatic changelog update

* Internals are kept on as long as any breathing tool is on (#28595)

* Automatic changelog update

* Convert rules to use guidebook parsing (#28647)

* Gives Insulation and NoSlip to all bots (#28621)

* Gives Insulation and NoSlip to all bots

* remove NoSlip from children

* Automatic changelog update

* Nerfs welderbombing (#28650)

nerf welderbombing

* Automatic changelog update

* Give jobs & antags prototypes a guide field (#28614)

* Give jobs & antags prototypes a guide field

* A

* space

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Add todo

* Fix merge errors

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Automatic changelog update

* Fix typo in Space Law's restricted gear (#28668)

This typo was included in the wiki as well.

Reported-by: Bobberson in the Discord

* Automatic changelog update

* fixed "silicones" typo in new rules (#28671)

fixed all appearances of silicone where it should have been silicon

* fix janitor not spawning with a survival box (#28669)

hi

* Automatic changelog update

* Fix typo in slime naming conventions (#28682)

* Flatpacker fixes (#28417)

* Return medicine recipe solid material costs to 1 (#28679)

Set material costs of medicine recipes to 1

* Automatic changelog update

* Update Core (#28689)

add

* Fixed the guidebook listing every single rule (#28680)

* Well i tried this way

* New approach (start)

* Did it

* makes spacelaw available, put it under sec

* Automatic changelog update

* rule fixes first pass (#28701)

update

* Add JobRequirementOverride prototypes (#28607)

* Add JobRequirementOverride prototypes

* a

* invert if

* Add override that takes in prototypes directly

* Tweak chapel salvage wreck (#28703)

add

* Fixes client having authority over rules popup cvars (#28655)

* Fixes client having authority over rules popup cvars

* Delete duplicate migration

* Pre-update

* Post-update

* Add locale support for booze and soda jugs labels (#28708)

* Swap some InRangeUnobstructed for InRangeUnoccluded (#28706)

Swap InRangeUnobstructed to InRangeUnoccluded

Co-authored-by: plykiya <plykiya@protonmail.com>

* Automatic changelog update

* Ports the singularity's values from vgstation (#28720)

* ports the singularity values from vgstation

* guidebook fix

* 5000 energy level 6 singulo

* Fix action icons when dragging an active action to another slot (#28692)

* Add DoPopup data field to OnUseTimerTrigger (#28691)

* Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709)

* Update DevourSystem.cs

* Update DevourSystem.cs

* Update Content.Server/Devour/DevourSystem.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Automatic changelog update

* Improve grammar of various petting messages (#28715)

Improve grammar of various petting message

* Fix DamageOtherOnHit.OnDoHit when the target is terminating or deleted (#28690)

* Update Core (#28735)

add

* Fix flatpacker (#28736)

* Fix flatpacker

* a

* rn, atp (#28674)

* Update speech-chatsan.ftl

* Update word_replacements.yml

* Atm-at the moment

* Atm

* Update Resources/Locale/en-US/speech/speech-chatsan.ftl

* Update Resources/Prototypes/Accents/word_replacements.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Add loadout group check for role proto (#28731)

MFW same bug twice at 2 layers because I'm stupid.

* Automatic changelog update

* Try fix RGBee (#28741)

* Automatic changelog update

* Ensure packager creates a release folder (#28426)

I was screaming at the github actions runner before i noticed something i had done before caused me to never have a release folder and thus fail.

* allow ' in character names (#28652)

* Automatic changelog update

* Make freeze, freeze & mute, and unmute verbs work on disconnected players. (#28664)

* Automatic changelog update

* fix singulo decay (#28743)

* Automatic changelog update

* Don't use invalid defaults for loadouts (#28729)

At the time it made more sense but now with species specific stuff it's better to have nothing.

* Maybe fix invalid loadout prototypes (#28734)

* Maybe fix invalid loadout prototypes

So if we have existing data SetDefault is not normally called iirc. So what I think is happening is that if we have old loadout groups that get saved to DB and loaded these get dropped entirely and nothing is used to replace the group unless the person specifically looks at their loadout.

Need someone affected to send me their loadout to confirm it's fixed.

* Better fix

* Automatic changelog update

* Fix null ref exception in PrayerSystem (#28712)

* Fix null ref exception in PrayerSystem

* Also check that prayable ent/comp still exist

* Guidebook Updates for the Amateur Spessman (#28603)

* Created NewPlayer.xml

* Created NewPlayer.yml and added it to guides.ftl

* shifted some controls from Space Station 14 to New? Start here!, as well as made a character creation xml to be written later

* switched some stuff between the New? entry and the Space Station 14 entry

* Made everything so nice!!!!!!!!!!!!!!

* fixed formatting inconsistencies

* added a How to use this guidebook section

* build correction and guidebook clarification for other servers

* wrote character creation ig probs fo shizzle

* added new terms to the glossary and alphabetized it

* meh this seems important enough to add

* okay no more shitsec bad idea

* I HATED Roleplaying.xml ANYWAY!!!

* I REALLY REALLY HATED IT ACTUALLYLLL

* Moved Controls and Radio into newplayer.yml, making meta.yml and radio.yml obsolete

* Separated the character creation bits that are just cosmetic from the ones that matter

* also put all the related new player xml files in their own folder

* expanded Radio.xml, kinda fixed survival.xml

* removed the line that mighta maybe sorta possibly could encourage self antag

* thought about this randomly but ICK OCK

* talking is no longer a key part of this game

* moves stuff around, a lot of stuff. basically moves everything but the jobs themselves around

* ah probably should make sure this works first also me when i lie on the internet

* don't be such a grammar nukie

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* okay nevermind that's justified

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* prepare. it is coming. the great reorganization...

* yesyes that's all well and goo- THE REORG IS COMING. THE REORG IS COMING. WAKE UP.

* rename that real quick

* step one begins. first, consolidate existing service entries into their own yaml. this makes botany.yml obsolete.

* update shiftandcrew.yml to only have departments as children also fuck it alphabetization

* consolidated salvage into cargo

* made a new entry for command

* gave salvage a home and service an existence

* made some XML files to be filled out later

* quick rename...

* took some stuff from Intro.txt and i think Gameplay.txt and put it in NewPlayer.xml

* The Great Writing about Departments (25XX, black and white)

* added a bunch of links everywhere

* biochemical is no longer a thing

* service formatinaaaaaaa

* shiny...,,,,,,,,, colo(u)rz..,,,,,,,,,,,,,

* let's get that fixed

* second time i made a typo there as well

* we hate fun around here

* grammar?!???/

* various fixes and more linkings

* oops

* wewlad lol!!

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>

* Automatic changelog update

* Add suffixes to excap survival boxes (#28755)

Update emergency.yml

* Add Jani lobby background (#28724)

* Add jani lobby background

* Actually make new lobby screen functional

* Fix license

* Automatic changelog update

* Strip markdown from silicon laws before saying them (#28596)

* saltern update (#28773)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* revert Tornado regex

* Update HumanoidCharacterProfile.cs

* Update arenas.yml

* test

* fix locale

* Update options-menu.ftl

* Update species-names.ftl

* Update debug.yml

* aaaaaa

---------

Co-authored-by: Moony <moony@hellomouse.net>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com>
Co-authored-by: blueDev2 <89804215+blueDev2@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: Hmeister-real <118129069+Hmeister-real@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: Ps3Moira <113228053+ps3moira@users.noreply.github.com>
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com>
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: MerrytheManokit <167581110+MerrytheManokit@users.noreply.github.com>
Co-authored-by: Vasilis <vasilis@pikachu.systems>
Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: UBlueberry <161545003+UBlueberry@users.noreply.github.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2024-06-09 23:53:10 +03:00
Ed
d7c0a4ec1e Tile burning (#228)
* tile burning

* add big planks burning, some fix

* FIRE!!! more structures can burn

* wallmount burn

* fuck Jetbrains!

* Update CP14FireSpreadSystem.cs
2024-06-09 15:45:27 +03:00
Ed
2cfdc4a52f Solution normalizer (#227)
* dropper

* add stabilizer

* fuck, now

* Update CP14SolutionNormalizerComponent.cs
2024-06-08 18:46:09 +03:00
Ed
d998e6bf9a Lumishroom (#226)
* added lumishroom art

* lumishroom

* Update migration.yml

* fix

* fix x2

* Update alchemy_test_layer2.yml

* worldgen

* Update chromium_inverse.yml

* add new barrels and vials
2024-06-08 01:03:21 +03:00
Ed
819dac54de Chasms (#224)
* chasm sprites

* add proto

* Update chasm.yml
2024-06-07 01:24:39 +03:00
Ed
df695cc39b Dirt wall (#223)
* add dirt wall sprites

* added dirt wall proto

* add dirt material, dirt wall crafting and dirt drop from wall
2024-06-06 21:06:32 +03:00
Ed
7f27b36506 Quartz crystal as alchemy reagent (#217)
* added quartz as alchemy reagent

* quartz is not deadend

* added barrels
2024-06-06 00:19:30 +03:00
Ed
36c7e5c9a0 fix 2024-06-05 20:16:49 +03:00
Jaraten
a623704416 add&resprite furnitures (#196)
* add&resprite furnitures

* license and sprite fix

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-06-05 20:15:51 +03:00
Ed
b803496694 Procedural + z-levels refactor (#216)
* create biome tile spawner

* spawner now spawn decals and entities

* fancy spawners

* remove old decals

* randomize seed

* fix bugs

* update alchemy test map to new system

* update z-level system

* autolink tweak

* add documentation

* Update GravityComponent.cs

* Update GravityComponent.cs
2024-06-05 19:59:39 +03:00
Ed
454930bb85 Alchemy patch (#214)
* added tiefling and elf blood + new bloodgrass reactions

* buff chromium slime

* full restruct reactions files

* remove deadend thirst and satiate

* more rules

* Create fail.yml

* remove rainbow and cough deadend
2024-06-04 23:08:42 +03:00
Ed
b891542ca9 Merge remote-tracking branch 'upstream/master' into ed-04-06-2024-upstream
# Conflicts:
#	Resources/Prototypes/Accents/word_replacements.yml
2024-06-04 18:09:38 +03:00
Ed
fdf9413088 sharpened fix (#209) 2024-06-04 16:59:53 +03:00
Ed
16bc737d9a Battle hammer (#206)
* add hammer

* Update battleHammer.yml

* remove 32
2024-06-04 15:28:52 +03:00
Ghagliiarghii
87fe804831 tyvm, tysm (#28577)
* tyvm, tysm

* cya -> see you

* ya
2024-06-04 13:57:17 +02:00
Tayrtahn
9d2b4ed3b2 Add an integration test for solution fill level sprites. (#28564) 2024-06-04 10:23:43 +10:00
deltanedas
16b3fb1204 LoadMapRule grid storage rework (#28210)
*
2024-06-03 20:04:19 -04:00
Mr. 27
7d22897d02 Job starting gear is now defined in the starting gear rather than backpack prototypes (#27605)
*
2024-06-03 19:52:15 -04:00
Verm
2ae5c953de Humans can no longer honk on command (#28566)
* Humans can no longer honk on command

* Undo change it emote file

* I hate tabs

* Some comments
2024-06-04 01:45:00 +02:00
Velcroboy
98ab251f92 Remove duplicate entities (#28561) 2024-06-03 16:55:43 -04:00
Ed
70df945fe1 Elf species (#205)
* add elves names

* fix

* fix dwarf clothing preview

* elf!

* add marking locales

* fuck ss14 species

* Update SpeciesPrototype.cs
2024-06-03 23:50:05 +03:00
RenQ
3e2eb6cc7a "Death gasp" for a moth (#28409) 2024-06-03 14:48:01 -04:00
Ed
a4d1601758 Accent trait limit (#28046) 2024-06-03 14:47:06 -04:00
Tayrtahn
b5e8a69622 Add a test for sliceable cargo bounty exploits (#28357) 2024-06-03 12:24:32 -04:00
AJCM-git
8c10581010 Cleans up StatusIconSystem and fixing some bugs (#28270) 2024-06-03 12:12:21 -04:00
deltanedas
8d78b7442a make objectives use entityCategory (#28269) 2024-06-03 09:23:52 -04:00
Cojoke
e784f2cf3c Make projectiles not hit crates unless clicked on (#28072) 2024-06-03 09:04:07 -04:00
deltanedas
977bd5ad6d make GameRule use entity category (#28294) 2024-06-03 08:39:25 -04:00
Cojoke
a0b49116be Adds Chat Triggers to the Gasp Emote (#28466) 2024-06-03 08:10:24 -04:00
Cojoke
eb026c9b5b Gives Medibots Random Lines(not a good title) (#28543) 2024-06-03 08:05:14 -04:00
Verm
36396e3f86 Changes SyndiCat spawner to a radio (#28492) 2024-06-03 07:54:32 -04:00
Verm
31eb3ed62c Welding tweaks (#27959) 2024-06-02 23:28:53 -04:00
AJCM-git
509e3aedf7 RespawnRuleSystem tweaks. (#28528) 2024-06-02 23:28:38 -04:00
Whisper
9dbdacda95 Rename admin cloak to weh cloak (#28540) 2024-06-02 19:18:49 -07:00
Deserty0
c66fb13639 Belt slots now depending on pants (#202)
* Update human_inventory_template.yml

* And key slot

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-06-02 23:10:56 +03:00
Killerqu00
4eadbbc39d fix typos in bonfire descriptions (#28515)
* fix typo

* a
2024-06-02 15:40:02 -04:00
Ed
f91e3c7aca Update jobs.yml 2024-06-02 14:43:54 +03:00
Ed
ee1aed5f33 Update jobs.yml 2024-06-02 14:43:42 +03:00
Ed
2b556d0e9c finally fix jobs 2024-06-02 14:07:00 +03:00
Ed
32c85b5498 upstream complexinteraction moment 2024-06-02 13:32:51 +03:00
Ed
3ee8164e1b Job rename 2024-06-02 12:54:25 +03:00
Ed
7b5a593481 fix coins, roles, trackers 2024-06-02 12:34:19 +03:00
Ed
a3a7605ac7 alchemist role + locales fix 2024-06-02 12:22:22 +03:00
Leon Friedrich
16be126ca1 Remove noSpawn: true from action entity prototypes (#28508) 2024-06-02 01:11:48 -07:00
Ed
6a5fae3403 Merge remote-tracking branch 'space-station-14/master' into ed-02-06-2024-upstream 2024-06-02 11:01:34 +03:00
slarticodefast
1283989346 Flash overlay rework and bugfixes (#27369) 2024-06-02 00:17:53 -04:00
Cojoke
4c667b2d8f Fix Lasers Being Blocked by External Airlocks and Shuttle Airlocks (#28065) 2024-06-02 00:13:12 -04:00
Leon Friedrich
6235fa1ac6 Content changes for entity categories PR (#27232)
* Content changes for entity categories PR

* Poke tests

* Why are tests suddenly working?
2024-06-02 14:08:15 +10:00
MilenVolf
5d970b0861 Station event component and system tweaks (#28331)
* Make anomaly, artifact and gifts events announcement sound optional

* Requested changes + Added new "GameRuleAfterAddedEvent" for StationEventSystem

We need to call "Add" in "StationEventSystem" after others GameRule's in case if we need to change StationEventComponent variables.

* Fix margins

* Makes use of GameRuleComponent.Delay and remove station system handling of delays plus small cleanup

* Fix merge

---------

Co-authored-by: AJCM <AJCM@tutanota.com>
2024-06-01 16:34:58 -04:00