cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,384 Commits 12 Branches 0 Tags
a9575ffc2147bd75f98f5ec0cf098fb024a0a524
Commit Graph

1022 Commits

Author SHA1 Message Date
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
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
Ghom
482ba4a8ee Merge pull request #10806 from Feasel/master 
[Balance Patch - Tend Wounds Edition]
 2020-12-27 04:27:52 -03:00
kevinz000
c27dbcaf5f Merge pull request #9522 from Linzolle/tend-wounds 
Tend Wounds + Make Revival more accessible
 2020-12-27 04:27:29 -03:00
Archie
5710e12cb5 Surgery ports 1 2020-12-27 04:25:28 -03:00
QuoteFox
aa58dec5f4 Merge pull request #771 from ArchieBeepBoop/blood2 
Pooj Blood Code Cleanup
 2020-12-27 07:10:40 +00:00
QuoteFox
3a2d7212df Merge pull request #775 from ArchieBeepBoop/reagentfix2 
More Reagents fixed
 2020-12-27 07:10:09 +00:00
Archie
7c549e6b1e more reagents 2020-12-27 01:42:51 -03:00
QuoteFox
f390fbc8b5 Merge pull request #774 from quotefox/heat 
Heat and Detect Heat Lewd Traits
 2020-12-26 22:21:25 +00:00
QuoteFox
b3aecde046 Merge pull request #765 from DragonTrance/corpseflower 
Corpse Flower
 2020-12-26 21:50:41 +00:00
QuoteFox
3588d4044c Heat Traits 
For fun and for anyone wanting to do their heat/breeding fetish. Opt-in required.
 2020-12-26 20:57:09 +00:00
Ghom
0c8ed89992 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1 
Cleanup/Partial revert of RGB blood ""rework""
 2020-12-25 17:30:06 -03:00
DragonTrance
162ae674c6 constructible showers, loom, sinks & barrels now deconstruct 
Deconstruction:
Loom - Screwdriver
Wooden Barrel - Screwdriver
Sink - Wrench
Shower - Screwdriver > Wrench

Securing:
Loom - Wrench
Wooden Barrel - Wrench
Shower - Screwdriver

Adds showers as craftable objects when using metal sheets. Also organizes some things in the metal sheet crafting menu
 2020-12-25 13:22:21 -07:00
QuoteFox
bcc26045aa Merge pull request #770 from ArchieBeepBoop/reagentfix1 
Reagent Fix Pack 1.1
 2020-12-25 19:49:00 +00:00
Archie
f9a7a97198 a 2020-12-25 11:25:43 -03:00
QuoteFox
e6a7a295d2 Wash cum bug again 
Muliple stacks break it..
 2020-12-24 19:39:41 +00:00
QuoteFox
f9d7b255b1 Cum over partner option 
Cum over partner option
 2020-12-24 19:10:47 +00:00