Commit Graph
2849 Commits
Author SHA1 Message Date
QuoteFox 5584bb9522 Economy part 2 - Vendors 2021-02-04 12:42:50 +00:00
QuoteFox 6c16353be5 fix approach sound
fix approach sound
2021-02-01 04:09:35 +00:00
QuoteFox b070a47a12 thanks for visiting!
thanks for visiting!
2021-02-01 03:05:45 +00:00
QuoteFox a41f3ec644 cherostavik patreon reward 2021-01-31 19:36:00 +00:00
QuoteFox 1a903bb54a belly fix
belly fix
2021-01-31 18:52:04 +00:00
QuoteFox ad375d374d ball fix
ball fix
2021-01-31 01:38:48 +00:00
QuoteFox 80ea209710 stripper pole.
stripper pole.
2021-01-30 23:41:47 +00:00
QuoteFox ca65390ff4 vibrators shake on zap
vibrators shake on zap
2021-01-30 20:55:56 +00:00
QuoteFox 0b944fc092 fix
fix
2021-01-30 03:41:09 +00:00
QuoteFox 99318f201f adds stole to kinkmate.
adds stole to kinkmate.
2021-01-30 03:38:23 +00:00
QuoteFox 5aa234b1d6 name fix because im a retard
name fix because im a retard
2021-01-30 03:01:51 +00:00
QuoteFox 427b066c41 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-01-30 02:58:49 +00:00
QuoteFox 4986e98055 Some new hairs + Shaws
hairs n shaws
2021-01-30 02:58:46 +00:00
QuoteFoxandGitHub 409a221c42 Merge pull request #940 from VladinXXV/typo-hell
Quality of Life +1
2021-01-29 21:21:54 +00:00
Vladin 17b20e3a3e Sthefo.... stepo..... steto.... ssetho.....
THE THING YOU LISTEN TO THE HEART WITH DAMNIT
2021-01-29 16:06:02 -05:00
QuoteFoxandGitHub 9a05ce7785 Merge pull request #939 from lyricalpaws/master
(Very important) Makes formaldehyde actually stop organ rot
2021-01-29 20:39:36 +00:00
QuoteFoxandGitHub 4980b0556d Merge pull request #936 from ArchieBeepBoop/solar
Modular Solar Panels + Solar Tracker Fix + Compile issue fix
2021-01-29 20:38:48 +00:00
QuoteFoxandGitHub ce6738a0c9 Merge pull request #938 from VladinXXV/SOUP
Fine cuisine en enfer; Lavaland goes gourmet
2021-01-29 20:38:35 +00:00
Chloe Carver-Brown 7384c77dd8 COOMING 2021-01-29 20:01:08 +00:00
ChloeandGitHub 40dc506e09 Merge pull request #1 from quotefox/master
bonk
2021-01-29 19:44:30 +00:00
Vladin f53ca6ba4b Life is just a bowl of pits.
A reponse to all who say life is a bowl of cherries, having some good (the flesh of the fruit) and some bad (the pits)
2021-01-28 21:25:55 -05:00
Vladin 66dfa8d182 Your sleeves look like you threw up on them!
The soup. Where is the soup? [pushes Linguini] Out of my way, garbage boy! [He notices that Linguini is holding a ladle] You are cooking?! How dare you cook in my kitchen?!
2021-01-28 20:50:45 -05:00
QuoteFoxandGitHub 3d1aabd694 Merge pull request #937 from quotefox/economy
Hyper Economy part 1 - Money Movement.
2021-01-29 01:18:58 +00:00
QuoteFox cb19bc751d conflictions
conflictions
2021-01-29 01:18:04 +00:00
QuoteFox 6b9a6163d3 posting their new pin to chat so they can refer to it later if they forget.
posting their new pin to chat so they can refer to it later if they forget.
2021-01-29 01:11:58 +00:00
QuoteFox 39a5e2863e final touches to part 1
final touches to part 1
2021-01-29 01:08:23 +00:00
QuoteFoxandGitHub 9366e720fa Merge pull request #935 from Kabramen/chairs
One step closer to become IKEA: More furniture to the new woodtypes, 3 new chair bounties + one stuff for loadout
2021-01-28 23:59:27 +00:00
Archie c103b8bbc9 Revert Solar control to pre-floyd material 2021-01-28 20:53:02 -03:00
Archie d50b781203 SolarTest11 2021-01-28 20:22:08 -03:00
Vladin d00fb91d3d soup and salad from your local panera
The waste of many good materials, the vexation that frequently attends such mismanagements, and the curses not unfrequently bestowed on cooks with the usual reflection, that whereas God sends good meat, the Devil sends cooks.
2021-01-28 17:38:25 -05:00
Kabra_men 0b1a40baee that's a lot of stuff heck 2021-01-28 18:28:48 -03:00
QuoteFox 6f697cb993 Revert "Merge pull request #923 from SandPoot/master"
This reverts commit c2cf0de80a, reversing
changes made to de88764136.
2021-01-28 21:21:29 +00:00
QuoteFox 2741595ca6 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-01-28 20:56:34 +00:00
QuoteFox 6c32fd97b7 auto hide belly option at round start.
auto hide belly option at round start.
2021-01-28 20:56:32 +00:00
QuoteFoxandGitHub 75dbead1c5 Merge pull request #930 from VladinXXV/he-is-FREE
Adds the totally NOT Vladin "elite operative" plush and stops the Kenk plush from becoming more than friends
2021-01-28 20:38:19 +00:00
DahlularandGitHub c2cf0de80a Merge pull request #923 from SandPoot/master
Makes sizegun code better
2021-01-28 13:35:31 -07:00
QuoteFox de88764136 vibrators - typos again, and lowered the arosual damage abit. 2021-01-28 14:56:37 +00:00
QuoteFoxandGitHub c856c6497a Merge pull request #934 from MalricB/sus
Fallout Enclave Power Armor
2021-01-28 11:49:54 +00:00
QuoteFoxandGitHub a986b60689 Merge pull request #931 from DragonTrance/plante-fixe
A few lewd hydroponic plant changes + fixing
2021-01-28 11:47:37 +00:00
QuoteFoxandGitHub 90e7cfc8e6 Merge pull request #933 from ToonClyde/space-syndi-asteroid-outpost-rework
Syndi space base rework
2021-01-28 11:47:01 +00:00
CygnusB 82921255ab whoops 2021-01-28 04:41:21 -03:00
CygnusB 765f21de24 power armor 2021-01-28 03:57:32 -03:00
QuoteFox bda5326954 typo and belly sprite fix
typo and belly sprite fix
2021-01-28 02:50:02 +00:00
QuoteFox c484450b18 a
a
2021-01-28 01:42:16 +00:00
QuoteFox b719701d72 fix
fix
2021-01-28 01:40:42 +00:00
QuoteFox 3772bbbcc5 vibrators and code optimization! 2021-01-28 01:36:37 +00:00
ToonClyde a94205da1e Syndi space base rework 2021-01-27 17:10:07 -07:00
DragonTranceandGitHub 13eee79e14 Merge branch 'master' into plante-fixe 2021-01-27 06:14:24 -07:00
QuoteFoxandGitHub 897b5995a6 Merge pull request #932 from Chemlight/durr-plants
Plants and reagents
2021-01-27 08:52:51 +00:00
Chemlight 1f8af98389 Plants and reagents
Fixed Pink peppers and milkmelon reagents, along with all special xenobotany plants from xenoarch.
2021-01-27 00:49:15 -08:00