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

4824 Commits

Author SHA1 Message Date
Nim
9797a0d42e ert and death squad gas mask (#17444) 2023-06-18 17:14:31 -06:00
Pieter-Jan Briers
c8930106b6 CE belt in locker again, CE doesn't spawn with it. (#17445) 
Better way to do #17430

Yes I know this means the CE spawns with a regular filled toolbelt they'll just throw away at round start. Oh well.
 2023-06-18 17:13:53 -06:00
Vordenburg
7ea7e3f49d Set marker drawdepth to Overdoors (#17438) 2023-06-18 16:38:27 -06:00
Nemanja
8411739e00 Fix secfab being able to print protolathe items (#17443) 2023-06-18 16:35:19 -06:00
Nemanja
3975578e4e Arsenal tech discipline (#17400) 2023-06-18 15:56:49 -06:00
Chase Maguire
8cd6067d49 Changing default fuel consumption for weldable components, and increasing non-default instances by two units of fuel (#17350) 2023-06-18 15:56:09 -06:00
Chief-Engineer
7c432b09e1 update command role requirements (#17366) 
* update role requirements

* add 6 hr overall requirement for mime

I keep seeing mimes that don't know the controls, specifically how to use other chat channels, like emoting.

* fix wrong prototype

* split to part 2

* fix engi belts

this is a pain
 2023-06-18 15:53:05 -06:00
FacePluslll
422a84e029 Adds Double bladed Esword (#17227) 
* Changed Energy Sword system to allow Wieldable eswords

Needed to add conditions to allow the wielding system to handle the esword if the component existed in the entity. The normal eswords work just fine still.

* Adds sprites for double bladed esword

* added double bladed esword to yml

* Add double bladed esword to uplink catalog

* fixed sprites on right handed wielding

* decresed speed a little and added a wielding time

* Reduced damage

* Damage change

* Balence change

* edited attack speed and heavy windup

* fixed readability issue and removed unwanted brackets

* reflectProp to .75

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* wieldTime to 0

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* litDisarmMalus to .7

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* changed heat and slash damage to 9 and structural damage to 20

* changed uplink desc

---------

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
 2023-06-18 15:35:23 -04:00
ShadowCommander
dd7032a860 Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Vordenburg
8a943fb374 Make suit storage units anchored, heavier, thicker (#17433) 2023-06-18 12:25:01 -06:00
Leon Friedrich
b03d9a90ab Add support for client-side replays (#17168) 2023-06-19 03:23:31 +10:00
Nemanja
1646f4c405 Remove spare CE belt (#17430) 2023-06-18 12:06:09 -05:00
Nemanja
0d0bef455e artifact resprite (#17417) 2023-06-19 01:02:27 +10:00
Nemanja
0b5ccf3395 Artifact Fragments (#17420) 2023-06-19 00:56:45 +10:00
Alekshhh
291ae0bcd2 Dwarf Accent Expansion (#17411) 2023-06-18 02:12:09 -07:00
Nemanja
ac9d6c94a0 Add bananium ore to expedition loot (#17421) 2023-06-18 17:11:29 +10:00
Chief-Engineer
f6d658d40b remove zombie bundle from nukie uplink (#17418) 2023-06-18 13:23:42 +10:00
lzk
b075912b12 slimes.yml cleaning (#17406) 
* Update slimes.yml

* Update slimes.yml
 2023-06-17 20:32:48 -06:00
Nails+Tape
bb45db7151 cargo guidebook (#17342) 
* adds a guidebook entry explaining playable species

* adds a cargo guidebook entry

* Update guides.ftl

* Update shiftandcrew.yml

* Update ss14.yml

* Delete Species.xml

* Update Resources/ServerInfo/Guidebook/Cargo.xml

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

* Update Resources/ServerInfo/Guidebook/Cargo.xml

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

* Update Resources/ServerInfo/Guidebook/Cargo.xml

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

* Update Resources/ServerInfo/Guidebook/Cargo.xml

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

* Update Resources/ServerInfo/Guidebook/Cargo.xml

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

* Update Resources/ServerInfo/Guidebook/Cargo.xml

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

* Update Resources/ServerInfo/Guidebook/Cargo.xml

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

* Update Resources/ServerInfo/Guidebook/Cargo.xml

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

---------

Co-authored-by: OttoMaticode <124523848+OttoMaticode@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2023-06-17 20:31:49 -06:00
Sir Winters
6e924ea568 Pill Renames, add Cryo Bottle and Derma Pill, Burn kit Update (#17414) 
Co-authored-by: Owai-Seek <>
 2023-06-17 14:47:56 -05:00
Sigil
70248638e3 Fixed armour for biosuits and winter coats. (#17402) 
Co-authored-by: Sigil <noreply>
 2023-06-17 03:55:15 -06:00
metalgearsloth
b67209cb24 Revert "Door opening tweaks" (#17395) 2023-06-17 12:09:49 +10:00
Slava0135
8ed4dcf0fb shield values examine (#17245) 2023-06-17 12:07:58 +10:00
deltanedas
a3c37edd69 use parts crates for rewards, show rewards in ui (#17374) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-17 12:00:54 +10:00
Nemanja
eb114677ad move hamtr to civilian services tech (#17393) 2023-06-17 11:59:53 +10:00
Artjom
cae037d8a8 Zooming for everyone with keyboard keys (#16605) 2023-06-17 09:22:21 +10:00
brainfood1183
9bdaca579e ClownHardsuit Fix (#17386) 
* ClownHardsuit Fix

* fix for monkey template
 2023-06-16 12:45:28 -06:00
deltanedas
41fae6e9cd expedition air mod (#17369) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-16 15:25:25 +10:00
deltanedas
b9f24b2681 expedition rewards (#16972) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-06-16 15:19:02 +10:00
metalgearsloth
f7e4a69b65 Move PKA to a tech (#17043) 2023-06-16 13:56:59 +10:00
Nemanja
39a42559ac Ice anomaly buff (anti-box maneuvers) (#17293) 2023-06-16 10:52:49 +10:00
Kevin Zheng
704b908f73 Give female dwarves female laughs (#17362) 2023-06-15 13:19:25 -06:00
Vordenburg
f8888b0960 Allow specific entities to bypass DoAfter delays (#17349) 
* Allow specific entities to bypass DoAfter delays

This adds the InstantDoAfters tag to the admin ghost for mappers.

* Add specific player prototype for InteractionTest
 2023-06-15 13:18:38 -06:00
deltanedas
6ce6aa117f make mice not eat uranium bananium and pills (#17110) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-06-15 22:35:11 +10:00
Nemanja
d86effe630 Fix foam artifacts (#17332) 2023-06-15 21:26:10 +10:00
Slava0135
34bdb773f9 Mass hallucinations event (#17321) 
* paracusia component auto comp state

* it works

* rule component config
 2023-06-15 00:45:50 -06:00
Nemanja
d0195fe2b5 fix bluespace syringe test fails (#17347) 2023-06-15 15:16:00 +10:00
deltanedas
f5837f36cf give shuttle airlocks a wire layout (#17318) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-15 13:37:58 +10:00
end
a27bd8d6b2 In game guide books (#17304) 2023-06-15 13:36:15 +10:00
Nemanja
fa23d57fd8 Remove cloning tech, add bluespace chemistry tech (#17345) 2023-06-14 21:11:11 -06:00
brainfood1183
4322faf5c9 Behonker and Clown Spider (ready for merge) (#16678) 2023-06-15 12:47:36 +10:00
SonicHDC
7c609c913e Dumplings (#16966) 2023-06-15 12:45:30 +10:00
Slava0135
3af05a6606 allow grilles to be placed on lattice (#17073) 
* allow grilles to be placed on lattice

* Revert "allow grilles to be placed on lattice"

This reverts commit 5c536686cdcd85d49681f934d9abaf69076e2bc2.

* allow grilles to be placed on lattice (fixed)

* file namespace
 2023-06-14 20:25:29 -06:00
metalgearsloth
a83b03cfbe Fix cables getting 1 morbillion serializations (#17201) 2023-06-15 12:21:19 +10:00
MisterMecky
c63ede2524 Condiment bottle tweaks (#17132) 
* basefoodcondimentbottle tweaks

* move to drinkscondiments, inherit from drinksbase

* Revert "move to drinkscondiments, inherit from drinksbase"

This reverts commit a54604de41d124e80238340e8296cc6960d8fbc0.

* oh boy here I go overcomplicating stuff again
 2023-06-14 20:18:38 -06:00
OctoRocket
780d52514f [Add] Adds pirate accent trait (#17258) 2023-06-14 20:17:39 -06:00
0x6273
f30e83849c Add network configurator to non-engi utility belt fill (#17250) 
* Add network configurator to utility belt fill

* Empty commit to rerun tests
 2023-06-14 20:16:11 -06:00
Flareguy
8dae049ed7 EVA suit resprite (+ new fluff hardsuit) (#17268) 
* eva suit resprite

* speed bump

* yaml linter fix
 2023-06-14 20:15:22 -06:00
lzk
93cbc78cab Update departments.yml (#17272) 2023-06-14 20:13:25 -06:00
deltanedas
4359729387 robust harvest 1984 (#17331) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-14 20:13:05 -06:00