Commit Graph

1504 Commits

Author SHA1 Message Date
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
9ce601112c Merge pull request #806 from DragonTrance/changeling-fix
Changeling size fix
2021-01-03 05:42:57 +00:00
QuoteFox
bf1e84193a Merge pull request #807 from DragonTrance/deconstructing
loom slapping fix
2021-01-03 05:42:17 +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
DragonTrance
e83cf212c1 loom slapping fix 2021-01-02 13:11:04 -07:00
DragonTrance
a4942904bd changeling size fix 2021-01-02 13:07:20 -07: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
c209ed7596 Merge pull request #797 from ArchieBeepBoop/12gauge
High chaos midround blood cult
2021-01-02 14:02:06 +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
1822adc29e Merge pull request #800 from DragonTrance/meow-mix
Meow Mix
2021-01-02 13:40:47 +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
DragonTrance
f27bafe721 barsign meow mix fix 2021-01-01 12:30:40 -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
46a6ce19e7 Merge pull request #792 from Jay-Sparrow/master 2021-01-01 02:24:56 +00:00
QuoteFox
1f4c328d0d Merge pull request #795 from DragonTrance/granters-indication
Gives book granters an indication to how far until you master the subject
2021-01-01 02:24:30 +00:00
Archie
891e129260 a 2020-12-31 23:03:19 -03:00
Archie
77d741e7d6 Midround Cult 2020-12-31 23:01:40 -03:00
QuoteFox
8f374d0213 Fix fix heat
Fix fix heat
2020-12-31 23:32:48 +00:00
DragonTrance
e452c22972 book granters indicate progress 2020-12-31 13:44:47 -07: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
63506caa48 Adding synthliz to is_helpers 2020-12-31 16:48:26 +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
JaySparrow
35e65babb3 Disable Lewd Antag 2020-12-30 15:56:45 -06:00
Archie
4123b5f49f Hopefully fixes phobia? 2020-12-30 03:59:36 -03: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