563 Commits
Author SHA1 Message Date
Toast 54250038a7 GASES 2019-11-10 02:06:20 -05: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
quotefoxandGitHub 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
quotefoxandGitHub 1699ed1d94 Merge pull request #54 from SynnGraffkin/Construction-Bags
[PORT] Adds construction bags for engineers
2019-11-08 19:34:39 +00:00
quotefoxandGitHub 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
Toast caa2d91eb4 Fixes 2019-11-04 03:09:52 -05:00
Toast 790881594d Bag-added 2019-11-04 02:34:49 -05:00
quotefoxandGitHub 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
quotefoxandGitHub 8ac316392d Merge pull request #49 from shellspeed1/removes-bags-from-toolbelts
removes storage bags from toolbelts
2019-10-29 03:22:35 +00:00
quotefoxandGitHub 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
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
quotefoxandGitHub 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 ab375c58d0 impregnation update 2019-10-25 17:03:19 +01:00
shellspeed1 32283dd1f8 recreates belt. 2019-10-24 15:24:49 -07:00
shellspeed1 388db87515 fixes sprites again 2019-10-19 13:54:30 -07:00
shellspeed1 8c8b95efb4 sprites and similar fixes 2019-10-19 13:04:54 -07:00
shellspeed1 5d1ed71dc2 Code work to port carpets from citadel 2019-10-19 12:02:31 -07:00
quotefoxandGitHub 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 f09342aef5 double door code 2019-10-17 17:26:47 +01: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
shellspeed1 470ec5d62b whew 2019-10-14 18:46:06 -07:00
quotefox bd718654c3 update dump! 2019-10-14 16:48:21 +01:00
quotefox 4f4362a8aa Stability and performance 2019-10-10 02:40:36 +01:00
quotefox 515daa39bd Alot of stuff. 2019-10-07 03:13:23 +01:00
quotefoxandGitHub e78e663397 Merge pull request #24 from Azarak/master
Big atmospheric update - SM, Fusion, TEG, Volume pumps and filters
2019-10-05 23:07:20 +01:00
quotefoxandGitHub ba03f4c710 Merge pull request #21 from Dahlular/neovgre
Ports Neovgre From Citadel (which was ported from hippie)
2019-10-05 23:07:07 +01:00
Azarak e60f0ef180 Atmos update 2019-10-05 02:58:05 +02:00
Dahlular d3bc3fd1f9 Neovgre and all of it's parts 2019-10-02 22:30:48 -06:00
shellspeed1 11780a90d8 Made it so explosions effect contents 2019-09-30 22:39:02 -07:00
shellspeed1 e08b26a7b1 createsmedkit wallmounts 2019-09-30 20:27:45 -07:00
quotefoxandGitHub e382763d99 Merge pull request #17 from shellspeed1/stasisbed
Adds basic stasis beds.
2019-09-28 23:11:06 +01:00
quotefoxandGitHub 753e56ba61 Update atoms_movable.dm
fix
2019-09-28 19:45:23 +01:00
quotefox 5769a88a86 Sound replacement 2019-09-28 19:38:42 +01:00
shellspeed1 50fda51057 bug fixes 2019-09-27 17:13:35 -07:00
shellspeed1 2c2f4f2dde adds board for stasis bed 2019-09-27 15:41:22 -07:00
shellspeed1 889098181e actual stasis bed machine stuff 2019-09-27 15:40:33 -07:00
shellspeed1 40eec50261 allows people to go on stasis beds I think 2019-09-27 15:40:20 -07:00
quotefox 81d750b441 Enables emojis for PDA messages. (by Ghommie) ported from Cit Code 2019-09-26 22:49:03 +01:00
quotefoxandGitHub b079f3ee08 Merge pull request #15 from shellspeed1/Fixes-iv-bags-again-
Fixes iv bags again
2019-09-26 18:48:34 +01:00