Commit Graph

8705 Commits

Author SHA1 Message Date
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
Arkatos1 e6dca3ffa1 Colored pillbottles 2019-04-30 19:34:22 +02:00
Mark van Alphen ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme
2019-04-30 19:26:17 +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
Citinited cd68096a8f Handles airlock controller spawning slightly betterer 2019-04-27 21:41:36 +01:00
Citinited 9976ad9ea1 Adds airlock spawners 2019-04-27 21:41:36 +01:00
Fox McCloud d0a077f9d5 Powernet Refactor 2019-04-27 02:06:04 -04:00
Mark van Alphen 4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
2019-04-26 23:07:57 +02: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
Couls a8db26df98 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-04-25 23:45:08 -04:00
Arkatos1 5b6e80af44 Adds examine tooltips 2019-04-25 21:11:22 +02:00
Arkatos1 8d79486d3a Code review fixes 2019-04-24 16:29:22 +02:00
Fox McCloud 89883a7b28 fixes 2019-04-24 00:49:23 -04:00
Kyep 3ef424eb5c upgrades ID computer 2019-04-23 21:02:27 -07:00
Fox McCloud 0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen ccef4d1187 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
2019-04-24 02:55:32 +02:00
Mark van Alphen 0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
variableundefined b738f9a92f Merge pull request #11283 from Fox-McCloud/emote-refactor
Emote Refactor
2019-04-23 19:44:26 +08:00
Couls a188a6b890 change some move procs 2019-04-23 05:56:12 -04:00
Mark van Alphen affae89028 Attempt update to /tg/ lighting system 2019-04-22 19:55:41 +02:00
Mark van Alphen c4dc5ecd3d Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting 2019-04-22 18:52:55 +02:00
Fox McCloud 4761ded0d4 Merge pull request #11350 from AffectedArc07/ss-everything
Gives the orphans a home
2019-04-21 18:44:38 -04:00
Mark van Alphen 7fef96e38d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	paradise.dme
2019-04-21 23:27:23 +02:00
AffectedArc07 ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
Arkatos1 d31b159813 Added bola throw sound, sound equality across all bolas 2019-04-21 20:25:14 +02:00
Arkatos1 5d508cd984 Stack QOL update 2019-04-21 13:57:30 +02:00
Fox McCloud d88411f947 Merge pull request #11255 from Markolie/safe
Safe refactor
2019-04-21 04:04:13 -04:00
Mark van Alphen 211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
Mark van Alphen 092773132d no_lava fix, make sure simple explosions don't nuke the Syndicate base 2019-04-20 03:09:13 +02:00