Ccomp5950
67bf27e6f4
Merge pull request #5602 from Hubblenaut/food
...
Grid Placement for Food
2014-07-15 01:22:47 -05:00
Hubblenaut
c920b0234f
Renames CoM into center_of_mass
2014-07-14 23:13:46 +02:00
Whitellama
60bc22e829
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-07-13 23:24:32 -07:00
Whitellama
a6b4f5d2aa
Fixed issues with cans complaining twice when trying to drink unopened and with transfering fluids between closed cans
2014-07-13 23:23:26 -07:00
Zuhayr
16c1494d7f
Merge pull request #5613 from comma/master
...
Fixes #5563
2014-07-14 15:49:19 +09:30
Chinsky
bb6eedf193
Fixes #5563
2014-07-14 08:28:14 +04:00
Ccomp5950
2ec293f67e
Merge pull request #5587 from SparklySheep/patch-4
...
Detective Revolver nerf. Uses agony instead of...
2014-07-13 23:16:18 -05:00
Chinsky
d59e5b8da2
Merge pull request #5603 from DJSnapshot/hotfix
...
Changing URL of Corporate Regulations to the new Corporate Regulations
2014-07-14 07:12:37 +04:00
DJSnapshot
aa2ea04c27
space law -> Corporate regs in skills
2014-07-13 13:47:07 -07:00
Hubblenaut
b7778ff420
Fixes merge conflict
2014-07-13 21:35:31 +02:00
Hubblenaut
31637edf76
Introduces function for exact item placement of food and applies it to each food item in the game
2014-07-13 19:37:33 +02:00
Chinsky
f84697dad0
Merge pull request #5581 from mwerezak/accessory-emp-fix
...
Fixes accessories attached to a jumpsuit not being affected by EMP
2014-07-13 08:57:08 +04:00
mwerezak
1502799afd
Fixes germ levels going below zero
2014-07-12 16:18:29 -04:00
mwerezak
c0487b9c90
Fixes human internal organs list
2014-07-12 16:15:37 -04:00
SparklySheep
83ec2c5d80
Readjusted agony of weakbullet.
2014-07-12 12:06:43 -05:00
SparklySheep
acb5dfbbe3
Detective Revolver nerf. Uses agony instead of...
...
stun and weaken. Also changed the shotgun's stunshot to be a very powerful agony based shotgun shell. Beanbags are not for combat, stunshots are.
2014-07-12 11:50:16 -05:00
mwerezak
835f9e52f6
Fixes webbing and holsters shielding EMP
2014-07-12 02:56:32 -04:00
Ccomp5950
e44bcf81fe
Merge pull request #5559 from Walter0o/deadly_fork_fix
...
deadly sharp w_class 1 fix
2014-07-10 23:40:25 -05:00
Ccomp5950
f66d0cf38f
Merge pull request #5558 from Walter0o/apc_fix
...
fixes #5449
2014-07-10 18:48:24 -05:00
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
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
0ff5d021de
fixes #5449
...
missing variable updating lead to APCs stuck in green status during powersinks.
2014-07-10 18:21:00 +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
d0b5f03f71
Merge pull request #5542 from mwerezak/speech-synth
...
Alternative proposal to PR #5541
2014-07-10 01:03:58 -05: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
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
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
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
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
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
mwerezak
a4c9f31b49
Fixes #5532 and increases the time required for organs to become infected from wounds
...
Also removes the now unnecessary get_cure_threshold() proc, caps the
rate at which an organ can receive germs from wounds, and makes germs
spread from external to internal organs happen one organ at a time
instead of all at once.
2014-07-07 17:01:15 -04:00
Mloc
a00f6a40c8
Merge pull request #5510 from GinjaNinja32/changeui
...
Fix Change UI verb
2014-07-07 13:42:33 +01:00
mwerezak
88f3618e9f
Required spaceacillin levels no longer scale
...
The amount of spaceacillin required to stop infections is now a flat 5
units, instead of scaling with germ_level.
2014-07-06 15:53:41 -04:00
