Commit Graph
2403 Commits
Author SHA1 Message Date
QuoteFoxandGitHub bf1e84193a Merge pull request #807 from DragonTrance/deconstructing
loom slapping fix
2021-01-03 05:42:17 +00:00
QuoteFoxandGitHub 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
QuoteFoxandGitHub 86e0d7fb1b Merge pull request #809 from ArchieBeepBoop/stuff
Surgery fix package
2021-01-03 05:40:43 +00:00
QuoteFoxandGitHub 0ebe0dddb7 Merge pull request #810 from Kabramen/More-loadout-stuff---now-with-Roman-flavor!
More loadout stuff - now with Roman flavor!
2021-01-03 05:35:45 +00:00
QuoteFoxandGitHub 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
QuoteFoxandGitHub 8e84815f4b Merge pull request #811 from ArchieBeepBoop/smallfix
Fixes blood overlay and properly adds the char reagent to grilled items as well.
2021-01-03 05:01:03 +00: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
Kabra_men 1c54fd3c91 More loadout stuff - now with Roman flavor! 2021-01-02 20:07:15 -03:00
kevinz000andArchie 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
QuoteFox 49f39f27db Fix
just fucking work, ive had no sleep. My wife took the kids.
2021-01-02 16:40:06 +00:00
QuoteFoxandGitHub 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 eabc280da4 Moved items into contextal
Moved items into contextal
2021-01-02 14:19:02 +00:00
QuoteFox dc3d5c32d5 Toggle Undergarments button
Toggle Undergarments button, forgot to put it in!
2021-01-02 14:06:45 +00:00
QuoteFoxandGitHub 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
QuoteFoxandGitHub c209ed7596 Merge pull request #797 from ArchieBeepBoop/12gauge
High chaos midround blood cult
2021-01-02 14:02:06 +00:00
QuoteFox 91e749d7e3 comments
comments clean up.
2021-01-02 13:53:34 +00:00
QuoteFoxandGitHub 9efba52b3c Merge pull request #801 from DragonTrance/catnip-icon
Catnip plant now has growth icons
2021-01-02 13:41:00 +00:00
QuoteFoxandGitHub 1822adc29e Merge pull request #800 from DragonTrance/meow-mix
Meow Mix
2021-01-02 13:40:47 +00:00
QuoteFoxandGitHub 087dae7af1 Merge pull request #799 from CapnMachaddish/bluethread
add bluespace thread to syndie asteroid
2021-01-02 13:40:37 +00:00
QuoteFoxandGitHub 970d4e20fc Merge pull request #802 from DragonTrance/syndie-cryo
Lavaland Syndicate Cryo Pod
2021-01-02 13:40:26 +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
CapnMachaddish 3be7e992ba add bspace thread to syndie asteroid
yes
2021-01-01 16:05:06 -06: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
DragonTrance 0fa9b23db7 runtime squash 2021-01-01 12:22:29 -07:00
DragonTrance 76b04095ee adds cryopods in syndicate base 2021-01-01 12:19:53 -07:00
QuoteFoxandGitHub 9ea81d5f1e Merge pull request #798 from ArchieBeepBoop/reagentfixpack3
Reagent fix pack 3
2021-01-01 05:24:00 +00:00
Archie cab493231b Reagent fix pack 3 2021-01-01 02:21:45 -03:00
QuoteFoxandGitHub 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
QuoteFoxandGitHub 46a6ce19e7 Merge pull request #792 from Jay-Sparrow/master 2021-01-01 02:24:56 +00:00
QuoteFoxandGitHub 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
QuoteFoxandGitHub a69f6f50cf Merge pull request #793 from ArchieBeepBoop/nofreeemagforyou
Removes emag from *that* uplink
2021-01-01 02:22:29 +00:00
QuoteFoxandGitHub e0d66143ed Merge pull request #791 from CapnMachaddish/ipad
Adds a Modular Tablet to the loadout menu
2021-01-01 02:22:04 +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 1d4023f0d9 heat changes!
heat changes!
2021-01-01 01:59:02 +00: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
ChloeandGitHub 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
Archie dd858a19e9 Removes emag from jay's "traitor" 2020-12-31 06:45:10 -03:00
QuoteFox bab90efbb1 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2020-12-31 09:28:28 +00:00