Commit Graph
271 Commits
Author SHA1 Message Date
ForrestWick 41870bbf24 Fireman Carry 2020-02-13 18:26:40 -06:00
quotefox 6490a36ec5 fix to research 2019-12-18 19:29:16 +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
quotefoxandGitHub 5b5b8d137a Merge pull request #107 from shellspeed1/nerfs-research-point-generation-from-bz
Nerfs research point generation from bz
2019-12-18 15:27:59 +00:00
quotefoxandGitHub 3b09e0c28f Merge pull request #141 from Detective-Google/Caks-for-all
Changes the birthday cake to use normal ingredients
2019-12-18 15:23:24 +00:00
Detective Google 44c7116548 Changes the birthday cake to use normal ingredients(a-la TG) since we don't have a cakehat on our map 2019-12-15 11:20:31 -06:00
Toast d4430410c2 Dumb Datums 2019-12-14 02:19:02 -05:00
Toast 891489ff6d Plastic Cutlery 2019-12-14 01:54:53 -05:00
quotefoxandGitHub 6703770a15 Merge pull request #135 from shellspeed1/disposable-hypospray-attempt-3
Disposable hypospray attempt 3
2019-12-12 01:52:21 +00:00
quotefoxandGitHub 65856b1a8e Merge pull request #96 from SynnGraffkin/Extended-Plus
Initiate crew transfer vote instead of forcing a shift end at 2 hours.
2019-12-12 01:48:16 +00:00
quotefoxandGitHub 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
quotefoxandGitHub 36a6219a8b Merge pull request #124 from SynnGraffkin/Knife-Roombas
[Port] Lets you tape knives to cleanbots. You know, if you really want to.
2019-12-12 01:11:03 +00:00
quotefoxandGitHub 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
quotefoxandGitHub d1e1862412 Merge pull request #122 from SynnGraffkin/Robit-voices
Adds robotic voiceboxes as contraband in the Roboticist Vendor
2019-12-12 01:10:12 +00:00
quotefoxandGitHub c1bd80fc78 Merge pull request #121 from Seris02/drinks
adds sin's delight, hellfire and gunfire
2019-12-12 01:09:48 +00:00
quotefoxandGitHub a20ffe0e8c Merge pull request #117 from Azarak/tastefix
Adds a cooldown to tasting the acidity of a mixture ("bugfix" to chat spam)
2019-12-12 01:09:01 +00:00
quotefoxandGitHub 24bd29aae1 Merge pull request #115 from Seris02/bottlesmash
fixes bottle smashing
2019-12-12 01:08:21 +00:00
quotefoxandGitHub 24b605b05d Merge pull request #113 from SynnGraffkin/Empty-Clones-2-Electric-Boogaloo
[Ready] Adds "Empty" Cloning, Logging, and related fixes
2019-12-12 01:07:49 +00:00
shellspeed1 2d25c822e3 redone 2019-12-11 02:47:33 -08:00
Azarak 05f4a3163f adds in coconuts, coconut milk, coconut bongs 2019-12-10 07:21:41 +01:00
Toast cce634a063 Adds weapon force emag effect and graffit options to cleanbot 2019-12-08 20:16:11 -05:00
Toast 33c0d1d5e2 Bots 2019-12-08 04:43:59 -05:00
Toast 4c91af8205 Advanced Cams 2019-12-08 03:42:05 -05:00
Toast c0fcc943fa Robot Tongues 2019-12-08 02:57:38 -05:00
Seris02 769c1c8e8b adds sin's delight, hellfire and gunfire 2019-12-08 12:32:32 +08: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
Azarak 5fc73d17c4 update 2 2019-12-05 13:01:36 +01:00
Azarak d0b1754c36 Fixes acidity taste spam 2019-12-05 12:34:18 +01:00
Azarak c78169df77 and also fixes the clown shoes 2019-12-05 10:29:33 +01:00
Azarak 1643406a3e Adds footwarps, available in loadout and in a new cargo crate
up
2019-12-05 09:46:22 +01:00
Seris02 f294569943 fixes bottle smash and fun stuff 2019-12-05 16:12:46 +08: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
quotefoxandGitHub 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
quotefoxandGitHub 495986cc4a Merge pull request #110 from SynnGraffkin/Zoomie-chair
[Port] Motorized Wheelchair from TG
2019-12-01 11:24:25 +00:00
Toast c3e0da23e9 Call me Todd Howard because it just works 2019-11-30 18:00:32 -05:00
Toast f784e6b786 IT IS ALIVE 2019-11-30 17:19:36 -05:00
quotefoxandGitHub 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