kevinz000
|
00a753d632
|
Merge pull request #9817 from Ghommie/Ghommie-cit357
Fixing a keybinding issue.
|
2021-01-04 01:49:46 -03:00 |
|
Lin
|
6810aa0a94
|
Merge pull request #10214 from Ghommie/Ghommie-cit472
Brings carbon action intent hotkeys down to living.
|
2021-01-04 01:31:40 -03:00 |
|
kevinz000
|
ca55e5f8b0
|
Merge pull request #9804 from Ghommie/Ghommie-cit351
Unmodularize keybindings.
|
2021-01-04 01:31:17 -03:00 |
|
QuoteFox
|
6ef789e343
|
Merge pull request #805 from ArchieBeepBoop/updates
Robustin's Syndicate Infiltrator PR from tee-gee
|
2021-01-03 05:43:35 +00:00 |
|
QuoteFox
|
ff20e5077b
|
Merge pull request #808 from DragonTrance/catnip-mood-boost
Gives Catnip a Mood Boost to felinids
|
2021-01-03 05:41:24 +00:00 |
|
QuoteFox
|
86e0d7fb1b
|
Merge pull request #809 from ArchieBeepBoop/stuff
Surgery fix package
|
2021-01-03 05:40:43 +00:00 |
|
QuoteFox
|
5dae3ac577
|
Merge pull request #812 from ArchieBeepBoop/slamupgrade
Upgrades Tabletide Stationwide
|
2021-01-03 05:35:25 +00:00 |
|
Archie
|
c379fcd322
|
Upgrades Tabletide Stationwide
|
2021-01-03 02:34:11 -03:00 |
|
Archie
|
222d37751e
|
Fixes blood and properly adds the char reagent to grilled items as well (you can overdose on it)
|
2021-01-03 01:58:45 -03:00 |
|
kevinz000
|
b21c65055a
|
Surgery fix package
|
2021-01-02 19:03:45 -03:00 |
|
kevinz000
|
8e51c88d0e
|
Porting Robustin's Syndicate Infiltrator PR from tee-gee
|
2021-01-02 16:53:52 -03:00 |
|
QuoteFox
|
092a7fa5a1
|
Merge pull request #804 from quotefox/sexhud
New HTML arousal hud, with contextal options, plus new lewd features.
|
2021-01-02 14:34:31 +00:00 |
|
QuoteFox
|
a9575ffc21
|
Merge pull request #794 from lyricalpaws/master
Let synthliz and IPC have and be infected by nanites
|
2021-01-02 14:02:24 +00:00 |
|
QuoteFox
|
9efba52b3c
|
Merge pull request #801 from DragonTrance/catnip-icon
Catnip plant now has growth icons
|
2021-01-02 13:41:00 +00:00 |
|
QuoteFox
|
333f410476
|
New Arousal Hud
New Arousal Hud, much more user accessable with contextal options.
|
2021-01-02 13:39:17 +00:00 |
|
DragonTrance
|
b51b969ee2
|
slower metabolism
|
2021-01-01 14:16:15 -07:00 |
|
DragonTrance
|
d43bc54e45
|
catnip gives felinids a mood boost
TODO: after catnip icon gets merged
|
2021-01-01 14:08:02 -07:00 |
|
DragonTrance
|
bbaecfc295
|
catnip growth icons
|
2021-01-01 13:26:10 -07:00 |
|
Archie
|
cab493231b
|
Reagent fix pack 3
|
2021-01-01 02:21:45 -03:00 |
|
QuoteFox
|
aa2280113d
|
Merge pull request #785 from DragonTrance/this-is-my-3rd-branch-i-hate-github-sometimes
Expander + VTEC upgrades Fix (times two)
|
2021-01-01 02:26:01 +00:00 |
|
QuoteFox
|
8f374d0213
|
Fix fix heat
Fix fix heat
|
2020-12-31 23:32:48 +00:00 |
|
Chloe Carver-Brown
|
ec82ae4d80
|
Merge branch 'master' of github.com:lyricalpaws/Hyper-Station-13
|
2020-12-31 17:59:03 +00:00 |
|
Chloe Carver-Brown
|
c2a937bb73
|
Changing Nanotrasen to Kinaris where needed
|
2020-12-31 17:58:25 +00:00 |
|
Chloe
|
2c21633a8c
|
Merge pull request #4 from quotefox/master
Update
|
2020-12-31 17:01:52 +00:00 |
|
Chloe Carver-Brown
|
1685663b80
|
Let IPCs and SynthLiz be injected by nanites
|
2020-12-31 16:46:14 +00:00 |
|
Chloe Carver-Brown
|
c3ad6b5500
|
Making silicons their own biotype
|
2020-12-31 16:45:11 +00:00 |
|
QuoteFox
|
bab90efbb1
|
Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13
|
2020-12-31 09:28:28 +00:00 |
|
QuoteFox
|
0fbedcfec4
|
temp fix to heat
temp fix to heat
|
2020-12-31 07:19:42 +00:00 |
|
kevinz000
|
10069637a5
|
Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
|
2020-12-30 00:42:50 -03:00 |
|
QuoteFox
|
99d71b258f
|
Merge pull request #783 from lyricalpaws/master
Adding new smites
|
2020-12-29 21:25:45 +00:00 |
|
QuoteFox
|
0436e9f141
|
Merge pull request #786 from ArchieBeepBoop/gamerfood
Balances Gamer Food
|
2020-12-29 21:24:55 +00:00 |
|
QuoteFox
|
cf86a3113a
|
Merge pull request #787 from DragonTrance/cargo-techy-fix
Why do these have QM access again?
|
2020-12-29 21:24:28 +00:00 |
|
QuoteFox
|
58e7270909
|
Merge pull request #784 from SandPoot/master
Makes *that pref* more user friendly, nobody cares what a datum is. (PART 2)
|
2020-12-29 21:23:23 +00:00 |
|
DragonTrance
|
2b1f1c4d22
|
remove QM access from cargo techs
|
2020-12-29 12:47:01 -07:00 |
|
Archie
|
38fcb1fa56
|
Balance gamer food
|
2020-12-29 16:23:03 -03:00 |
|
DragonTrance
|
529824b320
|
borg expander + vtec upgrades fix
|
2020-12-29 11:15:19 -07:00 |
|
SandPoot
|
8609515aa2
|
upload preferences.dm
|
2020-12-29 11:44:22 -03:00 |
|
Chloe
|
9538bc4245
|
adds breadify and nugget smite options
|
2020-12-29 12:27:34 +00:00 |
|
QuoteFox
|
205879e74e
|
Radio sounds on send
Radio sounds on send
|
2020-12-28 21:14:23 +00:00 |
|
Archie
|
d241229ba0
|
Merge remote-tracking branch 'upstream/master' into Surgery
|
2020-12-28 16:43:57 -03:00 |
|
QuoteFox
|
9c2c2a22e2
|
Merge pull request #773 from DragonTrance/deconstructing
Adds the Ability to deconstruct various objects
|
2020-12-28 19:34:37 +00:00 |
|
QuoteFox
|
a7ee147981
|
Merge pull request #780 from DragonTrance/drink-throwing
another thing
|
2020-12-28 19:33:42 +00:00 |
|
QuoteFox
|
4ea8b7bfcb
|
Merge pull request #781 from TotallyNotADog/fixPrussian
fixes prussian blue
|
2020-12-28 19:33:23 +00:00 |
|
SandPoot
|
5684a36443
|
push files.
|
2020-12-28 15:49:19 -03:00 |
|
TotallyNotADog
|
06155664dd
|
fixes prussian blue
|
2020-12-27 19:52:54 -06:00 |
|
DragonTrance
|
18fdedf6ab
|
fixed sound not playing
|
2020-12-27 15:40:45 -07:00 |
|
QuoteFox
|
4e87dc783b
|
Merge pull request #779 from DragonTrance/drink-throwing
Bartender's Drink Flinging fix
|
2020-12-27 19:21:28 +00:00 |
|
DragonTrance
|
e57ba1502e
|
tiny bit of cleanup
|
2020-12-27 12:19:54 -07:00 |
|
DragonTrance
|
76b0b45a0b
|
drink flinging fix
finally
|
2020-12-27 12:12:41 -07:00 |
|
Archie
|
188cc10974
|
Merge remote-tracking branch 'upstream/master' into Surgery
|
2020-12-27 04:29:21 -03:00 |
|