Commit Graph

166 Commits

Author SHA1 Message Date
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
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
shellspeed1
0ab8a91ea9 Adds bluespace hotel 2019-11-06 18:15:11 -08:00
Azarak
1544eafb4f TG GENETICS AAAAAAAA
aaaaaaaa
2019-11-04 23:20:16 +01:00
quotefox
0ff71208ae Merge pull request #53 from shellspeed1/fixes-sock-colors
fixes sock colors.
2019-11-04 08:20:53 +00:00
quotefox
a4f291a032 Merge pull request #52 from shellspeed1/makes-slime-hungry
makes slime hungry
2019-11-04 08:20:30 +00:00
Toast
caa2d91eb4 Fixes 2019-11-04 03:09:52 -05:00
Toast
790881594d Bag-added 2019-11-04 02:34:49 -05:00
shellspeed1
ff6fabb7fa fix 2019-11-03 13:12:02 -08:00
shellspeed1
b9f23a4070 makes slime hungry 2019-11-02 13:28:28 -07:00
quotefox
d2554b3ca9 Fix for bot, patrol was broken. (removed the code by accident) 2019-11-02 06:23:58 +00:00
quotefox
d775e4eef3 update 2019-11-01 08:24:56 +00:00
quotefox
7879f49cff fixes 2019-10-29 06:35:56 +00:00
quotefox
c6943658dd Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2019-10-29 04:02:33 +00:00
quotefox
1838075d99 Merge pull request #48 from shellspeed1/mech-capacitor-and-scanner-update
Ports some code improvements and gives odyessy, ripley, and firefighter scanners and capacitors.
2019-10-29 03:23:41 +00:00
quotefox
8ac316392d Merge pull request #49 from shellspeed1/removes-bags-from-toolbelts
removes storage bags from toolbelts
2019-10-29 03:22:35 +00:00
quotefox
8144df3a15 Merge pull request #50 from shellspeed1/stasis-bed-improvements
Borgs can now unbuckle people from stasis beds, Surgery is now performable on stasis beds.
2019-10-29 03:22:09 +00:00
quotefox
e3914bac91 update 2019-10-29 03:12:53 +00:00
shellspeed1
e7522ce64c can now operate on stasis beds 2019-10-26 12:46:46 -07:00
shellspeed1
d2da9e571e borgs should be able to unbuckle people now. 2019-10-26 12:44:54 -07:00
shellspeed1
aa9fafcab9 removes storage bags from toolbelts 2019-10-26 12:01:03 -07:00
shellspeed1
a6ff0cb5de Code Improvements for mech made by Nemvar at tg 2019-10-26 00:49:25 -07:00
shellspeed1
f122fc73f0 indent fix 2019-10-25 23:33:50 -07:00
shellspeed1
3ebb3464b6 makes it so ripley, firefighter, ody, and honk take capaictors and scanners to build 2019-10-25 22:53:49 -07:00
quotefox
45cb9072cd Merge pull request #41 from shellspeed1/organ-healing-fixes
Fixes Issue with Tounge, Stomach, and heart not passively healing.
2019-10-25 17:09:06 +01:00
quotefox
bbfb448536 Merge pull request #43 from shellspeed1/tricord-balance
makes od deal 1/4th of damage
2019-10-25 17:08:27 +01:00
quotefox
af29c87583 Merge pull request #45 from shellspeed1/botany-belt-redo
Adds a botany toolbelt craftable with 4 leather.
2019-10-25 17:07:43 +01:00
quotefox
1b53c2a920 impregnation settings in preferences 2019-10-25 17:05:01 +01:00
quotefox
ab375c58d0 impregnation update 2019-10-25 17:03:19 +01:00