Commit Graph

1736 Commits

Author SHA1 Message Date
QuoteFox
39a5e2863e final touches to part 1
final touches to part 1
2021-01-29 01:08:23 +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
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
QuoteFox
e79656c1ba Merge pull request #905 from MalricB/AAAAAAAAAEEEEEEEEEEEEEEEEEEEEEWOOOOOYEEEAHAPRTNER
ports hat throwing
2021-01-20 13:04:18 +00:00
QuoteFox
0150066d67 Merge pull request #906 from ArchieBeepBoop/sleepers
Removes VR sleepers from pubby + disables crafting VR sleeper boards.
2021-01-19 23:40:26 +00:00
QuoteFox
6a9f162a5d Merge pull request #907 from MalricB/give-me-death-or-give-me-nothing
Owing to his laconic character and lack of conversational input, the stranger was reluctant to engage in social intercourse with the vast majority of the townspeople he encountered on his travels. None of the aforementioned desert-dwelling individuals felt that their motivations were sufficiently compelling to make inquiries regarding the purpose of the stranger’s visit, causing the townspeople to take precautionary measures in order to avoid making even the most innocuous allusions to the mysterious and intimidating visitor. This unquantifiable foreigner, gathered in the company of said petrified townspeople, was in possession of a piece of metal of considerable size, weight, and mass attached to the right side of his pelvis by means of a leather aperture designed to extend the wearer's carrying capacity.
2021-01-19 23:40:12 +00:00
QuoteFox
5c09c6df37 Merge pull request #903 from MalricB/punishesarchie
Entering upon horseback into the desert community known as "Agua Fria" located in the southwestern U.S. state known as New Mexico, a territory formerly under the jurisdiction of Spanish colonizers in 1598, was a man whose name, origin, motivations, and goals were unknown to every member of said desert community, on a particular day classified as "fine," indicating favorable weather conditions.
2021-01-19 23:39:54 +00:00
QuoteFox
2134e24a97 Merge pull request #902 from ArchieBeepBoop/bread
I have done nothing but teleport bread for three days
2021-01-19 23:39:26 +00:00
CygnusB
00abae18ae one more time
ye
2021-01-19 18:54:17 -03:00
Archie
25a467633b Removes VR sleepers from pubby + disables crafting VR sleeper boards. 2021-01-19 18:31:25 -03:00
CygnusB
edf030d4b7 YEEHAWPARTDNERSYES
YEAAHHFDG
2021-01-19 18:28:13 -03:00
Archie
ec3a68dc7a Runtime man bad 2021-01-19 18:09:23 -03:00
CygnusB
ab4b36ba56 Update miscellaneous.dm 2021-01-19 17:51:59 -03:00
CygnusB
9ba7d398f6 Revert "Revert "Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie""
This reverts commit 8cda8bbd16.
2021-01-19 17:48:12 -03:00
CygnusB
17d7425417 MWS Microbatteries into techweb / sec techfab 2021-01-19 17:46:34 -03:00
Archie
35430cda6d runtime 2021-01-19 13:54:32 -03:00
silicons
e1ad9f8957 i have done nothing but teleport bread for three days 2021-01-19 13:48:33 -03:00
CygnusB
520e075e39 Update secure.dm 2021-01-19 06:42:01 -03:00
CygnusB
8cda8bbd16 Revert "Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie"
This reverts commit 1945c166b4, reversing
changes made to c8d20ea83c.
2021-01-19 06:40:28 -03:00
CygnusB
1945c166b4 Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie 2021-01-19 06:39:56 -03:00
CygnusB
c8d20ea83c multiphase briefcase now actually works
whoops
2021-01-19 06:39:32 -03:00
CygnusB
8ece699ed9 Merge branch 'master' into punishesarchie 2021-01-19 06:30:10 -03:00
CygnusB
f6c3dccaf9 Revert "Update human.dm"
This reverts commit 713aa33fa8.
2021-01-19 06:27:15 -03:00
CygnusB
958b01f4d0 part 2
forgot a bunch of shit, also had to re-do parts because we don't have update_overlays()
2021-01-19 06:09:55 -03:00
CygnusB
f21db73775 fuck yeah
banana
2021-01-19 03:31:33 -03:00