Commit Graph

70 Commits

Author SHA1 Message Date
lzk
7188b509df fix bodybag id case (#26823)
* Fix body bag id

* migration
2024-04-08 10:27:26 -04:00
Ed
7464d8284c 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-01 14:00:10 -07:00
lzk
0602e64300 Add briefcase to curadrobe and lawdrobe, and some briefcases cleanup (#26527)
* Add briefcase to curadrobe and some briefcases cleanup

* also add to lawdrobe
2024-03-31 16:52:49 -04:00
lzk
55c77af33c Combine flower crown and wreath (#26605)
* Combine flower crown and wreath

* huh

* huuh :trollface:
2024-03-31 19:52:52 +11:00
lzk
d5052697aa Remake hairflowers (#25475)
* Add more lily usage (orange hairflower and flowercrown)

* comit 2

* ee

* more fixes

* w

* im stupid

* bring poppy in authodrobe

* weh

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-03-31 16:33:23 +11:00
Flareguy
1f3f1d7d97 Removes SCAF armor (#26566)
* removes scaf armor

* replace maint loot spawner spot with basic helmet
2024-03-31 13:01:28 +11:00
deltanedas
5ac88d9b27 remove rped (#26316)
* remove rped

* trol

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-21 20:20:26 -04:00
Mr. 27
3cb1c585c5 Pipebombs and IED rework (#25705)
* inital

* 2-9

* add crafting function, rename ied to fire bomb

* add firebomb ignition

* fikss

* change damage values

* add note

* fix tests i think

* ok

* good

* Review

* warning

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-03-14 15:27:08 +11:00
LankLTE
88d424e877 Return Detective to Security (#25986)
* Revert "detective patch (#24739)"

This reverts commit 8ef69ff2e1.

* Revert "Detectives gain independency (#23114)"

This reverts commit 807f5facbb.
2024-03-11 14:33:08 +11:00
nikthechampiongr
dbc27b57c8 Remove unecessary easy pry prototypes (#25893)
* Remove unecessary prototypes

* Put unecessary prototypes in migration.yml
2024-03-09 12:45:35 +11:00
Velcroboy
2efad4f3c5 Cleans up base crates for mapping clarity (#25618)
* Cleans up base crates for mapping clarity

* migration

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-02-26 15:56:41 -07:00
metalgearsloth
d0df5ed5fa Revert "Remove handheld crew monitor (#24761)" (#25439)
* Revert "Remove handheld crew monitor (#24761)"

This reverts commit bbc6d29d21.

# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Research/biochemical.yml
#	Resources/migration.yml

* changes

* zeweh

* dergs
2024-02-22 22:00:35 +11:00
metalgearsloth
7c7bca1d32 Remove obs kit (#24768)
Syndi handheld crew monitor got removed. Give them their own content instead of reskinning NT stuff.
2024-02-22 22:00:25 +11:00
lzk
326b890318 Little rework of existing yaml flatpacks (#24814)
* Little rework of existing yaml flatpacks

* comit 2

* 55

* 66

* 77

* WRAAAA

* done mr sloth

* Update flatpack.yml

* fix??
2024-02-21 21:44:22 -05:00
Debug
8c6a8c3c5c Remove drones, fix InnateToolSystem (#25372)
* Fix drones

* They dont need a full bloodstream

* Incorrect indentation

* Nuke drones

* Fix ClothingHeadHatCatEars

* Remove last mention of drones

* Implement requested changes
2024-02-20 23:23:04 -07:00
SlamBamActionman
e36844de47 Remove gondola donkpocket & change berry box description (#24655)
* Remove gondola & change berry box description

* Removed map gondolas

* Revert "Removed map gondolas"

This reverts commit 42fcfb85f16e778df135d2a68b9cea08d794e28b.

* Updated migration.yml to remove FoodBoxDonkpocketGondola

* Replacing is better than removing

* Changed description slightly
2024-02-02 09:27:52 +11:00
lzk
e5bf4979ae Remove yellow oxygen tank (#24374)
* Remove yellow oxygen tank

* forgor

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-02-01 17:53:33 +11:00
metalgearsloth
d2f20d8955 Remove vehicles (#24681)
* Remove wheelchairs

Vehicle code is dogwater and wheelchairs just keeps exposing edgecases. If someone wants it brought it back they can do vehicle refactor.

* Also this one

* Remove vehicles

* goodbye vehicles

* Remove this check

* sasd

* Cronch

* Add sprites back

* jani
2024-02-01 11:33:10 +11:00
metalgearsloth
bbc6d29d21 Remove handheld crew monitor (#24761)
* Remove handheld crew monitor

- It's supposed to be a CMO computer.
- It's getting powercrept and added everywhere.

* These too

* And this
2024-01-31 22:23:49 +11:00
Ubaser
807f5facbb Detectives gain independency (#23114)
* add

* fix

* civilian-ise

* update headset name

* aspid det door

* add
2024-01-29 17:45:26 +11:00
Errant
efdc6f8d4c Beacon localization (#24138)
* localize beacons

* No not like that

* Tesla beacons were already depreciated, time to give the reaper their due

* Entity name fallback

* The real treasure was the far easier solution we missed along the way

* weh

* Shared mapinit

* fix RT version

* a single line break
2024-01-20 19:59:41 +11:00
Ubaser
08c2cac96d Paramedic void suit is now a soft suit. (#24229)
add
2024-01-18 10:26:59 -05:00
lzk
a2c3ec6c47 Fix some closets being not deconstructable (#23054)
* sss

* price change
2024-01-16 12:23:26 +03:00
Vasilis
7f766ead2d Remove spacepens (#23970) 2024-01-13 21:20:11 +01:00
Emisse
cfeb431326 Rad suit swag and toggleable now (#23854)
* troll

* Update hoods.yml

* Update hoods.yml

* Update suits.yml

* Update engineer.yml

* Update migration.yml

* Update emergency.yml

* forgor

* Update Resources/Prototypes/Entities/Clothing/Head/hoods.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-01-10 20:54:29 +11:00
Emisse
df1d8c36e5 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
2024-01-08 16:24:36 -07:00
Ubaser
2cf4ba8a47 Dehydrated cube box overhaul (#23685)
* add

* yes

* fix
2024-01-07 23:27:40 -07:00
Ubaser
172fcaf2d4 Rename Goldschläger to Gildlager (#23223)
* add

* fix

* catalog

* migration

* conflicts..

* uh

* test

* m

* fix fr

* line?

* beg

* suffering

* um

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-01-07 02:34:15 +11:00
lzk
77b477f29b Rename SpawnPointAssistant to SpawnPointPassenger (#23222)
good commit
2023-12-31 12:13:11 -05:00
Nemanja
f7a923624a Fold cosmetic sunglasses into regular sunglasses (#23232)
Fold cosmetic sunglasses into regular sunglasses.
2023-12-30 15:30:21 -07:00
Nemanja
99d78c4b97 Station beacons (#23136)
* Station beacons

* crate

* remove navmap from warp points

* ack

* oh damn

* okay emisser
2023-12-28 17:02:21 -07:00
Kevin Zheng
2189c6feb3 Add migration for MiasmaCanister (#22830) 2023-12-21 15:52:53 -07:00
Velcroboy
a4ed13af4a Remove duplicate milks (#22721)
* Remove duplicate milks

* Migration

* Inventories

* Guidebook

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-18 15:51:39 -07:00
Emisse
6419f3d5d9 smartfridge semi functional (#22443)
* smartfridge

* leftovers from when it was powered

* real
2023-12-13 01:19:40 -07:00
Errant
21be01acdf Blood-red medic armor ID change (#22422)
* Rename blood-red medic hardsuit prototype

* Update guidebook

* Migration
2023-12-12 17:02:29 -07:00
Nemanja
66a1bb7a9f Remove senior roles (#22303) 2023-12-12 13:37:05 +11:00
Pieter-Jan Briers
bf16698efa Portable Generator Rework (#19302) 2023-08-25 11:40:42 -07:00
c4llv07e
d7eb3bfb44 Pipe painter (now with airlock painter) (#19031)
* Add a pipe painting function to the airlock painter

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Rename engineer painter to omnipainter

Signed-off-by: c4llv07e <kseandi@gmail.com>

* review changes

Signed-off-by: c4llv07e <kseandi@gmail.com>

* fix migration duplicate

Signed-off-by: c4llv07e <kseandi@gmail.com>

---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
2023-08-14 15:06:21 +03:00
Leon Friedrich
5ba1a41742 Trim migration.yml (#19081) 2023-08-14 01:44:34 -06:00
DrSmugleaf
2b1494419d Remove invalid non-entity rename migration (#19068) 2023-08-13 03:07:05 -07:00
Emisse
6fd3d3ac92 Update migration.yml (#19063) 2023-08-13 02:16:40 -06:00
Errant
bfa6b3bc3d Light laser (#18950)
* Light laser

* Migration
2023-08-13 01:16:25 -06:00
LankLTE
6e192341f2 Removes Spaceacillin (#18979)
* Removes spaceacillin

* this game blows
2023-08-10 23:04:49 -04:00
Vordenburg
eb130b3eae Remove WindowTintedDirectional (#18886) 2023-08-10 10:44:41 -07:00
Flareguy
45c69f127d Replaces CEV-Eris style rocks with SS13 ones, adds Ironrock (#18898)
* replaces CEV=eris rock sprites with /tg/ ones, removes mountainrock, adds ironrock

* phew... good thing i'm purple

* Update Resources/Prototypes/Entities/Structures/Walls/asteroid.yml

Co-authored-by: Vordenburg <114301317+Vordenburg@users.noreply.github.com>

---------

Co-authored-by: Vordenburg <114301317+Vordenburg@users.noreply.github.com>
2023-08-08 22:00:27 -06:00
Vordenburg
bd13a4b357 Cull high-velocity ammo (#18656) 2023-08-08 11:08:53 +10:00
Vordenburg
e44c235396 [CHANGES PROTOTYPE ID] Clean up lantern (#18526)
- Fix the un-cased proto ID
- Remove the give-away name and description from the Syndicate item
- Remove the same-value inherited fields from PointLight
- Better uplink catalog description
2023-08-03 01:29:05 -06:00
Leon Friedrich
3f2144f3cd Fix missing device links in maps (#18273) 2023-07-25 12:16:51 +10:00
Leon Friedrich
d7a6baf0c1 Undo migration.yml trimming. (#18245) 2023-07-24 10:54:02 +10:00
Leon Friedrich
5172188a48 Migrate machine linking and resave all maps (#18243) 2023-07-24 10:35:09 +10:00