Chinsky
18e1489e29
Merge pull request #5547 from Zuhayr/mining
...
Mining rework part 2, rebalance.
2014-07-11 03:46:11 +04:00
Zuhayr
81f27320f3
Removes vox as a spawn race.
2014-07-11 08:52:09 +09:30
igalan
fc3648a523
Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not.
...
This PR comments out the non-edible one and replaces any reference of it to the edible one.
2014-07-10 22:20:13 +01:00
Walter0o
a3cc178ad6
adjusts examine for w_class 1 yankability
2014-07-10 19:58:20 +02:00
Walter0o
10ab66aa40
adjusts verb for w_class 1 yankability
2014-07-10 19:58:16 +02:00
Walter0o
9827838917
shrapnel check for human get_visible_implants()
2014-07-10 19:58:01 +02:00
Walter0o
5289776e33
removes sharpness from forks
...
too commonly available to enjoy the sharp bonus.
2014-07-10 19:47:59 +02:00
Walter0o
0ff5d021de
fixes #5449
...
missing variable updating lead to APCs stuck in green status during powersinks.
2014-07-10 18:21:00 +02:00
Walter0o
a36d0b3ff4
part 3 of fixing #5521
2014-07-10 17:04:27 +02:00
Walter0o
6bff77c0ba
part 2 of fixing #5521
2014-07-10 16:55:38 +02:00
Walter0o
323ced2803
part 1 of fixing #5521
2014-07-10 16:55:23 +02:00
Walter0o
cd0c49ab81
another laptop verb range fix
2014-07-10 16:31:29 +02:00
Walter0o
e1a8e95081
fixes rangecheck on laptop verbs
2014-07-10 16:24:38 +02:00
Zuhayr
85b1bbe041
Merging work into dev.
2014-07-10 20:25:07 +09:30
Walter0o
5b3f7b30c0
fixes #5548
...
missing range check for Alt click on laptops
2014-07-10 12:50:20 +02:00
Zuhayr
d5784c653c
Reapplied scanners to map, stopped braces working on drill turfs with no resources.
2014-07-10 20:13:59 +09:30
Zuhayr
f477d92c37
Merge with master.
2014-07-10 20:05:42 +09:30
Ccomp5950
b3629fed9c
Merge pull request #5546 from Zuhayr/master
...
Adds suit cyclers to the station map.
2014-07-10 01:04:43 -05:00
Ccomp5950
87d907ef8d
Merge pull request #5545 from Zuhayr/dev
...
Added Roaper's custom item, generalized the hardsuit modification kit so...
2014-07-10 01:04:08 -05:00
Ccomp5950
d0b5f03f71
Merge pull request #5542 from mwerezak/speech-synth
...
Alternative proposal to PR #5541
2014-07-10 01:03:58 -05:00
DJSnapshot
eacd384d39
Merge pull request #5554 from Baystation12/master
...
Updating dev with master
2014-07-09 23:00:04 -07:00
Jim the Cactus
c984385adb
Merge branch 'master' of https://github.com/baystation12/baystation12
2014-07-09 14:53:16 -06:00
Zuhayr
f477012ab8
Merge pull request #5533 from mwerezak/wound-infections
...
Fix for #5532 and the last of the infection changes, I hope
2014-07-09 19:28:00 +09:30
Zuhayr
5ace6d3bc0
Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.
2014-07-09 19:12:32 +09:30
Mloc
c7b2aefdc7
Merge pull request #5534 from Hubblenaut/master
...
Fixes painkillers leaving the body way too fast and adds minor feature to health analyzers
2014-07-09 10:41:22 +01:00
Zuhayr
b2033c0825
Adjusted suit cycler code, added cyclers to EVA, Engineering and Mining.
2014-07-09 17:55:25 +09:30
Zuhayr
b583754f3e
Neatened a few oversights with the suit cycler up.
2014-07-09 17:05:54 +09:30
Zuhayr
7c6bec03ae
Added Roaper's custom item, generalized the hardsuit modification kit somewhat, modified Solaruin's custom item accordingly.
2014-07-09 16:58:38 +09:30
Zuhayr
326f3821e1
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-09 15:52:31 +09:30
mwerezak
ffcb068b96
Fixed wrong operator
2014-07-09 00:11:20 -04:00
mwerezak
5e56d09512
Sterilizine reduces germ_level on contact
2014-07-08 18:57:07 -04:00
mwerezak
910ce676b0
Fixes advanced trauma kits claiming to disinfect but not doing so
2014-07-08 18:49:51 -04:00
unknown
dcfbeb0924
Fixes missing length check before pick()
2014-07-08 16:12:55 -04:00
unknown
9297b56b7a
Cyborgs now understand all languages besides vox-pidgin
2014-07-08 16:01:44 -04:00
Zuhayr
8d90c40265
Merge pull request #5537 from Hubblenaut/wheelchair
...
Fixes canmove updating wrongly on movable chairs
2014-07-08 20:54:19 +09:30
Zuhayr
6499385279
Temp commit with robot module work
2014-07-08 19:44:33 +09:30
Hubblenaut
a6e6a8939f
Cleans code up for easier editing
2014-07-08 07:39:49 +02:00
Zuhayr
c239ec432a
Merge pull request #5536 from Ccomp5950/mentor_no_highlight
...
Mentors will no longer see highlighed names in ahelps / msay for players with special roles (Antags, etc.).
2014-07-08 14:55:04 +09:30
John-Michael O'Brien
0e1d549ff1
Update PDA.dm
...
Patched the comment to match the actual, final behavior (Doh!)
2014-07-07 22:57:37 -06:00
mwerezak
4ac685afd9
Removes duplicate defines, updates comments
2014-07-07 23:18:12 -04:00
Hubblenaut
6568533d0d
Fixes canmove updating wrongly on movable chairs
2014-07-08 04:48:21 +02:00
Decius-R
b6c61b5293
Updated rune.dm to switch some options in an alert
...
As per requested.
2014-07-07 22:38:33 -04:00
Ccomp5950
36cf4bd41e
Mentors will no longer see highlighed names in ahelps / msay for players with special roles (Antags, etc.).
2014-07-07 21:37:28 -05:00
Decius
021c48ea02
Added in damage towards people being converted by cult, and fixed a typo...
...
People who are being converted by the cult now take 10 damage in the first
place. Additionally, those who resist take a little bit more damage and get
a fair number of messages showing their great painful resisting and whatnot.
Light and fun.
Signed-off-by: Decius <deciusreln97@gmail.com >
2014-07-07 22:23:20 -04:00
Hubblenaut
6f1759a7aa
Fixes me being dumb with renaming variables
2014-07-08 03:07:22 +02:00
Hubblenaut
d6caeb79d6
Fix: Painkillers stay in body for decent time
2014-07-08 02:47:37 +02:00
Hubblenaut
38ac5ece7c
Health Analyzer can read all types of beneficial medicine
2014-07-08 02:09:53 +02:00
mwerezak
b8a102beb4
Increases cough rate for lung infections
2014-07-07 17:30:19 -04:00
mwerezak
008c5447b7
Tweaks internal organ spread rate
2014-07-07 17:27:01 -04:00
mwerezak
5764d95808
Makes minor wounds harder to infect
2014-07-07 17:19:13 -04:00
