juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,332 Commits 57 Branches 0 Tags
cc710fa46b7c7f85f7cf3151cbdaf9c4022eede1
Commit Graph

94 Commits

Author SHA1 Message Date
LankLTE
0f6808e16a Remove the shock collar. (#31229) 
* Remove the shock collar.

* add migration
 2024-08-21 13:56:56 -04:00
Nemanja
476c7751c4 Recycler Overhaul (#30802) 
* Recycler overhaul

* remove
 2024-08-18 21:39:00 -06:00
potato1234_x
1952618203 Tea Plant and Blue Pumpkin (#25092) 
* tea plant, blumpkin

* fix linter

* fix tests pls

* bloompkin

* forgor rsi

* work please

* WORK PLEASE

* migration of the blumpkins

* it is now glumpkin

* lowercase

* uppercase

* adjust values and fix blorbo

wtf when did blumpkin donut turn into blorbo donut what

* fix test

* update

* fix stupid mistake

* Update meta.json

* totally not a webedit

* not a webedit 2

* nitpicks
 2024-08-18 16:28:18 -06:00
Ed
e659eb992f Custom Taco & Kebabs - FoodSequence 2 (#30905) 
* control layer ordering

* sprite update

* taco!

* taco naming gen

* fix separator naming

* some proto fixes

* default naming separation

* fix taco naming

* rat update

* hamsterburger

* organs taco

* remove from spawners

* fixes

* fix separators and lemons

* Update food-sequence.ftl

* randomization offset

* fix

* kebabs refactor

* fix

* skewer weapon

* Update food_single.yml

* Update migration.yml

* suppermatter

* hamlet centered

* hamsburger

* Update dead-0.png

* 20 -> 4 burger layers max

* Update burger.yml

* canReact: false

* capfruit update

* Update burger.yml

* Update burger.yml

* Update produce.yml

* some fixes

* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* chicken

* Update food-sequence.ftl

* documentation

* fixes

* Update meat.yml

* Update meat.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-08-14 15:04:00 +02:00
Ubaser
7e17063b86 Removes variant cube migration (#30934) 
add
 2024-08-12 02:16:59 -06:00
lzk
1a672c9c6d add more logic gates prototypes for mapping (#30385) 
* Add more logic gates types for mapping

* i forgor

* me stupid

* nuh
 2024-07-30 09:55:21 -04:00
TurboTracker
2fc9a65da6 Update migration to remove maint detective armor (#30486) 
Jensen migration
 2024-07-29 23:41:52 -07:00
Nemanja
13bec7a0e9 Sign Resprite (#29806) 
* Redone signage

* Signs

* ok this thing now

* alright ig?

* big data

* cryo sign

* new sign
 2024-07-17 14:35:18 +10:00
Nemanja
0e9ed36b85 Intercom buffs and fixes (#29580) 
* Intercom buffs and fixes

* remove unused bui state

* mild sec intercom buff

* reinforce sec intercoms
 2024-07-08 00:19:10 +10:00
KonstantinAngelov
64192b3506 CookBook name,id and description changed to not be "meta" (#29467) 
* CookBook name,id and description changed

* Id isues with CookBook fixed

* Maps not added
 2024-06-27 11:11:33 -04:00
lzk
325ab97a7d Prying reinforced tile now will give you back metal rod (#29084) 
* Reinforced tile can we welded back into metal rod

* more changes

* weh

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-06-23 01:47:02 +10:00
Flareguy
4cf60f805e Security Resprite (#29082) 
* security resprite

* hos cap fix

* i forgor

* further fixes

* my furniture is broken

* fedora update
 2024-06-18 22:04:03 -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
Velcroboy
98ab251f92 Remove duplicate entities (#28561) 2024-06-03 16:55:43 -04:00
Nemanja
4e09743d44 remove firefighting remote and bolting firelocks (#28330) 
remove firefighting remote
 2024-05-28 10:04:32 +10:00
lzk
c082773b5f Remove dupe closet janitor bombsuit (#28177) 
* Remove dupe closet janitor bombsuit

* Update Resources/migration.yml

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-05-22 10:59:49 -06:00
Tunguso4ka
9e8920c9aa Renamed old snake_case IDs to PascalCase IDs (#28014) 
* Renamed soda_dispenser to SodaDispenser

* oops, wrong time

* oops

* guidebook

* chem_master
 2024-05-14 19:57:42 -04:00
Plykiya
1952ae3267 Reimplement supplybots as non-vehicles (#27769) 
* Reimplement supplybots as non-vehicles

* what the hell is a container container?

* Dumpable

* let them hear supply comms

* unmigrate

* no more QM access

* Skill issue

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-05-08 10:30:03 +03:00
NotSoDana
9ca1d01218 Gildlager empty bottle fix (#27581) 
* rename goldschlager bottle

* migration

* fix rsi
 2024-05-01 11:24:05 -04:00
MilenVolf
974129689c Glass box fixes + Construction & Stealthy deconstruction (#25365) 
* Showcase update

* Fix craft prototype. Add glass box deconstruction for stealth gameplay

* Remove duplicated tag

* Forgor

* Some cleanup

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-04-27 23:53:16 +10:00
Mr. 27
50fb91bd18 monkey reinforcement teleporters can now select between kobold or monkey with a verb (#25982) 
* inital

* Update animals.yml

* Update animals.yml

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

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

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

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

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

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

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

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

* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs

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

* selecting different role will change the description and name

* fix name

* gargh

* the review

Hello

* e

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
 2024-04-26 15:06:43 +02:00
Nemanja
735eeefa03 Migrate out rubber bullets/mags (#27329) 2024-04-26 14:22:49 +10:00
Hannah Giovanna Dawson
f059714a75 SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545) 
* SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers

Bit of a grab-bag of cleanup of Xenoarchaeology prompted by #26480.

1. Traversal distortion biases are now "up" and "down" instead of "in" and "out".
2. Node generation has been tidied up to make it a little clearer how it works.
3. Traversal Distorters have been removed from the game along with their board.
4. Traversal distortion is now done by the artifact analyzers by default.
5. Some loc strings have been made clearer.
6. The Abnormal Artifact Manipulation tech has been made slightly cheaper.
7. The aformentioned tech is now localized as Artifact Recycling, given all it does is unlock the crusher.
8. The Xenoarchaeology guidebook entry has been given a bit of a rewrite, putting all information into
one page and making sure to cover the basics that otherwise would require someone typing "Liltenhead
artifact tutorial" into Youtube.

* Fix references to deleted guidebook entry

* Add fancy button to console because @EmoGarbage404 asked me to

* migration comprete

* Fixed a goober comment

* maint fails to resolve conflicts: more at 11

* Resolve PR comments

* Make UI nice

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2024-04-21 12:09:26 -04:00
Gyrandola
fa5b93871f chili/chilly peppers sprite alignment fix & minor refactorization (#25971) 
* png alignment and minor refactorization

* Update migration.yml

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-04-20 12:06:48 +10:00
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