Commit Graph

1760 Commits

Author SHA1 Message Date
Chloe Carver-Brown
7384c77dd8 COOMING 2021-01-29 20:01:08 +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
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
Kabra_men
0b1a40baee that's a lot of stuff heck 2021-01-28 18:28:48 -03: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
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
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
Vladin
479c003c97 Do not fuck the bird.
Kenk plush can no longer be sex'd, as per his request.
2021-01-26 23:43:51 -05:00
QuoteFox
07f7467daf Revert "Revert "Testing art skills""
This reverts commit 57146db436.
2021-01-26 17:58:39 +00:00
QuoteFox
0057c577ed Revert "Merge pull request #924 from MalricB/sus"
This reverts commit 85f3bb35c9, reversing
changes made to 667aa686c1.
2021-01-26 17:58:36 +00:00
QuoteFox
57146db436 Revert "Testing art skills"
This reverts commit 52f76bd74a.
2021-01-26 17:55:04 +00:00
QuoteFox
586ed7c46c Revert "Merge pull request #926 from MalricB/sus"
This reverts commit cbc7993239, reversing
changes made to c453ed509f.
2021-01-26 17:52:14 +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
cbc7993239 Merge pull request #926 from MalricB/sus
(E)Rp is now legal
2021-01-26 14:30:45 +00:00
CygnusB
086debf760 Update emergency_button.dm 2021-01-26 11:26:49 -03:00
QuoteFox
85f3bb35c9 Merge pull request #924 from MalricB/sus
!! Emergency Staff Meeting !!
2021-01-26 11:56:12 +00: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
CygnusB
5c55fd0c08 quotefox kinda sus ngl 2021-01-25 23:55:20 -03: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
a45877dbfe divders for doors
just alittle sprite overlay to help define doors.
2021-01-23 11:19:25 +00:00
QuoteFox
3566f1c9a6 fixed chair padding on shuttle chairs.
fixed chair padding on shuttle chairs.
2021-01-23 10:55:32 +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
QuoteFox
47f974d8dd Merge pull request #918 from Kabramen/new-wood-types
New wood types + lavaland red grass
2021-01-22 08:45:11 +00:00
Kabra_men
cd9fb045e1 GRASS 2021-01-21 12:02:42 -03:00
QuoteFox
0a61a40231 fixes
fixes
2021-01-21 14:46:31 +00:00
QuoteFox
a1729c008c Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-01-21 14:24:58 +00:00
QuoteFox
867855f6f7 Fixes to doors and RCD now can print ANY door colour
Fixes to doors and RCD now can print ANY door colour
2021-01-21 14:24:55 +00:00
QuoteFox
351c9b52d2 Merge pull request #914 from ArchieBeepBoop/hatfix
To the town of agua fria rode a stranger one fine day (Fixes hat throwing)
2021-01-21 14:20:12 +00:00
QuoteFox
cba5255206 Modular doors
Modular doors
2021-01-21 11:10:54 +00:00
Archie
296b08c666 nein 2021-01-21 03:33:32 -03:00
Archie
2194a0a0c1 whoops 2021-01-21 03:29:30 -03:00
Archie
f2b22cd84e Removes hat knocking off, maintains hat landing 2021-01-21 03:27:27 -03:00
Kabra_men
6c0a7b1b39 WOOD 2021-01-21 03:09:52 -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
ec28d0f66d Line ending conflict fix 2021-01-21 02:45:10 -03:00
nik707
858f994b5d Adds: The Chad Plasmaglass Table 2021-01-21 02:44:06 -03:00
QuoteFox
90c7aa539a Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-01-21 01:22:54 +00:00
QuoteFox
75eb4d5696 New chairs and recipes!
New chairs and recipes!
2021-01-21 01:20:12 +00:00
Archie
98f796d874 Merge remote-tracking branch 'upstream/master' into bread 2021-01-20 14:06:59 -03:00