juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,226 Commits 57 Branches 0 Tags
092d858df978801add8e892f6f8fcb9729d5d2da
Commit Graph

14188 Commits

Author SHA1 Message Date
Aexxie
092d858df9 Gemini maint power (#23932) 
Connects an LV to the maints west of science, powering them.
 2024-01-11 16:18:59 -07:00
Kukutis96513
bd17444cc5 Bulk plushie lizard crate (#23927) 
* make the bulk crate order

* added space lizard plushies to bulk crate
 2024-01-11 16:18:28 -07:00
deltanedas
581c95ed72 dedicated burn and shock meds (#23941) 
* pyrazine and insuzine

* add recipes

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-01-11 16:17:23 -07:00
Aexxie
7f8dba42e3 Adds winterdrobe to cluster (#23928) 2024-01-11 16:16:46 -07:00
Arendian
506acf5096 Small clamp for fland cargo (#23947) 2024-01-11 16:15:13 -07:00
Nemanja
0126b9820d Stop the inevitability of death from misgendering you (#23949) 
Fix rotting messages and make them use pronouns
 2024-01-12 10:12:32 +11:00
Jackal298
f9f5db9357 Respite and minor changes to mercenary items (#23783) 
* Respite and minor changes to mercenary items

This is try number three, everything should be fine this time

* Fix meta

* Fix bot

* Fix bot 2

* Fix meta 2

* Fix meta 3
 2024-01-11 17:47:51 -05:00
Flareguy
79ab290444 Fix light tube broken state (#23939) 
fix light tube broken state
 2024-01-11 13:34:37 -05:00
metalgearsloth
55a60b0fca Split cargo shuttle to its own component (#23926) 
* Split cargo shuttle to its own component

If mappers want 1 morbillion of them this is easier to manage.

* balls
 2024-01-11 10:53:00 -05:00
Nemanja
1886941da6 Add doors to the station map (#23639) 
* Add doors to the navmap

* tweaksies

* gah

* draw primitive

* draw primitive? at least take me out to dinner first!

* Update Content.Client/Pinpointer/UI/NavMapControl.cs

* casualties

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-01-12 00:14:20 +11:00
Ubaser
d99c56f67d Fix tips (#23920) 2024-01-11 11:55:24 +01:00
Emisse
7be42cc97a revert core cargo shuttle for now (#23921) 
* Delete Resources/Maps/Shuttles/cargo_core.yml

* Update core.yml

* Update base.yml

* Update nanotrasen.yml
 2024-01-11 03:54:57 -07:00
Emisse
f9d53525ca crusher rebalanceing (#23916) 
* Update mining.yml

* Update mining.yml

* glaive LS is actually fine

* crusher faster than glaive

* Update mining.yml

* Update mining.yml
 2024-01-11 02:09:33 -07:00
IProduceWidgets
11bbf2b020 Uranium & AP magazine and projectile sprites (#23914) 
Add missing uranium and AP magazine and box sprite layers. Add uranium and AP projectile sprites. Fix whitelist issue that made .45 pistol mags not go in secbelt.
 2024-01-11 01:01:41 -07:00
Emisse
3b6bfde83d reach update (#23915) 
* reach update

* ape board

* Update reach.yml

* chimp + recharger

* chef vend
 2024-01-11 01:00:43 -07:00
Nemanja
b3014e6cb3 machine parts + power cell resprite (#23913) 
* machine parts + power cell resprite

* logic fix
 2024-01-10 23:06:01 -07:00
Emisse
e0af752b9c remove 1 chemist from gemini (#23909) 
Update gemini.yml
 2024-01-10 20:59:27 -07:00
Emisse
f1b90d0dec bagel update (#23905) 2024-01-10 17:14:11 -07:00
Emisse
a35c91fc76 marathon update (#23904) 2024-01-10 17:07:48 -07:00
Emisse
eee7aef63a remove ame parts from cargo (#23903) 2024-01-10 17:07:41 -07:00
Flareguy
31cc9babaa Makes lights use the "old" light fixture sprites (#23898) 
returns the ss13 light fixture sprites
 2024-01-10 17:07:14 -07:00
Emisse
c7ad10d0ad make intercoms draw above table (#23897) 
Update intercom.yml
 2024-01-11 10:05:59 +11:00
nikthechampiongr
ef132c8a7b Fix tranquiliser shells not working (#23886) 
* Fix tranquiliser darts not working

Fixes a bug introduced by 9f47079d02 which
was made to stop the fly-by fixture from triggering the system. This was
done by checking whether the fixture was hard. Apparently the
projectile's fixture is never hard as well. The change just makes it so
that check only succeeds when the fixture is a fly-by fixture.

* Remove something that I think is redundant

* Remove random using directive that somehow appeared.

* Address Review

* Adress Review 2

* Put the appropriate fixture ids
 2024-01-10 18:02:37 -05:00
lzk
1fbb63f7d3 aspid update (#23872) 
aspid

- connected missed external airlocks
- replaced water tank on hight-capacity water tank at jani room
 2024-01-10 15:42:32 -07:00
lzk
80a44a6362 bagel update (#23870) 
bagel

- connected missed external airlocks
- removed vendor mapped names
- skub
 2024-01-10 15:42:15 -07:00
luckyshotpictures
036cf42a26 Gemini Hotfix (#23869) 
hotfix hotfix hotfix
 2024-01-10 15:41:43 -07:00
lzk
e7a4c5c4fc box update (#23871) 
box

- removed mapped vendor names
- connected missed external airlocks
 2024-01-10 15:41:29 -07:00
sneb
9c294d7258 Fixed opened cargo airlock sprite (#23889) 
fix cargo door open sprite
 2024-01-10 14:12:46 -07:00
themias
1cf07fadac Fix flippo sprite layer (#23877) 2024-01-10 10:58:01 -05:00
metalgearsloth
a46f6f3f85 Fix ruins being added to station grid (#23865) 2024-01-10 23:44:09 +11:00
Ubaser
a73f3ee149 Rod/Transit Evacuation shuttle update (#23862) 
* add

* update
 2024-01-10 05:14:46 -07:00
Guillaume E
af7327e59f Show how close bodies are to rotting (#23530) 
* Show how close bodies are to rotting

When examining a dead body, you will be able to see of close
it is to rotting.

 - "It still looks fresh.", in the first third of the pre-rot period
 - "It looks ripe.", in the second third
 - "It's starting to look bad.", in the last third

This could help players prioritize medical care.

* Alter the wording of the pre-rot indicator

* Use numeric rotting stages in FTL

---------

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
 2024-01-10 23:00:21 +11:00
metalgearsloth
7fe0f14dff Enable worldgen on WD (#23861) 2024-01-10 04:45:00 -07:00
Ubaser
e91e746dd3 Moths get insect blood (#23671) 
* ya

* mothroach

* update

* fix

* fixe

* add
 2024-01-10 03:42:20 -08:00
Ubaser
e790e8fb86 Update Core (#23860) 
add
 2024-01-10 04:39:38 -07:00
Emisse
b3008ab7c8 Syndie elite uplink (#23859) 
* elite suit store

* eek

* dont drink
 2024-01-10 04:33:10 -07:00
metalgearsloth
b30afb357c Hide ruins spawns (#23857) 
* Hide ruins spawns

* Update count

* Add naming
 2024-01-10 04:15:48 -07:00
Emisse
9d52833938 marton fix arrivals (#23855) 
* marathon update

* wrong version
 2024-01-10 03:41:52 -07: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
04c9d7a5e5 gps can go inm belt (#23853) 
* Update belts.yml

* Update gps.yml

* Update tags.yml

* Update belts.yml
 2024-01-10 20:21:42 +11:00
deathride58
51a2b365cf Adds footstep sounds to tables (#23851) 
adds footstep sounds to tables
 2024-01-10 19:48:38 +11:00
Mr. 27
fcab5407d1 more tarantula changes (#23816) 
word
 2024-01-10 01:30:39 -07:00
Emisse
7cd1ed24a5 Stationstation update (#23848) 
* stationstation update

* stationstation
 2024-01-10 01:29:49 -07:00
Emisse
d85b9a5f8e aspid update (#23847) 
* aspid update

* remove free glaive
 2024-01-10 00:49:46 -07:00
Emisse
a9f8a8e6ad meta update (#23846) 2024-01-10 00:49:39 -07:00
Emisse
1018fc36b8 marathon update (#23845) 2024-01-10 00:49:31 -07:00
Emisse
9da3b70489 fland update (#23844) 2024-01-10 00:49:24 -07:00
Emisse
30186a62c4 box update (#23843) 2024-01-10 00:49:17 -07:00
Emisse
16fad79304 bagel update (#23842) 2024-01-10 00:49:10 -07:00
Carolyn3114
041ff3c06f bluespace jumper + renames old whiteship (#23841) 
* bluespace jumper + renames old whiteship

* Update Resources/Prototypes/Entities/Stations/base.yml

* Update base.yml

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
 2024-01-10 00:49:02 -07:00