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

12134 Commits

Author SHA1 Message Date
Alekshhh
2b7cc01e7f Capgun Ammo Recolor (#17617) 
* he's got a gun

* gung

* oops
 2023-06-24 13:56:42 -06:00
OctoRocket
4c15474619 [Sprite] Fix an error in the flannel sprite. (#17618) 2023-06-24 13:56:31 -06:00
PJBot
aea3bf9372 Automatic changelog update 2023-06-24 14:10:28 -04:00
0x6273
fcb6516cee Hotplate overhaul (#17586) 
* Hotplate overhaul

- Beakers are now placed on top of the hotplate instead of itemslot.
- Hotplate LED now only lights up if it's heating something.
- More comments/xmldoc.
- Some other minor tweaks.

* Actually remove the beaker slot
 2023-06-24 14:09:24 -04:00
PJBot
084cb7b750 Automatic changelog update 2023-06-24 08:12:51 -04:00
LankLTE
de07c2b599 Adds Health Analyzer to Chem PDA (#17603) 2023-06-24 22:11:47 +10:00
Nemanja
694ba695b0 fix galaxythistle bounty locale (#17594) 2023-06-24 22:08:47 +10:00
HighTechPuddle
4ae80fb276 Issue#15607-Audio/Ambience (#17327) 2023-06-24 22:06:33 +10:00
PJBot
2b7a30403d Automatic changelog update 2023-06-24 08:04:12 -04:00
Nim
46e96239d3 Seeds of fly agarics Amanita EMAG (#17598) 2023-06-24 22:03:08 +10:00
PJBot
4d493ba674 Automatic changelog update 2023-06-24 08:01:47 -04:00
Nemanja
489077868c Artifexium (#17604) 2023-06-24 22:00:42 +10:00
lzk
5d126d7774 Remove some dupe prototype components (#17551) 2023-06-24 21:59:20 +10:00
PJBot
64a5f2e536 Automatic changelog update 2023-06-24 01:33:19 -04:00
crazybrain23
032399c599 Change QM's supervisor to Captain (#17605) 
* QM works for Cap

* Cargo department works for QM
 2023-06-24 00:32:15 -05:00
PJBot
c64cce40ac Automatic changelog update 2023-06-24 00:21:30 -04:00
Nemanja
bdbd01fbaf node scanner resprite (#17609) 2023-06-24 14:20:26 +10:00
PJBot
62dc357d1e Automatic changelog update 2023-06-23 13:50:24 -04:00
CrigCrag
9792116c50 janitorial trolley speed buff (#17524) 
* Update janitor.yml

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Update janitor.yml

friction gaming

* tweak cart friction

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

* comment

---------

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
 2023-06-23 12:49:19 -05:00
PJBot
6d52ca1e16 Automatic changelog update 2023-06-23 08:25:45 -04:00
lzk
5e83956d15 Fix jumpskirt parents (#17552) 2023-06-23 22:24:38 +10:00
FluidRock
17254eca15 Replace flare ammo with incendiary ammo in Zombie bundle (#17558) 2023-06-23 22:24:03 +10:00
lzk
6bfccca81b encryption-key-component.ftl locale update (#17557) 2023-06-23 22:23:47 +10:00
Justin Trotter
ecf92066ab make mining drills weldable and have struct damage (#17576) 2023-06-23 22:23:20 +10:00
PJBot
7bb0f36bf4 Automatic changelog update 2023-06-23 00:32:58 -04:00
Nemanja
476f7800c8 22 New Cargo Bounties (#17582) 2023-06-23 14:31:53 +10:00
Emisse
95d6f828e0 omega cargo bounty (#17571) 2023-06-22 15:26:42 -06:00
Emisse
5641803089 meta cargo bounty (#17570) 2023-06-22 15:26:19 -06:00
Emisse
501b14a1d4 marathon cargo bounty (#17569) 2023-06-22 15:26:06 -06:00
Emisse
6cd36ce67b fland cargo bounty (#17568) 2023-06-22 15:25:59 -06:00
Emisse
4c474c5094 box cargo bounty (#17567) 2023-06-22 15:25:51 -06:00
Emisse
384da9b9b0 bagel cargo bounty (#17566) 2023-06-22 15:25:45 -06:00
PJBot
e3e0de6613 Automatic changelog update 2023-06-22 15:49:42 -04:00
Alekshhh
26e5249028 Dwarf Accent Fix (#17561) 2023-06-22 14:48:38 -05:00
PJBot
67f4932fc7 Automatic changelog update 2023-06-22 07:50:38 -04:00
Nemanja
7ab5127286 Cargo Bounties (#17344) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-06-22 21:49:33 +10:00
PJBot
ad89184d70 Automatic changelog update 2023-06-22 00:10:02 -04:00
Nim
4ed11ca73b Energy Shield (#16996) 
* energy shield

* description edits

* shields protect

* small correction

* say no to asteroid bees

* fix

* BlockModifier

* fix

* tweak

* tweak

* ops

* fix

* Update RobustToolbox

* Revert "Update RobustToolbox"

This reverts commit 55be82fe537490367e0afaf86365b0e274e6597e.

* formatting
 2023-06-22 00:08:58 -04:00
PJBot
7a338265ad Automatic changelog update 2023-06-21 21:01:02 -04:00
PJBot
6e829066a7 Automatic changelog update 2023-06-21 17:46:21 -04:00
Nemanja
966345a4e3 Add missing border colors on PDAs (#17541) 2023-06-21 15:45:17 -06:00
PJBot
729eeeee6e Automatic changelog update 2023-06-21 16:36:25 -04:00
liltenhead
a20fa2a233 modify medkit fill (#17527) 2023-06-21 15:35:20 -05:00
lzk
53bd13ffd5 animals.yml pets.yml cleaning (#17533) 
* Update pets.yml

* Update animals.yml

* oopsie
 2023-06-21 13:54:20 -06:00
Emisse
96c414a1f7 Omega (#17539) 
* omega update

* omega update
 2023-06-21 13:52:52 -06:00
Emisse
881902b228 bagel update (#17537) 2023-06-21 13:52:06 -06:00
Emisse
2ece4e454e fland update (#17536) 2023-06-21 13:51:58 -06:00
Emisse
742bc77822 meta update (#17535) 2023-06-21 13:45:40 -06:00
Emisse
779db9ffd9 marathon update (#17534) 
* marathon update

* marathon update
 2023-06-21 13:41:14 -06:00
lzk
3f946bb1e5 secure windoor id standartization (#17531) 
* Update windoor.yml

* comit
 2023-06-21 12:44:17 -06:00