Improvedname
78786b28da
ff
2020-03-22 19:17:51 +01:00
QuoteFox
1bbb7d1a94
Merge pull request #239 from improvedname/mad
...
Fixes cardboard bug allowing you to move lightning speed when moving into a wall
2020-03-21 22:55:13 +00:00
Improvedname
43a717d950
Update cardboardbox.dm
2020-03-21 23:25:46 +01:00
Improvedname
f376b64f31
AAAAAAAAAAAAAA
...
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-03-20 22:50:57 +01:00
Improvedname
83cee8d8f8
nani
2020-03-18 21:25:16 +01:00
QuoteFox
b29a8c25f6
Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13
2020-03-03 13:16:37 +00:00
QuoteFox
cb561ff456
fix for plushie reward
2020-03-03 13:16:25 +00:00
Dahlular
0074c18915
Merge pull request #211 from zeskorion/master
...
keepin beeviro porting consistent for ya
2020-03-03 00:16:29 -07:00
jbox1
13863b3cd6
Update plushes.dm
2020-02-28 17:14:36 +11:00
zeskorion
358665713f
teratoma drops
2020-02-19 11:26:22 -08:00
Dahlular
4cc3b6ebc5
Merge pull request #205 from ForrestWick/firemancarry
...
Fireman Carry
2020-02-13 18:18:14 -07:00
ForrestWick
41870bbf24
Fireman Carry
2020-02-13 18:26:40 -06:00
Dahlular
70e6444d47
Merge pull request #193 from Azarak/hardhats2
...
Adds welding hardhats, no conflicts this time
2020-02-07 23:33:00 -07:00
Azarak
d5593ef017
Holofans, forcefield gens, temperature block
2020-02-03 21:58:35 +01:00
Azarak
4c06f50180
Welding hardhats
2020-02-03 21:35:06 +01:00
Dahlular
f8a887a122
Merge pull request #191 from Azarak/fakewalls
...
Fixes false walls
2020-02-03 10:34:42 -07:00
Azarak
a741915398
Fixes false walls
2020-02-03 04:11:50 +01:00
Toast
6bb8fb8421
Ports Missing TG Chaplain Weapons
2020-02-02 01:48:10 -05:00
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
