16446 Commits

Author	SHA1	Message	Date
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
Zuhayr	a0291b0d7a	Fixes #5485	2014-07-14 12:51:30 +09:30
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
Zuhayr	338602ee18	Fixes #5531	2014-07-14 12:41:10 +09:30
Zuhayr	a2a5991bae	Fixes #5523	2014-07-14 12:23:28 +09:30
Zuhayr	d8ff5d8ac6	Fixes #5508	2014-07-14 12:16:02 +09:30
Zuhayr	bc2f91b4e4	Fixes #5608	2014-07-14 12:02:48 +09:30
Zuhayr	2c634a8d7a	Fixes #5611	2014-07-14 12:00:15 +09:30
Zuhayr	2b9b9b7a7d	Fixes #5573	2014-07-14 11:50:16 +09:30
Zuhayr	8e13ce799d	Bandaid fix for #5589	2014-07-14 11:42:39 +09:30
Zuhayr	4f032ef7f4	Fixes #5600	2014-07-14 10:43:47 +09:30
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	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
mwerezak	05fc761fd4	Adds NanoUI for gas pumps showing loading level	2014-07-13 12:39:48 -04:00
mwerezak	57b5b1d13e	Cleans up pump power usage	2014-07-13 11:00:15 -04: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
Chinsky	4e371f7af7	Merge pull request #5585 from SparklySheep/patch-3 ... Fuk da law	2014-07-13 08:56:54 +04:00
mwerezak	1edd2ccc3a	Merge branch 'sackur-tetrode' into power-net	2014-07-12 20:13:42 -04:00
mwerezak	7e65984ae2	Implements pump power draw	2014-07-12 20:09:41 -04:00
mwerezak	3fb3efe401	Adds a gas entropy system for pumps	2014-07-12 20:09: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	77d9c20be4	Adjusts charger power rates	2014-07-12 15:49:24 -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
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	06ce667eef	Fixes cyborg recharger not using CELLRATE	2014-07-12 10:49:02 -04:00
Mark Aherne	b22421eb05	Correct pregame_timeleft from my debug value 20 to production value 180.	2014-07-12 10:27:15 +01:00
DJSnapshot	f8d0e02b83	Nerf on sound distance.	2014-07-12 00:36:13 -07:00
mwerezak	835f9e52f6	Fixes webbing and holsters shielding EMP	2014-07-12 02:56:32 -04:00
mwerezak	c31a8e11eb	Adjusts airlock power usage	2014-07-12 02:53:42 -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
Zuhayr	6632cf7be0	Removes alarm sound from air alarm.	2014-07-12 09:23:39 +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	fa1f587939	Fixes some compile errors	2014-07-11 17:04:14 -04:00
mwerezak	7c0541da5e	Cleans up SM temp change using thermal energy	2014-07-11 15:18:16 -04:00