493 Commits

Author SHA1 Message Date
Chloe Carver-Brown 5e5b43212e fuck shit piss 2021-04-08 01:36:09 +01:00
Marvin Megavolt b7300056bb e 2021-03-31 22:34:01 -05:00
Marvin Megavolt ac7a714604 Back for round 2 2021-03-31 21:53:46 -05:00
QuoteFox a4826e6eab Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit f5cf7f6f5a, reversing
changes made to a32444dae7.
2021-03-27 10:56:34 +00:00
QuoteFox bcc80b9800 Merge pull request #1056 from DragonTrance/apparition-antagonist
screaming
2021-03-26 06:02:16 +00:00
DragonTrance 99739f48fe screaming 2021-03-25 23:00:58 -07:00
QuoteFox bf7abb778d Revert "Revert "Merge pull request #1055 from DragonTrance/apparition-antagonist""
This reverts commit 04d01ed851.
2021-03-26 06:00:13 +00:00
QuoteFox 04d01ed851 Revert "Merge pull request #1055 from DragonTrance/apparition-antagonist"
This reverts commit 5488e82e13, reversing
changes made to fa04b528f9.
2021-03-26 05:59:30 +00:00
QuoteFox 5488e82e13 Merge pull request #1055 from DragonTrance/apparition-antagonist
Wendigo (Early/Testing Stages)
2021-03-26 05:44:39 +00:00
DragonTrance 1e3c4b91d6 wendigo antag (admemery atm) 2021-03-25 22:29:29 -07:00
CapnMachaddish 956bc6cb8b PAAARTAAAAY!
THROUGH THE FIRE AND THE FLAMES WE CARRY ON
2021-03-23 01:39:01 -05:00
QuoteFox 706ee6d3eb Hyperstation RP beta 0.1 and alot of bug fixes. 2021-03-20 12:36:02 +00:00
QuoteFox 42b1d15981 Revert "Merge pull request #1035 from DragonTrance/various-fixes"
This reverts commit 8436f16c54, reversing
changes made to f512b6d42e.
2021-03-17 23:45:38 +00:00
DragonTrance 9860480e91 fixes various bugs and runtimes 2021-03-17 12:31:18 -07:00
QuoteFox a4e5fc9c20 Merge pull request #1008 from DragonTrance/plant-adding
Modular Chemical Reactions for Hydroponics Trays
2021-03-02 05:10:21 +00:00
DragonTrance 26937f3bde modular chemical reactions for hydroponics trays 2021-03-01 09:00:51 -07:00
DragonTrance 8dee9d844a part 1 cause I wanna do other things 2021-02-28 21:35:30 -07:00
DragonTrance 5595bb272c reagent fix pack 3 fix pack 1 2021-02-27 22:01:42 -07:00
Archie 5bcfcd3d1a Flag fixes. 2021-02-25 06:04:31 -03:00
Archie ac32223e0c And his music was electric 2021-02-25 05:12:37 -03:00
Chloe Carver-Brown 4a458797d4 Merge branch 'master' of github.com:lyricalpaws/Hyper-Station-13 2021-02-24 00:53:59 +00:00
Chloe Carver-Brown 86a391ec32 Patreon stuff 2021-02-24 00:53:13 +00:00
DragonTrance 5740825e1b only start fat 2021-02-23 14:04:34 -07:00
DragonTrance b37e1db35e a 2021-02-23 13:55:15 -07:00
DragonTrance ab941f0406 forgot one thing 2021-02-23 13:50:43 -07:00
DragonTrance 15094b8b12 enjoy being fat with quirks! 2021-02-23 13:46:07 -07:00
QuoteFox 9dd61f3efb Pens now write on people, Harm intent to stab them like the old way.
Washable at showers.
2021-02-22 23:08:42 +00:00
QuoteFox 4c8865bbd3 ashtray now holds cig butts 2021-02-22 01:45:29 +00:00
Chemlight 659f3b7885 Donator items for Enzo_Leon
Includes a shirt, jacket, and plushie
2021-02-13 14:56:45 -08:00
QuoteFox a40e002595 loose ends.
more prices I missed
2021-02-04 14:20:17 +00:00
QuoteFox 5584bb9522 Economy part 2 - Vendors 2021-02-04 12:42:50 +00:00
QuoteFox a41f3ec644 cherostavik patreon reward 2021-01-31 19:36:00 +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 5aa234b1d6 name fix because im a retard
name fix because im a retard
2021-01-30 03:01:51 +00:00
QuoteFox 4986e98055 Some new hairs + Shaws
hairs n shaws
2021-01-30 02:58:46 +00:00
QuoteFox 3d1aabd694 Merge pull request #937 from quotefox/economy
Hyper Economy part 1 - Money Movement.
2021-01-29 01:18:58 +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
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 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
Dahlular 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
QuoteFox c856c6497a Merge pull request #934 from MalricB/sus
Fallout Enclave Power Armor
2021-01-28 11:49:54 +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 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
Vladin f0fd47becd Your affinity for guns is apparent.
The mark of the Doom Slayer was burned upon his crypt, a warning to all of Hell that the terror within must never be freed. There he lies still, and ever more, in silent suffering.
2021-01-26 23:42:17 -05:00