Zuhayr
|
b8e81f31d3
|
Fixes #5595
|
2014-07-14 10:18:37 +09:30 |
|
Zuhayr
|
5f8723352d
|
Merging robot_modules.dm and master controller setup.
|
2014-07-14 09:10:02 +09:30 |
|
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 |
|
Kelenius
|
aad89409de
|
Slime update
|
2014-07-13 17:37:30 +04: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 |
|
mwerezak
|
f5c67f87ab
|
Fixes chargers being a magical source of charge
|
2014-07-12 15:44:21 -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 |
|
Zuhayr
|
6981ca52f4
|
Trying to fix the loadout spawn issue, at least this will make it more informative.
|
2014-07-12 10:35:31 +09:30 |
|
Mark Aherne
|
aaa5ad1002
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
|
2014-07-12 00:42:06 +01:00 |
|
Mark Aherne
|
8b7f73bbfb
|
Remove testing debug messages from nanomanager.
|
2014-07-12 00:39:57 +01:00 |
|
Mark Aherne
|
02a93c8f42
|
Continued work in progress on a major revision of the NanoUI templating system.
|
2014-07-11 23:28:07 +01:00 |
|
DJSnapshot
|
0e5b7dea5b
|
Merge pull request #5565 from Zuhayr/newgear
Custom gear loadouts.
|
2014-07-11 14:40:05 -07:00 |
|
DJSnapshot
|
ae45545dc8
|
Merge pull request #5567 from Zuhayr/robots
Robot module changes.
|
2014-07-11 14:19:36 -07:00 |
|
mwerezak
|
7c0541da5e
|
Cleans up SM temp change using thermal energy
|
2014-07-11 15:18:16 -04:00 |
|
mwerezak
|
f2a74327fb
|
R&D Server heat production and power usage
|
2014-07-11 15:14:54 -04:00 |
|
Mark Aherne
|
6c12d62285
|
Merge branch 'dev' of https://github.com/Faerdan/Baystation12 into dev
|
2014-07-11 10:53:08 +01:00 |
|
Mark Aherne
|
7e7e6cd8ac
|
Continued work in progress on a major revision of the NanoUI templating system.
|
2014-07-11 10:48:42 +01:00 |
|
Walter0o
|
b6856eac8b
|
can't trust players with anything
|
2014-07-11 09:19:23 +02: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 |
|
Zuhayr
|
d2c57115ed
|
Added glass to the engineering module.
|
2014-07-11 13:55:21 +09:30 |
|
Zuhayr
|
0d21889bee
|
Fixed some bugs, did some testing, moved some procs around for robot functionality.
|
2014-07-11 13:50:34 +09:30 |
|
Zuhayr
|
8f09c557f9
|
Added paperwork handler, clerical gripper, some other tweaks.
|
2014-07-11 13:12:01 +09:30 |
|
Zuhayr
|
70ba371658
|
Merge resolution.
|
2014-07-11 12:47:16 +09:30 |
|
Zuhayr
|
55d52ef1f4
|
Cleaned up a little oversight.
|
2014-07-11 12:25:08 +09:30 |
|
Zuhayr
|
3955edd04b
|
Final touches for loadout system.
|
2014-07-11 12:16:08 +09:30 |
|
Zuhayr
|
903679bd79
|
More work on gear loadouts.
|
2014-07-11 11:47:53 +09:30 |
|
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 |
|
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
|
0ff5d021de
|
fixes #5449
missing variable updating lead to APCs stuck in green status during powersinks.
|
2014-07-10 18:21:00 +02:00 |
|
Zuhayr
|
85b1bbe041
|
Merging work into dev.
|
2014-07-10 20:25:07 +09:30 |
|
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
|
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 |
|
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
|
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 |
|