Commit Graph

38 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
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
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
shellspeed1
aa9fafcab9 removes storage bags from toolbelts 2019-10-26 12:01:03 -07: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
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
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
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
515daa39bd Alot of stuff. 2019-10-07 03:13:23 +01:00
Azarak
e60f0ef180 Atmos update 2019-10-05 02:58:05 +02: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
quotefox
e382763d99 Merge pull request #17 from shellspeed1/stasisbed
Adds basic stasis beds.
2019-09-28 23:11:06 +01:00
shellspeed1
2c2f4f2dde adds board for stasis bed 2019-09-27 15:41:22 -07:00
quotefox
81d750b441 Enables emojis for PDA messages. (by Ghommie) ported from Cit Code 2019-09-26 22:49:03 +01:00
shellspeed1
ff749a14aa adds iv bags to chem bag allowed 2019-09-25 21:04:37 -07:00
quotefox
c6df023762 Fix smoothing groups for most walls and windows. 2019-09-25 11:40:51 +01:00
Dahlular
1b8c9d4ba5 Fucking REEE FIX DAMMIT WHAT AM I DOING 2019-09-25 00:49:50 -06:00
Dahlular
cf9eeb5938 Adds Marie and Winfre Plushes
It's in the name.
2019-09-25 00:39:49 -06:00
Quotefox
a660e0af66 Goon-like walls update. 2019-09-24 17:35:55 +02:00
shellspeed1
0ee13f9734 Update bags.dm 2019-09-23 17:57:45 -07:00
Quotefox
7091cdbe8c Uploading all files. 2019-09-23 18:26:34 +02:00