Commit Graph

193 Commits

Author SHA1 Message Date
quotefox
dc7481c8a4 fix 2019-11-19 07:03:19 +00:00
quotefox
ccac59acc9 hairfix 2019-11-19 06:48:37 +00:00
quotefox
5a6e95b176 quotestuff 2019-11-19 06:22:03 +00:00
quotefox
304a2a0e8b Whitelist message update 2019-11-19 04:39:18 +00:00
quotefox
002b595775 removed band 2019-11-19 04:38:44 +00:00
quotefox
699ecdf6fa Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2019-11-19 04:32:29 +00:00
quotefox
933c8cf852 Merge pull request #87 from namjay1170/master
Durathread QOL
2019-11-19 03:53:45 +00:00
quotefox
96d50b6967 Merge pull request #81 from shellspeed1/more-ody-construction-fixes-
Fixes ody construction.
2019-11-19 03:50:37 +00:00
quotefox
6fe1505032 Merge pull request #84 from Code-Cygnet/Code-Cygnet-patch-1-1
New Plushie and Updated Plushes
2019-11-19 03:44:00 +00:00
quotefox
5a34314d1f Merge pull request #85 from shellspeed1/holopad-fixes
Fixes ai's not being able to talk through holopads, adds floor bot variations, and makes it so floor bots can be built with any toolbox.
2019-11-19 03:43:41 +00:00
Nam
e8f20dae0a Durathread fix
This ones for reals

Found out some fixes I did azy already did cause I didnt update my shit :(

Couldnt make bandoliers work in crafting menu so they got moved to stack crafting and added alt jumpsuit and jumpskirt for durathread
2019-11-18 05:19:53 -08:00
shellspeed1
27925774e6 applys a fix 2019-11-17 02:22:48 -08:00
shellspeed1
b302b6ddd2 ports floorbot variations 2019-11-17 01:59:46 -08:00
shellspeed1
ccd38d3459 Hey guys, I think the borgs are metacomming. 2019-11-17 01:41:44 -08:00
Code-Cygnet
d9fe2e0e7e Updates plushes.dm
Adds new Marilyn plush. Updates plushes.dm from Cit mother branch as well.
2019-11-16 23:13:21 -05:00
shellspeed1
d9412b94d8 fixes the rogue step or 3 involved. 2019-11-16 00:43:37 -08:00
quotefox
766c8fa338 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2019-11-16 02:02:51 +00:00
quotefox
da4973fa85 Merge pull request #72 from Suicidalpickles/plasmemes
[PORT] Departmental Plasmamen + Visors
2019-11-16 01:58:47 +00:00
quotefox
56a995a608 Bag of holding nerf. 2019-11-16 01:52:12 +00:00
quotefox
47c8a174fa Fix to jukebox 2019-11-16 01:51:45 +00:00
quotefox
27a303cc6c Merge pull request #63 from SynnGraffkin/BYOS
[Port] Build Your Own Shuttle
2019-11-15 21:10:15 +00:00
Azarak
d0b00ce298 Ports taser changes 2019-11-15 18:43:07 +01:00
quotefox
1bc339f236 Merge pull request #75 from Suicidalpickles/bbbbbbbbbbbb
[PORT] Max temp on fusion + high rads no longer burn
2019-11-14 01:51:27 +00:00
shellspeed1
be0d110713 screm 2019-11-13 01:07:35 -08:00
Suicidalpickles
fca769c182 e 2019-11-12 21:17:42 -08:00
Suicidalpickles
3ba1b7b83f plasmeme update 2019-11-12 17:03:19 -08:00
quotefox
fc4a4feca3 Merge pull request #71 from shellspeed1/more-plants
Adds a bunch of plants to botany
2019-11-12 00:40:37 +00:00
quotefox
96d8637892 Merge pull request #68 from shellspeed1/tweaks-superior-chems-
Tweaks oxandrolone and salicyclic acid
2019-11-12 00:29:05 +00:00
quotefox
e807384f21 Merge pull request #66 from shellspeed1/hotfix-to-make-fix-ody-correction-
Hotfix to ody construction.
2019-11-12 00:26:50 +00:00
quotefox
f94432d5a2 Merge pull request #62 from shellspeed1/hotfix-to-make-chembags-work-again-in-fridge-
Hotfix to make iv-bags work again in chem fridge
2019-11-12 00:23:09 +00:00
shellspeed1
8b3ee6614f massive botany changes 2019-11-11 16:22:42 -08:00
quotefox
4567bffd85 Merge pull request #64 from SynnGraffkin/REEEEEE-TANKS
Printable Gas Tanks
2019-11-12 00:22:24 +00:00
quotefox
59e28120ed Merge pull request #61 from FargothUr/master
Insects have TG moth pro's and con's.
2019-11-12 00:20:41 +00:00
quotefox
564315156e Merge pull request #70 from Suicidalpickles/3333333333333
Changes rev deconversion color
2019-11-12 00:17:43 +00:00
Suicidalpickles
71e3301439 aaaa 2019-11-11 15:20:00 -08:00
shellspeed1
c4838fc161 ups improved healing threshold from 50 to 25 damage. 2019-11-11 10:37:33 -08:00
shellspeed1
1713d7c569 adds recipe for prussian blue. 2019-11-11 10:25:51 -08:00
shellspeed1
ed8c1e6a46 Update mecha_construction_paths.dm 2019-11-10 14:06:52 -08:00
Toast
54250038a7 GASES 2019-11-10 02:06:20 -05:00
Toast
ea34467f95 BYOS 2019-11-09 19:05:11 -05:00
shellspeed1
f918bb055e quick hotfix 2019-11-08 23:13:55 -08:00
FargothUr
02662efacc Insects have moth pros and cons 2019-11-09 03:12:33 +00:00
quotefox
739240592e - Fix to github 2019-11-08 21:50:59 +00:00
quotefox
23d7ac11af Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13
# Conflicts:
#	icons/obj/device.dmi
2019-11-08 20:55:57 +00:00
quotefox
19810f7e98 Merge pull request #59 from Azarak/master
It's me trying to fix a conflict and I've never done this don't mind me
2019-11-08 20:48:47 +00:00
quotefox
ace551ba39 bone stuff 2019-11-08 20:48:18 +00:00
Azarak
80db742296 Merge branch 'master' into pr/1 2019-11-08 21:11:46 +01:00
quotefox
1699ed1d94 Merge pull request #54 from SynnGraffkin/Construction-Bags
[PORT] Adds construction bags for engineers
2019-11-08 19:34:39 +00:00
quotefox
db364363eb Merge pull request #57 from shellspeed1/bluespace-hotel
Ports Hilberts hotel (bluespace hotel)
2019-11-08 19:32:42 +00:00
Kabra_men
a3c09948fa Cross 2019-11-07 18:06:34 -02:00