Commit Graph

86 Commits

Author SHA1 Message Date
Psychpsyo
bfb40d5213 Grammar fix (#24599)
(cherry picked from commit abcdfbea187084aa150cf10f7637f3d09880cd06)
2024-01-28 00:32:00 +01:00
Nemanja
7573dba496 Rip out remaining machine upgrades (#24413)
* Rip out remaining machine upgrades

* eek

(cherry picked from commit a9e89ab37221c4f5eff5a9e1d42e97c6f3e0753b)
2024-01-27 23:43:49 +01:00
Debug
828749559b Final fixes 2024-01-27 00:16:43 +01:00
IlyaElDunaev
b67dcf5a02 Botany guide chemicals (#24194)
(cherry picked from commit 09b3a4489c4a042f40ee3ab0060ebc8c9c9e0a2f)
2024-01-26 23:07:20 +01:00
Emisse
9d047a7e52 kill machine parts + migrate machine part spawners to salvage loot spawner (#23752)
* kill machine parts

* guidebook and artifact effect

* worst test ive ever seen in my life

* nuke test

(cherry picked from commit df1d8c36e5e8b0773123c744a4acca473fb135ea)
2024-01-26 22:14:43 +01:00
Minty642
3bd7c84fca Add Food Recipe for food bounty in chef guidebook (#23659)
add recipe

(cherry picked from commit 8fd8ca6a5967143e825681aa74bb36a808c301b4)
2024-01-26 22:06:23 +01:00
Tayrtahn
b818ba300d Fix tiny grammar/spelling issues (#23534)
(cherry picked from commit 2de55700948052a7bc5f0d76d938faef3c82f742)
2024-01-26 21:40:06 +01:00
Varen
07e7623c77 Fix Guidebook Singularity entry (#23535)
Remove reference to tritium creation + fix typo

(cherry picked from commit 8ae07db45c0bb1406856cf33baaab3bead0b05ec)
2024-01-26 21:39:33 +01:00
Chief-Engineer
7278318225 Add access logs (IC ones) (#17810)
(cherry picked from commit 476ea14e8a0925e7f90ddbe5f6dd7144bf43cde5)
2024-01-22 18:37:44 +01:00
Debug
18f0af1f68 Implement gridinv, proper (#703)
* Implement gridinv, 1500 squashed commits :elp:

* Me when

* Linter errors

* Fix katana belts
2024-01-21 19:58:28 +01:00
Colin-Tel
e33e3aca9a Update Rules.txt (#690)
* Update Rules.txt

* Update Rules.txt
2024-01-19 11:30:33 +01:00
2013HORSEMEATSCANDAL
54faa6b0d1 Glossary (#22840)
* Added a glossary to the guidebook to help new players understand slang.

🆑 2013HORSEMEATSCANDAL
- add: What's a Greytide ? The new edition of your employee guidebook now has a glossary !

* added one more definition
2023-12-22 23:25:06 +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
Velcroboy
a549bc52c5 Remove duplicate milks (#22721)
* Remove duplicate milks

* Migration

* Inventories

* Guidebook

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-22 22:56:56 +01:00
Minty642
99a78ac3e0 Add Taco Recipe to Guidebook (#22491) 2023-12-16 20:19:57 +01:00
Errant
1818b19687 Blood-red medic armor ID change (#22422)
* Rename blood-red medic hardsuit prototype

* Update guidebook

* Migration
2023-12-16 20:11:11 +01:00
willicassi
c80aae753a Update guidebook botany entry (#22351)
* update botany guidebook entry; now includes basics of job, hydroponics tray, and seed extractor.

* fixed spacing issue

* update text colors to match referenced light colors
2023-12-16 19:52:40 +01:00
CrigCrag
53df261ab5 3 New Brute Chemicals (And Razorium) (#22103)
* guidebook

* like everything else

* increase razorium damage

* nerf a lil bit
2023-12-16 19:27:09 +01:00
TurboTrackerss14
8e0df0f489 Replace Crusher Glaive with Crusher in guidebook (#22085)
* Replace Crusher Glaive icon with Normal Crusher on Salvage guidebook

* minor text change
2023-12-16 19:13:04 +01:00
M3739
6c0d522912 Guidebook entry for Cyborgs (#21832)
* Work for today, base work done for guidebook entries, try to fix parsing error for document.

* Finished Cyborg entry, fixed locale.

* Minor corrections.

* Final revision.

* Minor grammatical correction.

* Another minor grammatical correction.

* Grammatical corrections, along with further clarification.

* Apply suggestions from code review

Proofread and revision from EmoGarbage404, which I am thankful.

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Added GuideHelpComponent linking to cyborg guidebook entry to related prototypes. Corrected endoskeleton prototype's GuideHelpComponent. Added text link in robotics guidebook entry to the cyborg guidebook entry.

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-12-02 20:22:08 +01:00
end
5b0428742f fix singularity guidebook error (#21709) 2023-11-19 22:22:00 +01: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
efe3d0dbdd Prober and Drainer crafting + Prober sounds (#398)
* Prober Drainer graph and sounds

* normality crystal

I knew I was missing something

* Normality = 5 ectoplasm, drainer = 1 crystal

* Fix oopsy

* Psionic and Golemancy guidebooks

* I swear yml sometimes

* Change recipe to fit guidebook

* Update epistemics.yml

* add comment

---------

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-11-11 11:39:37 -06:00
Fluffiest Floofers
85d8d4106b Reverse Engineering guidebook + fixes (#408)
* Reverse engineering guidebook

* Make it so upgrades actually increase scan bonus

* i love when uncommenting creates spaces

* the code checks for capacitor

* Revert capacitor changes and change code

* fix the guidebook still using scanning module

* woops
2023-11-07 13:31:01 -06:00
Colin-Tel
623fb89b25 Add the Salvage Expedition board to research (#411)
* Expedition board is now researchable

Adds the Salvage Expedition Computer board recipe
Adds the board recipe to the Salvage Equipment research

* Update Rules.txt

Updated the rules since expeditions are coming back.
2023-11-07 07:36:49 -06:00
Colin-Tel
cebf9c9853 Update Rules.txt (#355) 2023-10-29 12:36:45 -05:00
Fluffiest Floofers
52c7869d97 lo and mysta (#265) 2023-10-24 00:04:36 +00:00
Fluffiest Floofers
2c73e0c8aa Rename Science and Cargo ID (#211)
* We are the science team

* I feel like i'm missing something

* Yup this is also visible to the player
2023-10-22 01:24:48 +02:00
Nemanja
a30e3ae432 technology auto guidebook (#21029)
* technology auto guidebook

* boo-womp

* boo-womp II
2023-10-20 15:30:17 +02:00
Fluffiest Floofers
6fcebdbac3 rename (#187) 2023-10-18 23:20:12 +02:00
coolmankid12345
7a3d845e12 Add guidebook for revolutionaries (#20957) 2023-10-14 22:05:44 +02:00
Colin-Tel
0e20f680bc Merge pull request #132 from DebugOk/merge-master-08/10
Sync master up to 8/10
2023-10-09 17:08:51 -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
Colin-Tel
b26c021c2b Update Rules.txt (#135)
📖
2023-10-09 13:02:51 -05:00
deltanedas
f583305000 Add rolling pins for flattening dough (#20624) 2023-10-08 19:53:53 +02: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
Warentan
eed11f2456 Update atmos and AME guidebook (#20379) 2023-09-27 21:59:12 +02:00
metalgearsloth
a7208af7d6 Add ore bag area pickups (#19358) 2023-09-27 21:59:12 +02:00
eclips_e
245eb093a1 Hardbombs & Defusables (#15380)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Just-a-Unity-Dev <just-a-unity-dev@users.noreply.github.com>
Co-authored-by: LankLTE <twlowe06@gmail.com>
Co-authored-by: LankLTE <135308300+LankLTE@users.noreply.github.com>
2023-09-27 21:59:12 +02: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
Debug
3c6f00b3bc Update basic stuff (#1)
* Copy main README

* Copy ServerInfo

* Copy Logo

* Copy Manifest
2023-09-10 23:54:12 +02:00
deltanedas
24810d916b ninja 2 electric boogaloo (#15534)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:20:27 +10:00
chromiumboy
05e9d2e33a Plasma fueled radiation collectors (#19598)
* Fixes issue with solution regenerators

* Update Solution.cs

Removed excess whitespace

* Undid file scoping to make this easier to review

* Initial prototype

* Adjusted coefficients

* Removed unintentional changes from another PR

* Undid unintentional change

* Undid unintentional change

* Added temperature modifier to power production

* Guidebook entry and radiation collector low pressure warning

* Reviewer requested changes
2023-09-04 16:11:57 +03:00
Chief-Engineer
d1d9e4dcc3 Revolutionary rules (#19654)
* modify rules for revolutionaries

* update recent changes for rules
2023-08-31 02:30:08 -05:00
liltenhead
dc479ba809 Update Traitor Guide (#19648) 2023-08-30 21:07:18 -04:00
Pieter-Jan Briers
bf16698efa Portable Generator Rework (#19302) 2023-08-25 11:40:42 -07:00
/ʊniɹɑː/
f2954fff96 allow richtext on papers + edit premade documents (#18154) 2023-08-22 21:50:03 +10:00
Albert Snow
226374ae90 Update atmospherics guidebook (#19273) 2023-08-17 21:55:08 -07:00
Chief-Engineer
89b3231de0 update rules for borgs (#19248)
* update rules for borgs

* add recent changes
2023-08-17 05:49:01 -05:00