Commit Graph

13711 Commits

Author SHA1 Message Date
mwerezak
d6a070e6fc Improved full body scanner infection readout
Now provides a higher level of precision on infection severity.
2014-07-16 15:44:16 -04:00
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
43cc7cf39a Space law -> Corporate regs in captain.dm 2014-07-13 13:48:13 -07:00
DJSnapshot
aa2ea04c27 space law -> Corporate regs in skills 2014-07-13 13:47:07 -07:00
DJSnapshot
743ac61155 Little Slip-up 2014-07-13 13:30:36 -07:00
DJSnapshot
5063178aa6 Changed URL to Corporate Regulations 2014-07-13 13:29:19 -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
Chinsky
4e371f7af7 Merge pull request #5585 from SparklySheep/patch-3
Fuk da law
2014-07-13 08:56:54 +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
SparklySheep
55c7fbe739 Changes Space Law book to Corporate Regulations
Because fuck anyone that thinks "Space Law" is a good name for a roleplaying server.
2014-07-12 10:26:54 -05:00
mwerezak
835f9e52f6 Fixes webbing and holsters shielding EMP 2014-07-12 02:56:32 -04:00
mwerezak
d1fc362032 Doors now retry if they fail to complete commands 2014-07-11 11:51:45 -04:00
mwerezak
008981c831 Moves misplaced var from airlock_control.dm
Moved explosion_resistance from airlock_control.dm to airlock.dm proper.
2014-07-11 10:29:52 -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
fdfbbc766c Merge pull request #5557 from Walter0o/laptop_fix
fixes #5548 and #5521, missing computer3 checks
2014-07-10 23:34:24 -05:00
Ccomp5950
f66d0cf38f Merge pull request #5558 from Walter0o/apc_fix
fixes #5449
2014-07-10 18:48:24 -05:00
Ccomp5950
48630cfa3e Merge pull request #5514 from JimTheCactus/master
Patched PDA scanner to be more useful
2014-07-10 18:48:07 -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
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
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
d0b5f03f71 Merge pull request #5542 from mwerezak/speech-synth
Alternative proposal to PR #5541
2014-07-10 01:03:58 -05: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