93fa1597aa
Merge pull request #920 from ToonClyde/the-unbananaing
...
F in chat for banana staff
2021-01-22 08:45:21 +00:00
47f974d8dd
Merge pull request #918 from Kabramen/new-wood-types
...
New wood types + lavaland red grass
2021-01-22 08:45:11 +00:00
a1b12023de
F in chat for banana staff
2021-01-22 01:41:44 -07:00
ecc74bc5fd
Merge pull request #919 from ToonClyde/bar-renovations
...
Bar Touch up
2021-01-22 06:05:24 +00:00
66e5408a78
my gosh I assure you this is the last edit
2021-01-21 21:42:20 -07:00
0f42eeb975
AAA more tweaking
2021-01-21 21:22:18 -07:00
7c70ba46da
AI upload fix
2021-01-21 21:01:12 -07:00
ffd78bc4e7
Bar Touch up
...
It's been so long since I edited a map I hope I still remember what I'm doing
2021-01-21 15:54:26 -07:00
cd9fb045e1
GRASS
2021-01-21 12:02:42 -03:00
137067b909
Merge pull request #912 from ArchieBeepBoop/memepr9000
...
Adds not one, but two new -exclusive- brain damage lines!
2021-01-21 14:52:55 +00:00
0a61a40231
fixes
...
fixes
2021-01-21 14:46:31 +00:00
aa6158b9ad
fixes traumas.json merge conflict
2021-01-21 11:42:59 -03:00
fbc1865b5c
map update by Cap'n MacHaddish #6617
...
bar update
2021-01-21 14:30:52 +00:00
a1729c008c
Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13
2021-01-21 14:24:58 +00:00
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
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
b9b47be219
wholy shit
2021-01-21 06:53:51 -07:00
cba5255206
Modular doors
...
Modular doors
2021-01-21 11:10:54 +00:00
296b08c666
nein
2021-01-21 03:33:32 -03:00
2194a0a0c1
whoops
2021-01-21 03:29:30 -03:00
f2b22cd84e
Removes hat knocking off, maintains hat landing
2021-01-21 03:27:27 -03:00
6c0a7b1b39
WOOD
2021-01-21 03:09:52 -03:00
bc90159799
Fix hardsuits
2021-01-21 03:09:42 -03:00
f22a21f8cb
Revert "Merge pull request #910 from quotefox/revert-905-AAAAAAAAAEEEEEEEEEEEEEEEEEEEEEWOOOOOYEEEAHAPRTNER"
...
This reverts commit 3c0c4c41a1e79656c1ba
2021-01-21 03:07:29 -03:00
04bbe83725
Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13
2021-01-21 06:01:57 +00:00
cae0a5c612
piping fix
...
piping fix
2021-01-21 06:01:55 +00:00
3506191208
light fixes
...
light fixes
2021-01-21 05:53:18 +00:00
0b7688328f
Merge pull request #913 from ArchieBeepBoop/plasma
...
"What if it was purple?" Adds: The Plasmaglass Table and Plasma Spear
2021-01-21 05:50:52 +00:00
ec28d0f66d
Line ending conflict fix
2021-01-21 02:45:10 -03:00
858f994b5d
Adds: The Chad Plasmaglass Table
2021-01-21 02:44:06 -03:00
46a8215e71
and another one
2021-01-21 01:37:11 -03:00
3b20e27077
Adds a new brain damage line
2021-01-21 01:30:43 -03:00
07e5ddac6c
ai door fix
...
ai door fox
2021-01-21 04:11:13 +00:00
4784667bbc
plant fix
...
plant fix
2021-01-21 03:24:57 +00:00
b6f22b901a
ashtrays added
...
Can now put out cigs in ashtrays.
2021-01-21 03:22:54 +00:00
290df96b8c
map fix
...
map fix
2021-01-21 02:58:39 +00:00
1bcaf7cf89
dumb bar idea test
...
dumb bar idea test
2021-01-21 02:55:05 +00:00
90c7aa539a
Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13
2021-01-21 01:22:54 +00:00
75eb4d5696
New chairs and recipes!
...
New chairs and recipes!
2021-01-21 01:20:12 +00:00
e24f9680c8
Merge pull request #911 from ArchieBeepBoop/bread
...
fixes bread & banana spider loot
2021-01-20 10:08:46 -07:00
98f796d874
Merge remote-tracking branch 'upstream/master' into bread
2021-01-20 14:06:59 -03:00
cd8ef5be4b
fixes bread & banana spider loot
2021-01-20 14:05:20 -03:00
3c0c4c41a1
Merge pull request #910 from quotefox/revert-905-AAAAAAAAAEEEEEEEEEEEEEEEEEEEEEWOOOOOYEEEAHAPRTNER
...
Revert "ports hat throwing"
2021-01-20 09:21:54 -07:00
893bd14014
Revert "ports hat throwing"
2021-01-20 09:20:55 -07:00
e79656c1ba
Merge pull request #905 from MalricB/AAAAAAAAAEEEEEEEEEEEEEEEEEEEEEWOOOOOYEEEAHAPRTNER
...
ports hat throwing
2021-01-20 13:04:18 +00:00
dac340c3b1
Merge pull request #908 from Dahlular/blaaaaaaades
...
Not-A-Mantis-Blade
2021-01-20 13:04:11 +00:00
42540fe114
arm scytheblades
2021-01-20 06:00:00 -07:00
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
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
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