cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-04-03 01:50:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,431 Commits 12 Branches 0 Tags
481eb021ccf2c672dcdb4b339f175a74f60991da
Commit Graph

1055 Commits

Author SHA1 Message Date
QuoteFox
481eb021cc Merge pull request #816 from ArchieBeepBoop/disky 
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work"
 2021-01-04 05:42:09 +00:00
QuoteFox
4d164c0b5b Merge pull request #813 from ArchieBeepBoop/thalpyyyyy 
Updates our Fermichems, fixes synthtissue.
 2021-01-04 05:41:29 +00:00
QuoteFox
3484561d38 Merge pull request #815 from ArchieBeepBoop/keybindings 
Unmodularize Keybinds pt1
 2021-01-04 05:41:11 +00:00
Lin
5dd1bc07c6 Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly 2021-01-04 02:36:28 -03:00
kevinz000
21cbe5095a Merge pull request #10356 from deathride58/sprintprefs 
Adds space to sprint and toggle sprint as preferences
 2021-01-04 01:51:21 -03:00
kevinz000
00a753d632 Merge pull request #9817 from Ghommie/Ghommie-cit357 
Fixing a keybinding issue.
 2021-01-04 01:49:46 -03:00
QuoteFox
68c6277ee8 Remove radio in 
say.dm is fucked and makes no sense.
 2021-01-04 04:35:28 +00: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
Archie
97fc5821d7 Synthtissue fix (Thanks to Fermi! <3) 2021-01-03 16:54:22 -03:00
Archie
622a6232b0 Chem master analyze fix, synthtissue update 2021-01-03 07:15:51 -03:00
Archie
efb7bc7b45 Updates reagent holder code 2021-01-03 06:00:13 -03:00
kevinz000
2c11b68f2f Fixes chemscan 2021-01-03 05:56:28 -03:00
kevinz000
cf95f0f7b1 Merge pull request #9377 from Thalpy/Fixes_melting_grenades 
[Mild urgency] Fixes melting cleaning grenades found in janitor/cargoboxes.
 2021-01-03 05:39:20 -03:00
kevinz000
b36aeba681 oops 2021-01-03 05:38:49 -03:00
kevinz000
14fd28eb84 Allows syringe/dropper use on beakers in heaters. 2021-01-03 05:38:02 -03:00
kevinz000
58d0049f31 Adds a markdown parse of all chems for use with github wiki to debug menu. 2021-01-03 05:30:16 -03:00
kevinz000
d98a3dd23c Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button. 2021-01-03 05:27:30 -03:00
kevinz000
12c8ebea11 Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite. 2021-01-03 05:21:47 -03:00
kevinz000
8e1effc3e4 Partially fixes tiny runaway decimals in reagents. 2021-01-03 05:04:47 -03:00
kevinz000
ee082f200e Fermi1 2021-01-03 05:00:57 -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