Commit Graph

190 Commits

Author SHA1 Message Date
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
quotefox
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
quotefox
6703770a15 Merge pull request #135 from shellspeed1/disposable-hypospray-attempt-3
Disposable hypospray attempt 3
2019-12-12 01:52:21 +00: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
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
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
quotefox
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
quotefox
c1bd80fc78 Merge pull request #121 from Seris02/drinks
adds sin's delight, hellfire and gunfire
2019-12-12 01:09:48 +00:00
quotefox
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
quotefox
24bd29aae1 Merge pull request #115 from Seris02/bottlesmash
fixes bottle smashing
2019-12-12 01:08:21 +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
quotefox
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
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
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
a378b6239a Code stuff 2019-11-27 16:36:02 -05:00
quotefox
aaeca40d3f bonecode 2019-11-26 12:38:19 +00:00
Seris02
2ca2a7d41e winter coats 2019-11-26 19:01:58 +08:00
quotefox
f4e9043287 stuffs 2019-11-26 09:03:56 +00: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
2294a2fa20 pizza nerf. 2019-11-25 07:13:47 +00: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
quotefox
448c0efacd Merge pull request #88 from Suicidalpickles/aaaaaaaaaaa
[PORT] Bloodcult radials
2019-11-22 04:48:52 +00:00
quotefox
69a9ece08c Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2019-11-22 04:48:34 +00:00
quotefox
5a349932ee Fixes 2019-11-22 04:47:27 +00:00
Jessiekhat
9e48c17eb6 Update robot_modules.dm 2019-11-21 00:23:05 -06: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
282777c32e whitelist 2019-11-20 00:41:59 +00:00