Commit Graph

209 Commits

Author SHA1 Message Date
zeskorion
9573acc2ca Add files via upload 2020-01-09 21:01:10 -08:00
zeskorion
5aafcf9569 Update death.dm 2020-01-09 20:59:51 -08:00
quotefox
411d23c1ef security fix 2020-01-04 00:50:52 +00:00
quotefox
375bfcb76e Revert "Merge pull request #138 from Code-Cygnet/master"
This reverts commit 30ed0ecef2, reversing
changes made to 11b772557b.
2020-01-03 23:55:28 +00:00
quotefox
4da5d63e7f Merge pull request #127 from shellspeed1/Fixes-heat-icons-swapped
Fixes heat icons swapped
2020-01-03 23:05:28 +00:00
quotefox
a7fde7f494 Merge pull request #101 from Kraseo/grug-smash-rock
Crusher QOL changes
2020-01-03 23:04:56 +00:00
quotefox
30ed0ecef2 Merge pull request #138 from Code-Cygnet/master
Captain cocktail
2020-01-03 23:03:09 +00:00
quotefox
11b772557b Merge pull request #142 from SynnGraffkin/Robit-voices
Fixes Robodrobe Contraband Items
2019-12-22 07:21:20 +00:00
quotefox
370bafd225 Merge pull request #144 from shellspeed1/new-moth-fluff
Massively buffs insects (ports new moth wings and markings from tg)
2019-12-22 07:20:54 +00:00
shellspeed1
87c59c8ec6 clothing 2019-12-21 02:38:06 -08:00
shellspeed1
3494c2a0d5 buffs moths 2019-12-20 22:48:08 -08:00
Toast
ab78cb7f68 Fixed Techpriest not showing on contraband 2019-12-20 01:24:51 -05: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
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
Code-Cygnet
be5b9878bf Update drinks_recipes.dm
Edited to resolve conflict.
2019-12-13 15:51:26 -05:00
Code-Cygnet
97a4e06799 Merge pull request #2 from Code-Cygnet/Code-Cygnet-Mindtrait
Mind Trait Added
2019-12-13 15:48:08 -05:00
Code-Cygnet
2fd4df92e7 Adds Commander and Chief 2019-12-13 15:20:30 -05:00
Code-Cygnet
ad157dd022 Adds Commander and Chief 2019-12-13 14:42:44 -05:00
Code-Cygnet
08792e486c Mind Trait Added
Mind Trait added to Captain role
2019-12-13 14:17:00 -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
shellspeed1
e584a32617 Potentially corrects issue with mismatched hot and cold icons. 2019-12-09 14:29:32 -08: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