Commit Graph

14378 Commits

Author SHA1 Message Date
Erthilo
a4829a271e Gas mask filters Plasma and N2O. 2013-09-01 20:51:19 +01:00
Erthilo
469cc55020 Readjusts pill chems due to overdose. Adds pill dissolve logging. 2013-09-01 20:47:54 +01:00
Erthilo
d576997bfa Fuel tanks explode from fire. 2013-09-01 20:10:25 +01:00
Erthilo
235e09d2b9 Changed icon path for custom items due to compile times. 2013-09-01 13:24:38 +01:00
Erthilo
74c19d4ec8 Added vacuum flask to bar. 2013-09-01 13:24:13 +01:00
Erthilo
4f4fb38baf Changed pin to a 4 digit number. Game year standardised to this year +544. 2013-09-01 13:23:23 +01:00
Erthilo
069a9bf6a4 Adds more flashlights to the brig. 2013-09-01 00:39:06 +01:00
Erthilo
5d1c4548fa Cell.use checks instead of just minuses. Yay for code! 2013-09-01 00:16:11 +01:00
Erthilo
f31185e052 Robot Analyzer. Health analyzer for robots. 2013-09-01 00:15:47 +01:00
Erthilo
961ebcec35 Added Megaphones to all Heads offices. 2013-08-31 22:14:31 +01:00
Erthilo
dc5781f05b Officers can be set as rev. 2013-08-31 22:13:59 +01:00
Erthilo
b69c3b2ee4 Change hailer to hearable message. 2013-08-31 22:11:24 +01:00
Erthilo
03b716e0cd Adds delay to eye dropper. 2013-08-31 22:10:52 +01:00
Erthilo
1992a10b52 More attempts at string limit string reduction. 2013-08-31 20:13:03 +01:00
Erthilo
eb318ec861 Species now have individual punch damages. 2013-08-31 20:12:40 +01:00
Erthilo
547c1e670d Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work. 2013-08-31 20:12:19 +01:00
Erthilo
6a69f1b954 Unticked files to deal with string limit. 2013-08-31 19:56:29 +01:00
Erthilo
d0c71c8dc2 Moved maptools to tool/mapmerge. Added midi2piano and AddToChangelog. 2013-08-31 19:10:02 +01:00
Mloc
964d94cd82 Merge pull request #3622 from Erthilo/dev
Merging Dev-Freeze and Master into Dev
2013-08-31 09:54:03 -07:00
Erthilo
bc779a1eeb Indentation compile fix. 2013-08-31 17:49:07 +01:00
Erthilo
b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm
2013-08-31 17:45:31 +01:00
Erthilo
3dd21206f0 Merge branch 'dev-freeze' of git://github.com/Baystation12/Baystation12 into dev 2013-08-31 17:43:01 +01:00
Mloc
2454d72233 Merge pull request #3620 from Segrain/master
Bugfix.
2013-08-31 08:07:26 -07:00
Mloc
05e4ee55c3 Merge pull request #3618 from Erthilo/dev
Comments out preload_vox() as it causes long delays with initial start window and subsequent windows when first logged in.
2013-08-31 08:07:11 -07:00
Zuhayr
c114f18e37 Merge pull request #3619 from Erthilo/master
Fixes reagent and throw logging.
2013-08-29 20:38:13 -07:00
Segrain
7dae19a3f9 Fix for #3498. 2013-08-30 04:40:39 +03:00
Erthilo
a7f1b50f1b Fixes reagent and throw logging. 2013-08-30 00:38:10 +01:00
Albert Iordache
ba02e4725b Merge pull request #3616 from Mloc/master
made zburn/firelevel more predictable.  Probably won't change much ingam...
2013-08-29 14:12:44 -07:00
Erthilo
4f6948885c Comments out preload_vox() as it causes long delays with initial start window and subsequent windows when first logged in. 2013-08-29 22:08:11 +01:00
Mloc-Argent
d2d08208a8 made zburn/firelevel more predictable. Probably won't change much ingame, but it's a start.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-29 22:06:27 +01:00
Zuhayr
b1761fe1ac Merge pull request #3615 from Mloc/mapfixo
Moved atmospherics control computer into atmos proper.
2013-08-29 07:02:41 -07:00
Mloc-Argent
62c14facc4 Moved atmospherics control computer into atmos proper.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-29 15:01:54 +01:00
Mloc
15b0fc24a3 Merge pull request #3611 from Erthilo/dev
Medical tweaks, fixes, admin secrets
2013-08-29 03:51:09 -07:00
Erthilo
ee55069d59 Example of softcrit config 2013-08-29 09:52:42 +01:00
Zuhayr
0803db44b2 Merge pull request #3612 from Faerdan/dev
Added Nano UI Chemistry Dispenser plus misc Nano tweaks/fixes.
2013-08-28 19:08:03 -07:00
Mloc
7a39dc078f Merge pull request #3613 from Segrain/master
Tinyfix.
2013-08-28 15:35:27 -07:00
Segrain
8d1fdd87b3 Typecheck fix. 2013-08-29 02:24:40 +03:00
Mark Aherne (Faerdan)
9cb0b79d78 Fixed issue with links/buttons not working until first update. 2013-08-28 22:20:13 +01:00
Erthilo
c483d58e34 Renabled admin secrets, as they are are admin only. 2013-08-28 19:44:02 +01:00
Erthilo
74c3975ae3 Fixes shock going up too much. 2013-08-28 19:43:36 +01:00
Zuhayr
3762fcc4a8 Merge pull request #3610 from Mloc/master
Space no longer freezes mobs.
2013-08-28 10:48:57 -07:00
Mloc-Argent
9fed22c056 Space no longer freezes mobs.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-28 18:49:00 +01:00
Mloc
e923094203 Merge pull request #3608 from Zuhayr/dev-freeze
Tajaran hardsuit.
2013-08-28 10:41:34 -07:00
Zuhayr
b6912d292c Added light to previous commit. 2013-08-29 03:38:52 -07:00
Zuhayr
1e61b2e250 Tajaran hardsuit icons. 2013-08-29 03:12:03 -07:00
Zuhayr
3e13680498 Tajaran hardsuit code. 2013-08-29 03:11:55 -07:00
Zuhayr
e7d7a63177 Type of unathi breacher fixed. 2013-08-29 00:42:40 -07:00
Zuhayr
99b57c1a8e Skrell suit sprite fix, oops. 2013-08-29 00:41:47 -07:00
Zuhayr
5f1f54f296 Forgot an exclude. 2013-08-29 00:39:13 -07:00
Zuhayr
36fa588df5 Unrestricted sandals, clown shoes, galoshes. 2013-08-29 00:38:00 -07:00