Commit Graph

1257 Commits

Author SHA1 Message Date
QuoteFox 51b1ddfd9e Merge pull request #947 from quotefox/ecom-2
loose ends.
2021-02-04 14:47:05 +00:00
QuoteFox a40e002595 loose ends.
more prices I missed
2021-02-04 14:20:17 +00:00
QuoteFox 6ec0c56d5a Merge pull request #946 from quotefox/ecom-2
Hyper Economy part 2 - Civ Vendors
2021-02-04 13:13:19 +00:00
QuoteFox c0de8ec3ac some prices and lights I forgot. 2021-02-04 13:10:16 +00:00
QuoteFox 2253473cc5 we dont use this anymore
we dont use this anymore
2021-02-04 12:47:09 +00:00
QuoteFox 5584bb9522 Economy part 2 - Vendors 2021-02-04 12:42:50 +00:00
Dahlular 443294d345 Merge pull request #942 from VladinXXV/patch-1
the absolute state of my mind
2021-02-01 16:10:42 -07:00
kevinz000 c71ab9b1a2 Merge pull request #11087 from Ghommie/Ghommie-cit579
Fix for solar panels/trackers being wonky.
2021-02-01 20:03:09 -03:00
Vladin Ampora b2917ae057 Update costumes_toys.dm 2021-02-01 06:47:59 -05:00
Dahlular f0696ac6c0 Merge pull request #941 from VladinXXV/magicka
I cast.... uh.... PAPER PLANE
2021-02-01 03:01:19 -07:00
QuoteFox b070a47a12 thanks for visiting!
thanks for visiting!
2021-02-01 03:05:45 +00:00
Vladin e9aa0f67c8 I am a wizard, not a baboon brandishing a stick.
Any wizard bright enough to survive for five minutes was also bright enough to realize that if there was any power in demonology, then it lay with the demons. Using it for your own purposes would be like trying to beat mice to death with a rattlesnake.
2021-01-31 21:31:57 -05: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
QuoteFox 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
QuoteFox 9a05ce7785 Merge pull request #939 from lyricalpaws/master
(Very important) Makes formaldehyde actually stop organ rot
2021-01-29 20:39:36 +00:00
QuoteFox 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
QuoteFox 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
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
QuoteFox 3d1aabd694 Merge pull request #937 from quotefox/economy
Hyper Economy part 1 - Money Movement.
2021-01-29 01:18:58 +00:00
QuoteFox 39a5e2863e final touches to part 1
final touches to part 1
2021-01-29 01:08:23 +00:00
QuoteFox 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 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 6c32fd97b7 auto hide belly option at round start.
auto hide belly option at round start.
2021-01-28 20:56:32 +00:00
DragonTrance 13eee79e14 Merge branch 'master' into plante-fixe 2021-01-27 06:14:24 -07: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
DragonTrance 100c896b42 changes lewd plants a bit and fixes other plants 2021-01-27 01:00:09 -07:00
QuoteFox 07f7467daf Revert "Revert "Testing art skills""
This reverts commit 57146db436.
2021-01-26 17:58:39 +00:00
QuoteFox 57146db436 Revert "Testing art skills"
This reverts commit 52f76bd74a.
2021-01-26 17:55:04 +00:00
QuoteFox e26ed22d40 Merge pull request #927 from Chemlight/Dumb-doged-sprites
Testing art skills / more personal stuff
2021-01-26 15:37:37 +00:00
Chemlight 52f76bd74a Testing art skills
I ended up practicing some spriting with  byond's editing software, I'll have to find better methods about how to do this (like uploading a png from SAI) Regargless I liked how these all came out it was too good that not putting them in would be a waste.
2021-01-26 07:21:30 -08:00
QuoteFox 667aa686c1 Merge pull request #922 from Kabramen/walls
Walls and poker tables for the new wood types
2021-01-26 11:54:40 +00:00
Kabra_men 41c87b5e85 more wood stuff 2021-01-25 17:37:06 -03:00
QuoteFox d1f8f37c32 Bellies + Genitals hide fix
Can now how have bellies
2021-01-25 18:34:52 +00:00
QuoteFox ecf93da4b1 Economy part 1
Economy part 1
2021-01-25 10:47:15 +00:00
QuoteFox a7cf51f6cd Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-01-23 10:50:23 +00:00
QuoteFox 319a4599c6 some fixes to her voice, removed ATENTHEN 2021-01-23 10:50:21 +00:00
Kabra_men d71a599224 cargo stuff 2021-01-22 21:42:38 -03:00
Kabra_men 3e6fb7b5e8 TREES 2021-01-22 20:45:16 -03:00
Archie 296b08c666 nein 2021-01-21 03:33:32 -03:00
Archie f2b22cd84e Removes hat knocking off, maintains hat landing 2021-01-21 03:27:27 -03:00
Archie bc90159799 Fix hardsuits 2021-01-21 03:09:42 -03:00
Archie f22a21f8cb Revert "Merge pull request #910 from quotefox/revert-905-AAAAAAAAAEEEEEEEEEEEEEEEEEEEEEWOOOOOYEEEAHAPRTNER"
This reverts commit 3c0c4c41a1, reversing
changes made to e79656c1ba.
2021-01-21 03:07:29 -03:00
Archie 98f796d874 Merge remote-tracking branch 'upstream/master' into bread 2021-01-20 14:06:59 -03:00
Archie cd8ef5be4b fixes bread & banana spider loot 2021-01-20 14:05:20 -03:00
Dahlular 893bd14014 Revert "ports hat throwing" 2021-01-20 09:20:55 -07:00