Commit Graph

25018 Commits

Author SHA1 Message Date
FlattestGuitar
8c9b1ab043 Adds clicks to flashlights 2017-03-10 17:21:09 +01:00
Markolie
0bc0a2c461 All types of crystals 2017-03-10 12:45:47 +01:00
Markolie
cf4f350a79 Let matter grippers carry firelock electronics and bluespace crystals 2017-03-10 12:44:37 +01:00
Markolie
a6a7cf9d36 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	code/game/jobs/job/job.dm
2017-03-10 12:42:37 +01:00
Fox McCloud
7c7a2c01c5 Merge pull request #6714 from Jovaniph/recitencesound
Recitence mech makes no sound when turning
2017-03-10 01:53:57 -05:00
Fox McCloud
d7d1e42cc2 Merge pull request #6678 from LordJike/carrot-tweaks
Makes carrots processable into wedges and makes said wedges fryable into carrot fries
2017-03-09 21:36:40 -05:00
Fox McCloud
9510fa9f6c Merge pull request #6711 from Crazylemon64/playercreation_assembly_line
Streamlines the ghost-to-player creation process
2017-03-09 21:30:22 -05:00
Fox McCloud
bbdf2fb05a Merge pull request #6713 from Luthix/toxlaunch
Fix toxins launch room
2017-03-09 21:26:43 -05:00
Markolie
a376adc93e Merge branch 'zefix' of https://github.com/Markolie/Paradise into zefix 2017-03-09 17:42:21 +01:00
Markolie
7cb52433d1 Fix AI blind issue 2017-03-09 17:41:46 +01:00
Mark van Alphen
93470e3570 Merge branch 'master' into zefix 2017-03-09 17:20:31 +01:00
Fox McCloud
d18f862775 Merge pull request #6695 from Markolie/toolz
Tool overhaul
2017-03-09 01:43:18 -05:00
Jovan
c098a0d49f Turning sounds make no sound 2017-03-08 22:35:04 -05:00
Crazylemon64
38dc304e54 Adds nitpick and allows for transformer rotation
No actual sprites for the latter, so it's kind of doofy, but oops
2017-03-08 19:04:19 -08:00
Fox McCloud
060c419689 Merge pull request #6575 from FlattestGuitar/magistrate
Buffs Magistrate 👌
2017-03-08 20:33:29 -05:00
Luthix
01b1668470 Add toxins launch area 2017-03-08 14:40:41 -07:00
Crazylemon64
a4cc899128 Addresses Tiger's concern, adds gene template applier 2017-03-08 06:18:29 -08:00
Crazylemon64
869c9b76c4 Streamlines the ghost-to-player creation process
Also refactors ERT equipment to be actual outfits instead of hardcoded
2017-03-08 05:49:49 -08:00
Markolie
8ed466955e Surgery toolspeed changes 2017-03-08 10:46:43 +01:00
Markolie
acab5d5170 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz
# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/game/objects/items/weapons/storage/uplink_kits.dm
#	code/game/objects/items/weapons/storage/wallets.dm
2017-03-08 10:45:16 +01:00
Markolie
cd713af875 Fix dir 2017-03-08 10:36:11 +01:00
Crazy Lemon
6e7338a573 Merge pull request #6688 from Allfd/bible
Makes bible farting less predictable
2017-03-08 00:24:44 -08:00
Fox McCloud
aa6e25a7f3 Merge pull request #6648 from Kyep/event_rebalance
Tweaks Event Odds
2017-03-08 01:02:02 -05:00
Kyep
689f515388 Changed Traders chance back to 0 2017-03-07 21:41:18 -08:00
Fox McCloud
f96c335d1f Merge pull request #6704 from uraniummeltdown/hardsuit
Rename all "rigs" (hardsuits) to hardsuits
2017-03-07 23:35:07 -05:00
Fox McCloud
c973875b95 Merge pull request #6675 from Crazylemon64/monster_allocator_port
Ports Monster's finishing of the space allocator
2017-03-07 23:21:50 -05:00
Crazy Lemon
fc272c33be Merge pull request #6700 from Fox-McCloud/money-money-money
Refactors Money
2017-03-07 20:04:29 -08:00
Fox McCloud
5a9ff41464 Merge pull request #6591 from Crazylemon64/ipc_power_cord
Replaces the IPC APC grabbing thing with a power cord and lets IPCs be genderless
2017-03-07 22:25:11 -05:00
Fox McCloud
98ca147802 Merge pull request #6687 from MarsM0nd/Cult-boots
Cult shoes
2017-03-07 22:22:05 -05:00
Markolie
9594ec245b Change CE belt path to /full with tools 2017-03-07 18:16:30 +01:00
Markolie
2c23fbe34d Forgot to commit tools 2017-03-07 18:14:04 +01:00
Markolie
32b8158796 Increase Jaws of Life door open time from 5 to 10 seconds 2017-03-07 18:13:13 +01:00
uraniummeltdown
dc6f9f5506 rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands 2017-03-07 20:55:43 +04:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Mars
5dd4d6d400 Better equip
replaces if statements with checked equip.
2017-03-07 10:39:33 +01:00
Jike
041c573f42 Makes carrot wedges available through the processor instead of cutting with a knife 2017-03-06 18:15:47 -04:30
Markolie
3b73053bc4 Tool fixes 2017-03-06 20:46:24 +01:00
Markolie
ceb14ef15d Fix NODROP interaction with secure closets 2017-03-06 13:34:05 +01:00
Markolie
2c8ca5079f Comments 2017-03-06 13:07:13 +01:00
Markolie
15c96df7d2 Comments 2017-03-06 13:03:59 +01:00
Fox-McCloud
41d4c83f17 Refactors Money 2017-03-06 04:52:03 -05:00
Markolie
960b1206bd Fix wire path 2017-03-05 23:36:18 +01:00
Markolie
5989862d37 Fix space 2017-03-05 23:30:41 +01:00
Markolie
44e8080de2 Fix design names 2017-03-05 23:05:19 +01:00
Markolie
9ec1400ae1 Fix comments 2017-03-05 23:04:41 +01:00
Markolie
117d4de209 Fix proc 2017-03-05 20:34:22 +01:00
Markolie
ec699eb27d Add airlock interaction to jaws 2017-03-05 20:31:02 +01:00
Markolie
9aa819eea3 Lets make the medical wrench admin only, because it's basically a /tg/ meme 2017-03-05 20:19:40 +01:00
Markolie
d877ef1de3 Fixes 2017-03-05 20:14:06 +01:00
Markolie
9d9e957df1 Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold 2017-03-05 19:53:20 +01:00