Commit Graph
73 Commits
Author SHA1 Message Date
Mr. 27 ed6a023161 add ratvar to ion storm laws (#26833)
Praise Ratvar

(cherry picked from commit e64288a8fe)
2024-04-21 21:44:21 +02:00
Hannah Giovanna Dawson b5aef481a2 Ion Storm Laws Review (#26703)
* Ion Storm Laws Review

Have reviewed the Ion Storm law dictionary
and tidied it up.

Specifically I've tried to keep the same number
of entries in each section, or slightly
increased them, where I've removed or
altered a string.

Of note, specific colours and "rainbow" have been
removed from adjectives and replaced with words
like "Cheese-Eating", as colours are kinda boring
themselves and they've been a cause of a few
accidentally-racist laws.

* Resolve some feedback.

* Remove the pull request joke, noooooo

* Re-add big bite burgers as they are actually a thing

* Append some more suggestions

(cherry picked from commit 2cc4098406)
2024-04-21 21:44:20 +02:00
4c1720df4e Infinity books (#25840)
* setup text data

* roundstart reshuffling keywords with gibberish words

* saved data categorized

* add book with hints

* start redrawing books

* +4 book design

* +books +random visual upgrade

* finish first file

* finish lore file

* finish with books.rsi now authorbooks.rsi...

* aurora! and some fix

* nuke author books

* speelbuke update

* finish respriting work

* fix scientist guide visual

* setup datasets

* setup stupid funny random story

* restore author books, upgrade hint generation

* add variety to story generator

* add learning system

* minor textgen edit

* file restruct, hint count variation

* more restruct

* more renaming
add basis learning system logic. Spears locked for special book for test.

* nuke all systems, for splitting PR gods

* typo fix

* update migration with deleted books

* add random story books to maint

* Update construction-system.ftl

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* typo fix

* interchangeably

* final

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* "."

* Update Content.Server/Paper/PaperRandomStorySystem.cs

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* Ubazer fix

* inadequate

* localized

* Update meta.json

* fuck merge conflicts

* fix jani book

---------

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
2024-04-07 14:30:40 +02:00
Whisper baf87790eb Update blood related tips! (#25809)
(cherry picked from commit f259f2f3a2)
2024-03-17 15:11:36 +01:00
Skarletto 57e116fe30 Remove Grandpa from name list (#25725)
remove grandpa's fucked up bed

(cherry picked from commit 1037bfc6a0)
2024-03-07 01:09:16 +01:00
YuNii 4e7062fb4e Fix typos calling salvage specialists a 'salvage technician' (#25657)
fix typos calling salvage specialists a 'salvage technician

(cherry picked from commit 1c015d1fd5)
2024-03-07 01:04:47 +01:00
lapatison 1334f981f7 Minor cookie fortune fix (#25503)
minor locale fix

(cherry picked from commit 2a5eb86e22)
2024-03-05 09:49:56 +01:00
Fluffiest Floofers fd3492e0bb Replace the new mentions of QM (#858)
remove qm from existence

Also now we have 2 LO beret.
2024-02-21 04:29:07 +01:00
Errant 61ad8108af Vox names, species prototype cleanup, some cosmetic changes (#24994)
* voxnames

* New generator parameters, names are more readable

* bunch of missing vox stuff

* more names

* sad

(cherry picked from commit 5a9ab3b315)
2024-02-18 23:08:43 +01:00
deltanedas 965e1cae57 criminal records revival (#22510)
(cherry picked from commit 683591ab04)
2024-02-08 12:37:29 +01:00
Ubaser cb5fb265c7 Fix tips (#23920)
(cherry picked from commit d99c56f67d)
2024-01-26 22:27:07 +01:00
Ubaser 673d3cc0e3 Update tips (#23611)
* add

* fix

(cherry picked from commit 8b107b5a9f)
2024-01-26 22:04:07 +01:00
Tayrtahn b818ba300d Fix tiny grammar/spelling issues (#23534)
(cherry picked from commit 2de5570094)
2024-01-26 21:40:06 +01:00
LankLTE 1805610dac remove racism (#23039)
* Remove only 'species' is crew rules

* hit space one too many times

(cherry picked from commit ed997dc5be)
2024-01-22 18:38:34 +01:00
SpaceyLady f5768ce72e Correct spelling mistakes for daily tips (#22893)
Update tips.yml

(cherry picked from commit 9103061ac0)
2024-01-22 18:27:53 +01:00
Tim FalkenandColin-Tel 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
Kara a23dce4702 Rename Miasma to Ammonia (#22791)
* Rename Miasma to Ammonia

* Namespace changes

* Map change????? why
2023-12-22 23:12:06 +01:00
lzk 44e7a2621d Ert names ops (#22246)
* names

* humanoids
2023-12-16 19:47:26 +01:00
Ps3Moira 62ebf43290 Added Mouse Ops...again 🐭 (#515)
* Update RobustToolbox

* Mouse Ops

* Revert "Update RobustToolbox"

This reverts commit 0f04bb7ce0.
2023-12-06 17:03:07 +01:00
lzk ab686327cc Update Operation_suffix.yml (#21882) 2023-12-02 19:05:11 +01:00
lzk 77c4dfa8ad :trollface: (#21724) 2023-11-19 22:22:01 +01:00
2013HORSEMEATSCANDALandfaint 1d1b65024d Operations (#21154)
* Creates an operation name when Nukies spawn.

* Fixed each nukie getting a different name

* Fixed it again for real this time

* commit name

* Revert "fix (#20719)"

This reverts commit bfa301b53e.

* Fixed it (for real this time it works now I swear)

* Update Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

* shortened variable names

* moved a method

* typo fix

* rewrote the lists in alphabetical order

---------

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
2023-11-19 22:16:37 +01:00
deltanedasanddeltanedas 950acba0e3 Ion storm event (#20277)
* ion storm event prototype + locale

* add lawsets

* use lawsets, make borgs ion storm targets

* ion storm rule and ion storm target

* lawset prototype

* use lawsets

* update silicon law system to use lawsets and support ion storm event

* new toys

* fix

* more fix

* fixy

* ion storm admin logging

* assigning laws makes borg provide its own laws, other stuff

* 1h reoccurence

* 50% chance

* better call saul

* emagLaws is required

* add announcment audio

* fixy

* family friendly gaming

* fixy

* address reviews

* fixy

* more fixy and no erp

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-31 18:51:30 +01:00
deltanedasanddeltanedas 783013a73e give roundstart borgs names (#20081)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-31 18:45:37 +01:00
Fluffiest Floofers 2adb27157c Tips (#81) 2023-10-03 15:23:17 -05:00
Fluffiest FloofersandColin-Tel 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
Flareguy 3cf0073d95 Minor tips update (#20505) 2023-09-27 21:59:12 +02:00
Nemanja 977d5d2ad5 Rat King Milsim + Buffs (#20190)
* rat king update

* rummaging

* buuuuunnnnncccchhh of shit

* the last of it

* make rat servants not ghost roles

* pissma buff and cooldown
2023-09-27 21:59:12 +02:00
deltanedasanddeltanedas ce7376d6af remove sus codewords (#20060)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-27 21:59:12 +02:00
Fluffiest FloofersandColin-Tel 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 9d95d51a63.

* Revert "Update soft.yml"

This reverts commit a6142b7b29.

* Revert "Update hoods.yml"

This reverts commit 1d5665abac.

* Revert "Update headsets_alt.yml"

This reverts commit fa4feb6675.

* 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
Nemanja 3f2ea17bb7 fix species skin colors (#19417) 2023-08-21 19:05:24 -07:00
Errant 7527036cf1 Laser namechange and some buffs (#18951)
* Laser naming

* More laser changes
2023-08-13 01:18:49 -06:00
Vordenburg 4821003972 Add names for moths (#18618) 2023-08-04 10:59:53 +10:00
Emisse 65d069a203 sussy toolbox 2tc again (#18000)
* 2 tc

* digusting
2023-07-12 13:47:35 -06:00
lzk 205ac48710 Update tips.yml (#17223) 2023-06-08 13:58:51 -06:00
lzk228 4783a655a4 remove useless tip (#17000) 2023-06-01 03:09:44 -07:00
metalgearsloth 57858f802f Shuttle drone improvements (#16931) 2023-05-31 11:13:02 +10:00
Flareguy 2179f43e0f Adds a bunch of new game tips (#16696)
* tips update

* dodeydodedode

* oops

* well... Bitch

* gramer

* fode

* well... bitchas
2023-05-23 04:00:59 -06:00
PixelTK 8269a500b3 Arachnid species (#13945) 2023-04-30 02:19:06 +10:00
Scribbles0 e24d0b4e44 [Antag] Lone Ops (#14647)
* loneops event, prototype stuff, striker shuttle, and nukeops rule changes

* newline

* shuttle attributions

* optimizations and tweaks

* bugfix and mutually exclusive with nukeops

* bugfix but better

* fix nukie planet spawning when defaulting to extended

* remove hypospray protection references

* ghost_roles.yml edit thingy

* remove .orig file
2023-04-17 00:00:43 -06:00
Nemanja e74fe2d87b Update tips.yml (#13936) 2023-02-04 21:31:18 -06:00
Whisper 0b936d8a2d Cleaned up syndicate names. (#13768) 2023-01-28 11:09:22 -08:00
lapatison fca0be1c1a More cookie fortunes (#13584) 2023-01-22 09:20:17 -04:00
Kara 8550baa218 Tips extensions (#13551) 2023-01-17 12:43:51 -06:00
Kara 52e50bd34f Tips system (#13509)
* dataset

* cvar

* tips system

* oops

* even higher

* peptide

* dataset cvar
2023-01-16 10:52:52 -06:00
Whisper f3b8ff243d Random name cleanup (#13392) 2023-01-10 23:45:06 +11:00
Kara c64b8cec4c Remove "Goebbles" from last name list (#13020) 2022-12-13 16:37:24 -08:00
Paul RitterandDrSmugleaf 3884c4d3db serv4 + submodule update (#12740)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2022-11-27 19:25:55 +01:00
Nemanja fd9bedae9a New Species: Diona (#11497)
* new species: Diona

* more diona stuff

* dey breathing now

* test fixe

* fix a merge

* now actually fix the merge

* foobar

* oversight

* ok now the rest of em
2022-11-08 14:26:59 -06:00
NemanjaandKara 9363674bd5 Bad 2 Da Bone [Skeleton Tweaks] (#11669)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-10-15 15:06:01 -07:00