Zuhayr
f3631ba21e
Added key to Check Languages.
2013-09-02 21:43:30 -07:00
Zuhayr
3f36adb002
Check Language verb.
2013-09-02 21:03:30 -07:00
Zuhayr
4d51f2e419
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-09-02 20:46:17 -07:00
Erthilo
3b61ba850f
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
baystation12.dme
code/modules/projectiles/ammunition/bullets.dm
2013-09-02 23:32:33 +01:00
Zuhayr
a8f0d5c4c2
Merged bullets.dm.
2013-09-02 14:16:53 -07:00
Mloc-Argent
72d158143b
Previous commit apparently got swallowed by the git monster.
...
Turns off auto FILE_DIR in .dme, fixes compile error.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-02 21:50:58 +01:00
Erthilo
9e17473f62
Uncomments books. Generifies mentions of tg or baystation.
2013-09-02 18:24:11 +01:00
Erthilo
8f3d303e45
Bicaridine slows but does not stop internal bleeding.
2013-09-02 17:53:28 +01:00
Erthilo
88a45d3cbf
Job whitelist fix.
2013-09-02 17:51:49 +01:00
Erthilo
9633dd9073
Alarm runtime fixes.
2013-09-02 17:45:38 +01:00
Erthilo
1e499d8994
Sleeper adjustments. Cannot inject over 20 units.
2013-09-02 17:45:24 +01:00
Erthilo
3662725155
Fixes for monkeycubes.
2013-09-02 17:44:47 +01:00
Erthilo
afcfed02bd
Moved gas_filter_strength out of clothing and into gas masks.
2013-09-02 17:38:42 +01:00
Erthilo
37acbe9bf7
Fuel tanks uses explode() proc.
2013-09-02 16:10:43 +01:00
Erthilo
0008d649b0
Silent fix for megaphone.
2013-09-02 12:26:06 +01:00
Erthilo
c08746206f
Merge branch 'dev' of git://github.com/Baystation12/Baystation12 into dev
2013-09-02 12:24:55 +01:00
ZipIce
497b050488
Update disease.dm
...
This will remove some run-time errors, allowing disease to work when the mob has no reagents (new players and simple animals).
2013-09-01 23:42:35 -07:00
Mloc-Argent
a084f74c7d
Expansion of every "icon = ''" path.
...
Supposed to help compilation times. Who knows.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-01 21:53:36 +01:00
Erthilo
720d74a0b7
Internal bleeding tweaked. Cryo and Bicaridine will prevent IB from bleeding and getting worse. Bicaridine over 30 units will slowly heal IB. IB cannot be completely healed by bicaridine until 10 minutes after getting IB. Bleeding rate for IB reduced.
2013-09-01 21:31:22 +01:00
Erthilo
c872099e11
Overdose added. Most chemicals over 30 units now cause constant toxic damage. Alcohol tweaked, excessive alcohol is poisonous. Chemistry-Reagents reorganized. Side effects removed. All toxins moved to toxins parent.
2013-09-01 21:23:37 +01:00
Erthilo
44540ab61f
Recommitting PA sprites by Flash Kirby.
2013-09-01 21:10:39 +01:00
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
Zuhayr
46b9d87470
Merge pull request #3621 from alex-gh/multiple_pills
...
It is now possible to create multiple pills at once in the Chemmaster
2013-09-01 04:53:26 -07:00
Zuhayr
1067f083c6
Merge pull request #3625 from Erthilo/dev
...
Megaphones, robot health analyzer, eye dropper delay, rigged cells explode in more scenarios
2013-09-01 04:53:08 -07:00
Zuhayr
332b5fd3e4
Merge pull request #3627 from Faerdan/dev
...
Fixed client side UI failure caused by apostrophes in text.
2013-09-01 04:50:16 -07:00
Mark Aherne (Faerdan)
cffdca9596
Fixed client side UI failure caused by apostrophes in text.
...
Updated the Chem Dispenser UI with an Energy bar.
UIs attached to the Chem Dispenser will now update on recharge(), recharge now recharges 1 every 15 ticks instead of 2 every 30 (to make it feel more fluid).
2013-09-01 00:55:46 +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
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
Mloc
2454d72233
Merge pull request #3620 from Segrain/master
...
Bugfix.
2013-08-31 08:07:26 -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
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
Mloc
15b0fc24a3
Merge pull request #3611 from Erthilo/dev
...
Medical tweaks, fixes, admin secrets
2013-08-29 03:51:09 -07:00
Zuhayr
b6912d292c
Added light to previous commit.
2013-08-29 03:38:52 -07:00
Zuhayr
3e13680498
Tajaran hardsuit code.
2013-08-29 03:11:55 -07:00
