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
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
9e17473f62
Uncomments books. Generifies mentions of tg or baystation.
2013-09-02 18:24:11 +01:00
8f3d303e45
Bicaridine slows but does not stop internal bleeding.
2013-09-02 17:53:28 +01:00
88a45d3cbf
Job whitelist fix.
2013-09-02 17:51:49 +01:00
3662725155
Fixes for monkeycubes.
2013-09-02 17:44:47 +01:00
afcfed02bd
Moved gas_filter_strength out of clothing and into gas masks.
2013-09-02 17:38:42 +01:00
37acbe9bf7
Fuel tanks uses explode() proc.
2013-09-02 16:10:43 +01:00
c08746206f
Merge branch 'dev' of git://github.com/Baystation12/Baystation12 into dev
2013-09-02 12:24:55 +01:00
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
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
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
44540ab61f
Recommitting PA sprites by Flash Kirby.
2013-09-01 21:10:39 +01:00
a4829a271e
Gas mask filters Plasma and N2O.
2013-09-01 20:51:19 +01:00
469cc55020
Readjusts pill chems due to overdose. Adds pill dissolve logging.
2013-09-01 20:47:54 +01:00
d576997bfa
Fuel tanks explode from fire.
2013-09-01 20:10:25 +01:00
235e09d2b9
Changed icon path for custom items due to compile times.
2013-09-01 13:24:38 +01:00
74c19d4ec8
Added vacuum flask to bar.
2013-09-01 13:24:13 +01:00
4f4fb38baf
Changed pin to a 4 digit number. Game year standardised to this year +544.
2013-09-01 13:23:23 +01:00
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
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
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
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
5d1c4548fa
Cell.use checks instead of just minuses. Yay for code!
2013-09-01 00:16:11 +01:00
f31185e052
Robot Analyzer. Health analyzer for robots.
2013-09-01 00:15:47 +01:00
03b716e0cd
Adds delay to eye dropper.
2013-08-31 22:10:52 +01:00
1992a10b52
More attempts at string limit string reduction.
2013-08-31 20:13:03 +01:00
eb318ec861
Species now have individual punch damages.
2013-08-31 20:12:40 +01:00
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
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
a7f1b50f1b
Fixes reagent and throw logging.
2013-08-30 00:38:10 +01:00
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
15b0fc24a3
Merge pull request #3611 from Erthilo/dev
...
Medical tweaks, fixes, admin secrets
2013-08-29 03:51:09 -07:00
cf829c3cd6
It is now possible to create multiple pills at once in the Chemmaster
2013-08-29 09:55:35 +02:00
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
9cb0b79d78
Fixed issue with links/buttons not working until first update.
2013-08-28 22:20:13 +01:00
c483d58e34
Renabled admin secrets, as they are are admin only.
2013-08-28 19:44:02 +01:00
74c3975ae3
Fixes shock going up too much.
2013-08-28 19:43:36 +01:00
9fed22c056
Space no longer freezes mobs.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-28 18:49:00 +01:00
4d928843b1
Merge pull request #3609 from Zuhayr/dev
...
Stuff from dev-freeze.
2013-08-28 10:40:58 -07:00
b6912d292c
Added light to previous commit.
2013-08-29 03:38:52 -07:00
3e13680498
Tajaran hardsuit code.
2013-08-29 03:11:55 -07:00
e7d7a63177
Type of unathi breacher fixed.
2013-08-29 00:42:40 -07:00
99b57c1a8e
Skrell suit sprite fix, oops.
2013-08-29 00:41:47 -07:00
5f1f54f296
Forgot an exclude.
2013-08-29 00:39:13 -07:00
36fa588df5
Unrestricted sandals, clown shoes, galoshes.
2013-08-29 00:38:00 -07:00
fb7ca1348c
Added species restrictions to hardsuits, shoes, helmets. Added Skrellian hardsuits and helmets.
2013-08-29 00:35:41 -07:00
f378dfa350
Species type check for clothing adjustment.
2013-08-29 00:03:16 -07:00
dabd0866a2
As above.
2013-08-28 23:34:12 -07:00
1b41e4a582
Security item fixes, sprite fixes.
2013-08-28 23:33:46 -07:00
Erthilo