Commit Graph

227 Commits

Author SHA1 Message Date
Dahlular
cf02e7fe14 Merge pull request #153 from zeskorion/master
[PORT]here you go, bee viro
2020-01-28 12:41:59 -07:00
Dahlular
23cd1bc795 Merge pull request #168 from Azarak/spraylights
Updates spraycans and crayons to be up to date with Citadel (colored lights and more designs to draw)
2020-01-28 11:53:48 -07:00
Dahlular
b79510f689 Merge branch 'master' into patch-3 2020-01-28 11:21:48 -07:00
Dahlular
51d638bd0d Merge pull request #167 from DeusHarbinger/patch-4
watcher wing
2020-01-28 11:19:28 -07:00
Dahlular
b794a6f1ad Merge pull request #166 from Seris02/wintercoattide2
more winter coats yep
2020-01-28 11:18:43 -07:00
Dahlular
c2d457f8cb Merge pull request #158 from cyfause/master
LET THE PLASMOIDS CHOOSE THEY WANGS
2020-01-28 11:14:37 -07:00
DeusHarbinger
045878142d watcher wing
effect lasts for 5 seconds instead of 1
2020-01-28 09:47:50 -05:00
Seris02
a00f43490f yepo 2020-01-28 21:56:04 +08:00
Azarak
8c4ad4c728 spray paint update 2020-01-28 04:19:54 +01:00
jbox1
fc67964877 Enabling breast fluid type customisation 2020-01-26 17:36:17 +11:00
Ecron
05f6215773 LET THE PLASMOIDS CHOOSE THEY WANGS 2020-01-25 06:49:15 -05:00
jjpark-kb
84751165da Fix the Icon!
This fixes a bug with the crusher, when using it and losing the icon. :)
2020-01-19 20:05:11 -05:00
zeskorion
29062af741 Update glass.dm 2020-01-09 22:16:47 -08:00
zeskorion
dda5a9b426 Update others.dm 2020-01-09 22:15:58 -08:00
zeskorion
a6d82f778c Update other_reagents.dm 2020-01-09 22:11:07 -08:00
zeskorion
743cd2aafc Update smartfridge.dm 2020-01-09 22:05:00 -08:00
zeskorion
f7cf9c86bd Update death.dm 2020-01-09 21:57:37 -08:00
zeskorion
30b6206351 Update death.dm 2020-01-09 21:41:36 -08:00
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