Commit Graph

112 Commits

Author SHA1 Message Date
quotefox
411d23c1ef security fix 2020-01-04 00:50:52 +00:00
quotefox
d108de122c Merge pull request #139 from SynnGraffkin/Bye-Bye-Greenshift-and-shitvote
[Merge Conflict] Removes Fake Greenshift and Obfuscated voting
2020-01-03 23:13:31 +00: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 9f1d03b6f7, reversing
changes made to d1e1862412.
2019-12-18 18:39:34 +00:00
Toast
891489ff6d Plastic Cutlery 2019-12-14 01:54:53 -05:00
Toast
2c97fceda6 Removes Fake Greenshift and Obfuscated voting 2019-12-14 00:07:56 -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
quotefox
9f1d03b6f7 Merge pull request #123 from SynnGraffkin/Advanced-Cams
You can now get an advanced camera console
2019-12-12 01:10:35 +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
Toast
e36e351e20 CLONING_SUCCESS
CLONING_SUCCESS CLONING_SUCCESS CLONING_SUCCESS CLONING_SUCCESS CLONING_SUCCESS CLONING_SUCCESS
2019-12-04 01:19:53 -05:00
Toast
dda5966357 Still borked 2019-12-04 00:26:41 -05:00
Toast
2cbcd7d495 Revert "Double checking r.fields"
This reverts commit ff7a90536a.
2019-12-03 23:30:21 -05:00
Toast
ff7a90536a Double checking r.fields 2019-12-03 23:16:05 -05:00
Toast
66493eef79 Totally wasn't probably "mind" and "mindref" causing the issue
TEST NUMERO TWO
2019-12-03 22:52:34 -05:00
Toast
417401b2b7 Last commit before first test run 2019-12-03 20:27:33 -05:00
Toast
1adb79deaa Update cloning pod and atom for multitool 2019-12-03 20:08:52 -05:00
Toast
1aecaa24fd Crafting mind runes 2019-12-03 19:41:51 -05:00
Toast
94b33ed771 Revert "Revert "This is painful""
This reverts commit 95e35dc714.
2019-12-03 19:32:04 -05:00
quotefox
95e35dc714 Revert "This is painful"
This reverts commit 0da5609e9a.
2019-12-03 03:55:20 +00:00
quotefox
b533ea8b9c Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2019-12-03 03:50:03 +00:00
quotefox
816ce5b8fe Fixes to cloning. Revert. 2019-12-03 03:48:56 +00:00
quotefox
8adc12fc22 Merge pull request #104 from SynnGraffkin/Ore-Silo-Mechfab
Modifies the Mechfab to use the Ore Silo
2019-12-02 20:24:36 +00: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
17da27abe6 Merge pull request #108 from SynnGraffkin/Empty-Clones
[Port] Adds "Empty" Cloning, Logging, and related fixes
2019-11-30 20:15:56 +00:00
quotefox
22db566e21 Merge pull request #105 from SynnGraffkin/Fuck-Xenos
[Port] Adds MK I Ripley and conversion kit for MK II
2019-11-30 20:15:02 +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
Toast
0da5609e9a This is painful 2019-11-29 01:14:04 -05:00
Toast
85cad6b4ac Fixing one of two fuckups 2019-11-27 20:14:37 -05:00
Toast
a378b6239a Code stuff 2019-11-27 16:36:02 -05:00
Toast
6bb71fc5c0 Update mech_fabricator.dm 2019-11-27 02:31:53 -05: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
quotefox
c8169d289f perminant solution to the whitelist, whitelist/panic is now handled on the database. 2019-11-22 14:00:04 +00:00
quotefox
0e829e799e Whitelistfixing 2019-11-22 09:38:37 +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
quotefox
96d50b6967 Merge pull request #81 from shellspeed1/more-ody-construction-fixes-
Fixes ody construction.
2019-11-19 03:50:37 +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
shellspeed1
d9412b94d8 fixes the rogue step or 3 involved. 2019-11-16 00:43:37 -08:00
Azarak
d0b00ce298 Ports taser changes 2019-11-15 18:43:07 +01:00
quotefox
e807384f21 Merge pull request #66 from shellspeed1/hotfix-to-make-fix-ody-correction-
Hotfix to ody construction.
2019-11-12 00:26:50 +00:00
shellspeed1
ed8c1e6a46 Update mecha_construction_paths.dm 2019-11-10 14:06:52 -08:00
Toast
54250038a7 GASES 2019-11-10 02:06:20 -05:00