Dahlular
fb6843a850
Merge pull request #180 from Azarak/anomalies
...
Longer anomaly time before detonation by 20 seconds
2020-02-01 07:23:34 -07:00
Azarak
26f98c9b4f
Longer anomaly time
2020-01-30 16:02:52 +01:00
Dahlular
b3360b7cde
Merge pull request #174 from Azarak/rcd-update
...
Ports all the RCD changes, updates from Citadel
2020-01-30 04:47:41 -07:00
Azarak
e63c7b37f3
RCD update
2020-01-29 12:45:53 +01:00
Azarak
a6dfd6b6b6
update
2020-01-28 16:58:09 +01:00
Azarak
8c4ad4c728
spray paint update
2020-01-28 04:19:54 +01:00
quotefox
40c3008637
Revert "Revert "Merge pull request #123 from SynnGraffkin/Advanced-Cams""
...
This reverts commit 6ac8540d7e
2019-12-18 18:53:50 +00:00
quotefox
6ac8540d7e
Revert "Merge pull request #123 from SynnGraffkin/Advanced-Cams"
...
This reverts commit 9f1d03b6f7d1e1862412
2019-12-18 18:39:34 +00:00
Toast
891489ff6d
Plastic Cutlery
2019-12-14 01:54:53 -05:00
quotefox
964e5e0c78
Merge pull request #129 from Azarak/botanystuff
...
Adds in lots of botany stuff - 3d orange, fairygrass, new bioluminescence, bamboo, cherry bulbs, COCONUTs+
2019-12-12 01:42:55 +00:00
Azarak
05f4a3163f
adds in coconuts, coconut milk, coconut bongs
2019-12-10 07:21:41 +01:00
Toast
4c91af8205
Advanced Cams
2019-12-08 03:42:05 -05:00
Azarak
db540ac496
Botany stuffs
2019-12-06 17:54:19 +01:00
Azarak
12f230d77f
Ports 3 new botany plants and more bioluminescence types
2019-12-05 15:45:47 +01:00
quotefox
4259bb76a1
Merge pull request #109 from Azarak/master
...
NEW CARGO CRATES + minor fixes/typo fixes to current ones
2019-11-30 20:16:11 +00:00
quotefox
cbb3776766
Merge pull request #99 from Kraseo/513compat
...
Adds 513 compatibility
2019-11-30 20:14:03 +00:00
Azarak
dd4e7df65e
New cargo crates, typo fixes, and some minor fixes
2019-11-29 19:26:38 +01:00
Seris02
2ca2a7d41e
winter coats
2019-11-26 19:01:58 +08:00
Kraseo
e0a9fecaaf
i don't have a funny joke so have this commit log instead
2019-11-25 15:38:16 +01:00
quotefox
20d85b8d35
bones breaking system
2019-11-25 07:11:44 +00:00
Jessiekhat
184485c65c
Cyborg Overhaul Booty+
...
Added dickgirl version of all bootyborgs and improved all of the sprites. Ported /tg/station's service, beaker, and circuit manipulator modules and upgrades for their respective borg types. Added rags, soap, crowbar, ect. to appropriate cyborg modules for quality of life improvment. Made similar changes to dog-borgs to bring them up to speed with the rest of the borg modules.
2019-11-20 23:49:51 -06:00
quotefox
002b595775
removed band
2019-11-19 04:38:44 +00:00
quotefox
933c8cf852
Merge pull request #87 from namjay1170/master
...
Durathread QOL
2019-11-19 03:53:45 +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
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
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
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
