tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,496 Commits 3 Branches 5 Tags
d71b88a747e20f90b07f7e40437e0bbd4435e15c
Commit Graph

25496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
metalgearsloth
abc5094a16 NewsSystem fixes (#23969) 2024-01-12 01:04:55 -07:00
KittenColony
0c045f815f Fixed Lizard swipe (#23953) 
* made unarmed lizard / spider melees representative

* Revert Arachnids
 2024-01-12 01:03:30 -07:00
Tayrtahn
b8de514237 Cuttable speaker wire for vending machines (#23873) 
Implement SpeechWireAction
 2024-01-12 01:03:02 -07:00
Aexxie
b9f694ea59 Adds the "advanced" color palette (#23960) 2024-01-12 01:00:43 -07:00
Aexxie
1b8e536848 Greyscale decal tweaks + additions (#23961) 
* "whitescales" every marking

* adds greyscale wooden trims

* Texturizes steel tile overlays

* Texturizes the rest

* Adds yaml for the greyscale trims (whoops)
 2024-01-12 01:00:22 -07:00
icekot8
6820cff4f5 new chemical-Necrosol (#23850) 
* rollback

* dumb fix
 2024-01-12 00:59:21 -07:00
Jackal298
996eba6bc6 Minor change to vending machine inventory (#23967) 2024-01-12 00:58:34 -07:00
Emisse
e93231ebaa death squad armor tweaks (#23965) 
* death squad resprite

* fix boote
 2024-01-12 00:58:08 -07:00
Justin Pfeifler
26c1a78186 Update Blood Red Phone Sprite (#23964) 
* Add new phone sprite

* Update copyright attribution
 2024-01-12 00:42:49 -07:00
Justin Pfeifler
43090844cd Fix Floodlight Collision (#23966) 
Update floodlight mask and layer
 2024-01-12 00:42:43 -07:00
Emisse
2d78e0fb3a sus attributions (#23962) 2024-01-11 21:16:53 -08:00
Flareguy
8a7ab61522 Ports some /tg/ + /vg/ space ambience (#23910) 
* ports some tg + vg space ambience, removes all but 1 of the old space ambience music

* add back starlight and drifting
 2024-01-11 20:53:58 -08:00
metalgearsloth
4585589596 Update submodule to 204.1.0 (#23959) 2024-01-12 13:05:00 +11:00
Alzore
5dd48f3dc0 Tesla Artifact Effect (#23958) 
EffectTesla
 2024-01-11 20:41:44 -05:00
Pieter-Jan Briers
e665c2487e Use item status extension method (#23884) 
Just removes some lines of code.
 2024-01-11 19:14:13 -05:00
Alekshhh
e2dd30f640 New Lobbyscreen Art (#23943) 
sos
 2024-01-11 16:28:13 -07:00
themias
8bba4b852b Headphones can be turned on (#23882) 
Toggle headphones
 2024-01-11 16:25:27 -07:00
deltanedas
faf4f503a7 atlas update (#23938) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-01-11 16:24:39 -07:00
icekot8
3d9a6f57ac medsec hud is no longer a filler (#23934) 
* medsec hud

* medsec hud

* fix
 2024-01-11 16:22:42 -07:00
Jackal298
13c91c405c (Add) black cap and some contraband (#23933) 
* Add black cap and some contraband

* Bot fix

* bot fix 2

* Price increases
 2024-01-11 16:19:58 -07:00
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
themias
25c477a642 Fix clumsy defib debug assert (#23930) 
* Fix clumsy defib debug assert

* don't need to specify null
 2024-01-11 16:58:25 -05:00
Trevor Day
cc823e24e9 Bluespace Anomaly Admin Logs (#23942) 
Add bluespace anomaly teleportation logs.
 2024-01-11 16:56:06 -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
mr-bo-jangles
064d52db41 Optimise the puddle system to reach an equilibrium quickly. (#23776) 
* Optimise the puddle system to reach an equilibrium quickly.

* Remove use of Linq
Try to be more efficient with Tuples

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-01-12 00:22:56 +11: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
metalgearsloth
801f141c6a Only hide ruins labels (#23925) 2024-01-11 05:56:07 -07: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
metalgearsloth
34d2330604 Throttle MagicMirror do_afters (#23867) 
Doesn't fix the gross network spam but that's for later.
 2024-01-10 17:08:42 -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
Pieter-Jan Briers
a39999fb9c Fix admin log key order. (#23052) 
The keys for admin logs were set as (log_id, round_id). This made no sense because logs are usually accessed per round.
 2024-01-11 01:03:25 +01: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