110 Commits

Author	SHA1	Message	Date
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
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	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	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	a6ff0cb5de	Code Improvements for mech made by Nemvar at tg	2019-10-26 00:49:25 -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	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
shellspeed1	48f06aa113	makes od deal 1/4th of damage	2019-10-23 11:16:07 -07:00
shellspeed1	29414a14ed	aaaaaa	2019-10-23 01:32:03 -07:00
quotefox	f9a2621b0d	Merge pull request #38 from shellspeed1/heart-bypass-fix ... Fixes to surgeries to make them work.	2019-10-21 00:07:24 +01:00
shellspeed1	ac75adb229	fixes to embalming	2019-10-20 16:00:25 -07:00
shellspeed1	ecd768fdc4	more surgery fixes	2019-10-20 15:34:02 -07:00
shellspeed1	5d1ed71dc2	Code work to port carpets from citadel	2019-10-19 12:02:31 -07:00
shellspeed1	c830acdf1e	And this is how I lost my medical license	2019-10-19 11:11:14 -07:00
quotefox	b9a598bbd9	Merge pull request #36 from shellspeed1/Organ-updates-for-stasis-beds ... Massive organ overhaul and some new surgeries ported from cit orginally created by Fermi. Mergeable	2019-10-18 21:47:14 +01:00
quotefox	495c9753b3	Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13	2019-10-18 21:39:37 +01:00
shellspeed1	0e0f5e642f	Ooof	2019-10-18 13:24:24 -07:00
quotefox	1d26cba3b8	FPS menu option	2019-10-18 19:59:05 +01:00
quotefox	4cdca781cf	Merge pull request #35 from Azarak/master ... Clothing fixes + Adds durathread winter coat	2019-10-17 17:31:15 +01:00
shellspeed1	22e7d9dee8	fixes	2019-10-15 17:10:52 -07:00
shellspeed1	cdb68552f8	fixed livers	2019-10-15 16:28:43 -07:00
shellspeed1	187d22ca9b	sprite update and bug testing	2019-10-15 14:55:52 -07:00
shellspeed1	984417ea63	oh god oh fuck oh god	2019-10-15 13:42:18 -07:00
shellspeed1	6a0cb72b6a	error fixing	2019-10-15 11:59:46 -07:00
quotefox	5647d09269	projectile slowed abit	2019-10-15 09:44:08 +01:00
shellspeed1	470ec5d62b	whew	2019-10-14 18:46:06 -07:00
Azarak	f2f33bf354	Clothing fixes + Durathread winter coat	2019-10-15 02:17:19 +02:00
quotefox	713fdeeade	Merge pull request #33 from Azarak/master ... Fixes for Stimulum and Nitryl	2019-10-14 16:49:49 +01:00
quotefox	bd718654c3	update dump!	2019-10-14 16:48:21 +01:00
Azarak	0c4a3753bd	Fixes for Stimulum and Nitryl	2019-10-14 13:54:11 +02:00