Commit Graph

631 Commits

Author SHA1 Message Date
Kharkov72 4e2d9a3bd0 I cannot let this go unadded 2021-02-21 00:53:05 -05:00
Chloe Carver-Brown 63063ecd9b It liiiiiives 2021-02-20 14:48:12 +00:00
Chloe Carver-Brown a38a978f70 Revert "Poggers"
This reverts commit 389291b46a.
2021-02-19 23:35:57 +00:00
Chloe Carver-Brown 6d8d602907 Adding clustaur grenades 2021-02-19 23:21:12 +00:00
Chloe Carver-Brown 389291b46a Poggers 2021-02-19 22:19:12 +00:00
Chloe Carver-Brown c1c9b3bba2 Poggers 2021-02-15 23:47:04 +00:00
Vladin 1bfe8bb816 love in the air
no not really thats actually nerve gas
2021-02-13 21:51:56 -05:00
DragonTrance 75415bb7af you know what, dont even deconstruct them 2021-02-10 07:33:11 -07:00
DragonTrance d09400af15 stop exploiting constructable showers 2021-02-10 07:23:31 -07:00
QuoteFox 22d0f71b6c Fixes empty tape recorders getting stuck on pocket and belt slots 2021-02-09 10:31:38 +00:00
Dahlular c2435b144d Merge pull request #945 from VladinXXV/atmosia
Atmos drip
2021-02-06 20:44:50 -07:00
QuoteFox b39881f441 vending fix, wallet fix
vending fix, wallet fix
2021-02-04 23:40:40 +00:00
QuoteFox a40e002595 loose ends.
more prices I missed
2021-02-04 14:20:17 +00:00
QuoteFox c0de8ec3ac some prices and lights I forgot. 2021-02-04 13:10:16 +00:00
QuoteFox 5584bb9522 Economy part 2 - Vendors 2021-02-04 12:42:50 +00:00
Vladin ac11142edc walk on fire
not really tho
2021-02-02 20:30:16 -05: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 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 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
Kabra_men 0b1a40baee that's a lot of stuff heck 2021-01-28 18:28:48 -03: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 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 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 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
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 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
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
Kabra_men 6c0a7b1b39 WOOD 2021-01-21 03:09:52 -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
Dahlular 893bd14014 Revert "ports hat throwing" 2021-01-20 09:20:55 -07:00