Chinsky
74f898a1a2
Merge pull request #3809 from DJSnapshot/antag
...
Fix for sunglasses and Night Vision Goggles
2013-10-23 21:58:44 -07:00
DJSnapshot
5f7ee54430
Fix for sunglasses and night vision goggles
2013-10-23 19:51:01 -07:00
Segrain
1d1d611087
Quillsfix.
2013-10-17 03:51:56 +03:00
Michael Johnson
e285ffd698
Fixed respawn timer issues
2013-10-13 10:35:15 -04:00
jack-fractal
6ecab0bc36
- implementing Mloc's suggestions.
...
- fixing the changelog
2013-10-11 13:29:33 -04:00
jack-fractal
32c3f27675
* adding a 'rejuvinate' function to organs that fixes all types of damage
...
* adding a 'restore_all_organs' function to living creatures
* adding a 'restore_blood_loss' function to humans
* fixing changeling stasis power to heal organ and blood damage
* fixing adming rejuvinate verb to fix organ and blood damage
2013-10-11 12:39:54 -04:00
Segrain
367c1cf4f4
Better check.
2013-10-11 11:10:27 +03:00
Segrain
775d723f68
Typecheck.
2013-10-11 10:21:14 +03:00
Segrain
17f38e109d
Missing language.
2013-10-11 10:16:46 +03:00
Segrain
a4793fd208
Typo fix.
2013-10-11 10:08:04 +03:00
Mloc-Argent
65f218ee63
Merge branch 'master' into dev-freeze
...
Conflicts:
code/ZAS/Fire.dm
html/changelog.html
maps/tgstation2.dmm
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-08 22:01:16 +01:00
Chinsky
82bd221aa3
Fix for #3667
2013-10-01 01:15:02 +04:00
Chinsky
8eb2f7db67
Fix for #3686
...
Thign now drops all stuff before turning into a tree.
2013-09-30 23:12:50 +04:00
Chinsky
b87669f592
Fix foe #3713
...
Megaphones will have to be fixed separately, since they are on dev branch.
2013-09-30 20:49:44 +04:00
DJSnapshot
6d3caf78a6
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bugfix
2013-09-26 22:34:51 -07:00
DJSnapshot
8a83008e62
bugfix for custom AI sprites.
2013-09-26 22:32:23 -07:00
Mloc-Argent
e9bf414820
Refactors code to work with BYOND 500.
...
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
/obj/item/color is now item_color
/obj/atmospherics/color is now pipe_color
simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-22 12:39:48 +01:00
Segrain
a24fd41829
Fixes for typos.
2013-09-19 08:37:29 +03:00
Segrain
0b661bc854
Fixes for stacks.
2013-09-19 08:34:38 +03:00
Segrain
35621466e1
Merge conflict fix.
2013-09-14 22:49:11 +03:00
Segrain
91068e31c8
Falling fix.
2013-09-13 19:45:22 +03:00
Segrain
3dd5b22ae7
Fix for #3662 .
2013-09-13 19:24:25 +03:00
SkyMarshal
92f389546b
Removes the gas mask filtering stuff from gas mixtures. Moved it into the relevant "life" code.
2013-09-11 12:09:23 -07:00
Zuhayr
7ab7a61812
Merge resolution, using dev-freeze map.
2013-09-09 21:59:47 -07:00
Zuhayr
161ec9ab98
Minor language token fix.
2013-09-09 21:52:23 -07:00
Zuhayr
55865f7b1e
Added key to Check Languages.
2013-09-09 21:51:04 -07:00
Zuhayr
a5234383e1
Check Language verb.
2013-09-09 21:50:52 -07:00
Zuhayr
b0d7a95189
Merge pull request #3644 from DJSnapshot/master
...
Gave mods dsay command and unique dsay identifier
2013-09-03 22:46:39 -07:00
Zuhayr
1b6d76f004
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-09-03 23:46:04 -07:00
Zuhayr
3019942102
Minor language token fix.
2013-09-03 23:40:07 -07:00
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
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
Erthilo
afcfed02bd
Moved gas_filter_strength out of clothing and into gas masks.
2013-09-02 17:38:42 +01: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
a4829a271e
Gas mask filters Plasma and N2O.
2013-09-01 20:51:19 +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
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
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
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
a7f1b50f1b
Fixes reagent and throw logging.
2013-08-30 00:38:10 +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
74c3975ae3
Fixes shock going up too much.
2013-08-28 19:43:36 +01: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
4d928843b1
Merge pull request #3609 from Zuhayr/dev
...
Stuff from dev-freeze.
2013-08-28 10:40:58 -07:00
Erthilo
0219ffe41e
Pull damage, with harsher damage in crit. Soft crit now at 0 health, you no longer suffocate in softcrit. Being between 0 to -50 health will cause you to go into shock. Below that you pass out and stop breathing. Stasis bags clone damage reduced to stop people dieing in them so much.
2013-08-28 17:38:21 +01:00
Erthilo
3fbdc99079
Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.
2013-08-28 03:33:04 +01:00
