Commit Graph

8043 Commits

Author SHA1 Message Date
variableundefined 3338d8b907 Merge pull request #11476 from Arkatos1/inhand
New inhand sprites
2019-05-17 19:17:32 +08:00
Fox McCloud 238780cae6 Merge pull request #11511 from Markolie/lighting
Make the lighting plane master respect client color and other lighting fixes
2019-05-15 20:42:44 -04:00
Mark van Alphen 5b14cf120d Make lighting plane master respect client color 2019-05-10 20:34:11 +02:00
AffectedArc07 510c210930 Merge 2019-05-09 17:06:35 +01:00
AffectedArc07 531201fab4 Merge branch 'master' into hooks-part4 2019-05-08 22:21:12 +01:00
Fox McCloud 79815eb042 Merge pull request #11357 from Markolie/lighting
Lighting system update
2019-05-08 00:27:16 -04:00
AffectedArc07 014d803eba Merge branch 'master' into hooks-part4 2019-05-07 21:22:59 +01:00
AffectedArc07 51998efe56 Fixes #2 2019-05-07 18:01:11 +01:00
Arkatos1 b2e7149f1d Adds new inhand sprites 2019-05-06 16:08:38 +02:00
AffectedArc07 19d8efef68 Morgue Updating [Hooks P4] 2019-05-06 10:08:28 +01:00
AffectedArc07 130b5ef694 Fox fixes. Foxes? 2019-05-06 08:51:44 +01:00
Mark van Alphen 7fb7cdc57f Chair plane fix (and maybe fixes the disappearing humans, too) 2019-05-06 03:52:01 +02:00
AffectedArc07 f2bcd204bc Fixes captains displaycase [Hooks P3] 2019-05-05 22:31:24 +01:00
AffectedArc07 96edeacec5 Removes unused hooks 2019-05-05 10:28:56 +01:00
Mark van Alphen f3fb39b339 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	code/__DEFINES/misc.dm
2019-05-04 03:07:36 +02:00
Mark van Alphen bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02:00
variableundefined 5357e0e36f Merge pull request #11428 from Markolie/bundles
Chameleon overhaul
2019-05-04 08:23:40 +08:00
Mark van Alphen d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
2019-05-03 18:30:07 +02:00
variableundefined 8928210da1 Merge pull request #11425 from Arkatos1/delay
Examine tooltips tweaks
2019-05-03 22:48:15 +08:00
variableundefined 8a5c4350bc Merge pull request #11431 from Arkatos1/plushies
Adds 4 new plushies
2019-05-03 22:42:49 +08:00
variableundefined 44d9f853cb Merge pull request #11418 from Arkatos1/patchpack
Craftable Patch Pack
2019-05-03 22:39:26 +08:00
variableundefined f8d53aed67 Merge pull request #11426 from Arkatos1/toolbelt
Belt Update
2019-05-03 22:39:04 +08:00
Arkatos1 1f2c3819bd Adds 4 new plushies 2019-05-01 21:43:32 +02:00
Unknown 0d81c2da7c Adds Pig Crate 2019-05-01 14:19:43 -05:00
Mark van Alphen f7a52dcec0 COMIC injector fix 2019-05-01 21:07:43 +02:00
Mark van Alphen 86b90bab2c And fix the uplink kits 2019-05-01 21:01:16 +02:00
Mark van Alphen e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Arkatos1 24b0eb0c0c toolbelt update 2019-05-01 16:57:54 +02:00
Arkatos1 c6a91eafdd Tweaks 2019-05-01 16:04:07 +02:00
Arkatos1 791bebf51c Tweaks to Examine tooltips 2019-05-01 15:50:30 +02:00
variableundefined 9d32120975 Merge pull request #11413 from Arkatos1/carp
Carp Expansion Pack
2019-05-01 08:50:52 +08:00
Arkatos1 1e363bfb88 Craftable patch pack 2019-04-30 19:51:01 +02:00
Mark van Alphen ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
AffectedArc07 ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
variableundefined c8d890ef8a Merge pull request #11365 from Kyep/id_card_tracking
Upgrades ID Computer
2019-04-30 13:28:03 +08:00
variableundefined 0b5f0df20f Merge pull request #11400 from Arkatos1/torch
Adds new torch sprites + tweaks
2019-04-30 13:05:33 +08:00
variableundefined 75a9ca9a10 Merge pull request #11397 from Arkatos1/cabinet
Fire extinguisher cabinet QoL update
2019-04-30 13:05:12 +08:00
variableundefined 32376093cb Merge pull request #11393 from Fox-McCloud/powernet-refactor
TG Powernet Refactor
2019-04-30 12:42:53 +08:00
variableundefined 250d94ee40 Merge pull request #11378 from Arkatos1/Etips
Adds examine tooltips
2019-04-30 11:02:34 +08:00
Arkatos1 cd32b0211b Carp Expansion Pack 2019-04-29 23:47:25 +02:00
variableundefined d55ecac3b0 Merge pull request #11347 from Arkatos1/StackCancel
Working with stacks QoL update
2019-04-29 23:00:15 +08:00
variableundefined 98b8efc080 Merge pull request #11349 from Arkatos1/BolaSound
Adds bola throw sound, sets hitsound for all types of bolas
2019-04-29 22:53:46 +08:00
variableundefined 3747721232 Merge pull request #11335 from Arkatos1/DiceRoll
Dice will now roll when thrown
2019-04-29 22:27:51 +08:00
Fox McCloud 7b57d2e319 fixups 2019-04-29 04:41:31 -04:00
Arkatos1 718d05f0fb Code review fixes 2019-04-28 20:27:45 +02:00
Arkatos1 010081bd96 Adds new torch sprites, torch now eminates orange light 2019-04-28 18:14:39 +02:00
Arkatos1 3181843ce4 Code review fixes, no drop sanity check 2019-04-28 12:31:07 +02:00
Arkatos1 ce5cd16b7e Fire cabinet QoL update 2019-04-28 00:57:12 +02:00
Fox McCloud d0a077f9d5 Powernet Refactor 2019-04-27 02:06:04 -04:00
Mark van Alphen e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	paradise.dme
2019-04-26 22:58:56 +02:00