Commit Graph

2075 Commits

Author SHA1 Message Date
Anewbe 53388aced3 Merge pull request #3182 from MagmaRam/changelog
Changelog update
2017-03-30 20:14:47 -05:00
MagmaRam f7ea017bc2 Changelog update 2017-03-30 19:41:14 -05:00
Anewbe 6328f1262f Adds in Jumper Cables for FBP reviving 2017-03-29 12:43:38 -05:00
MagmaRam d98745d9d3 Merge pull request #3169 from Anewbe/italics_switch
Italics switch from / to | characters
2017-03-28 21:54:23 -05:00
Anewbe b34aefb814 Merge pull request #3168 from MagmaRam/robit_grinders
Robots, cyborgs, etc can now use grinders in the kitchen and chemlab
2017-03-28 21:26:46 -05:00
Anewbe cdf69e0eec Italics switch from / to | characters 2017-03-28 21:13:46 -05:00
MagmaRam a3c83ac025 Robots, cyborgs, etc can now use grinders in the kitchen and chemlab 2017-03-28 20:47:38 -05:00
MagmaRam 5c25a088f1 Changelog update 2017-03-28 20:12:20 -05:00
MagmaRam 33dffeb0b8 Merge pull request #2955 from Anewbe/heart_damage
Big Ol' Medical Tweaks
2017-03-28 20:02:24 -05:00
Anewbe b1620cfa20 Borgs can climb 2017-03-27 23:15:13 -05:00
Neerti eb73ee4b44 Merge pull request #3120 from Anewbe/alien_tweaks
Xeno race tweaks
2017-03-25 11:27:22 -04:00
Anewbe 3c1d897fc4 Actually gets the HI name right 2017-03-24 15:27:55 -05:00
MagmaRam daa93cdc50 Name fix 2017-03-24 12:15:29 -05:00
MagmaRam 2867b63c04 Updates changelog 2017-03-22 19:10:56 -05:00
Anewbe 2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
Anewbe 68a335b0c5 Xeno race tweaks 2017-03-21 23:31:10 -05:00
Anewbe f16c6e22a7 Merge pull request #3115 from Atermonera/Emotes_don't_autohiss
Emotes, sign language, and EAL no longer activate autohiss
2017-03-21 18:38:04 -05:00
Atermonera 78c1b51f81 Languages with NO_STUTTER won't use autohiss anymore 2017-03-21 00:13:33 -07:00
Anewbe c65588b099 Communicator QoL 2017-03-21 00:51:26 -05:00
Neerti 7f14550a9a Merge pull request #3010 from Anewbe/cargo_heph
Readds HI prosthetics, corrects naming
2017-03-21 00:27:00 -04:00
Anewbe 4779baf872 Spelling 2017-03-20 20:14:48 -05:00
Atermonera 2d2763fdb0 Merge pull request #2 from PolarisSS13/master
There should probably be a way to do this automagically
2017-03-19 17:09:02 -07:00
Atermonera 530593508a Gives surgeonborgs the full medical hud, because why don't they already have it? 2017-03-19 16:58:53 -07:00
Neerti d4b6fc9f32 Merge pull request #3052 from Anewbe/emp_things
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
Anewbe f4dd443b01 Ports the translator 2017-03-10 21:46:57 -06:00
Neerti fc75357c61 Merge pull request #3054 from Anewbe/healthscanner
Oxyloss shows as cyan
2017-03-06 18:59:27 -05:00
Anewbe b4ec8eb026 Oxyloss shows as cyan 2017-03-05 14:19:51 -06:00
Anewbe d68292b236 Merge pull request #3002 from Anewbe/plant_things
Space Vines are more dangerous
2017-03-05 14:15:13 -06:00
Anewbe 19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Anewbe 81549fc965 Revert "BlockHeadHair doesn't make players bald." 2017-03-03 17:19:07 -06:00
Anewbe a0198fb947 Merge pull request #3022 from VOREStation/infections
Infection code improvement
2017-03-02 19:54:26 -06:00
Anewbe a45ef074bd Merge pull request #3029 from VOREStation/blood
Make blood loss/heart removal make sense
2017-03-02 17:03:44 -06:00
Arokha Sieyes 833e36ea39 Adds a changelog 2017-03-01 16:14:38 -05:00
Arokha Sieyes 06a9dec41a Adds Changelog
Hopefully this is the right way to do this.
2017-03-01 16:11:37 -05:00
Neerti 561f10bced Merge pull request #3013 from Anewbe/lung_cancer
Minor smoking update
2017-02-28 21:28:27 -05:00
Neerti 813a61ef29 Merge pull request #3011 from Anewbe/simple_mob
Tasers can hurt simple mobs
2017-02-28 21:28:07 -05:00
Anewbe dc165906fa Merge pull request #3018 from nachomeep/master
BlockHeadHair doesn't make players bald.
2017-02-28 19:51:42 -06:00
nachomeep cdb6c32c91 Fixes a few things, adds changelog. 2017-02-25 10:18:10 -05:00
MagmaRam d237050aa6 Hopefully this one works 2017-02-24 18:22:38 -06:00
Anewbe a85e170ce4 Minor smoking update 2017-02-24 17:15:38 -06:00
Anewbe d1e7c37a8c Tasers can hurt simple mobs 2017-02-23 18:24:13 -06:00
Anewbe 9d6a11e17d Readds HI prosthetics, corrects naming 2017-02-23 14:41:24 -06:00
Anewbe bba014acfa More plant things 2017-02-20 18:32:18 -06:00
Anewbe fae79a7f80 Merge pull request #2996 from MagmaRam/gunshow
Lock-on changes
2017-02-14 17:00:28 -06:00
Anewbe c1008b52cd Merge pull request #2989 from MagmaRam/sandwich
Meat Meat Meat Meat Meat Meat and Fork Sandwich
2017-02-09 21:24:03 -06:00
MagmaRam 9209047b4d Adds changelog 2017-02-06 11:06:52 -06:00
MagmaRam 7993c70819 changelog get 2017-02-06 11:03:56 -06:00
Anewbe 3833a404c7 Antag announcement papertrail 2017-02-05 01:13:07 -06:00
Anewbe f59d8d6c0b Merge pull request #2973 from Anewbe/dibs
Ahelp take button
2017-02-04 23:54:12 -06:00
Anewbe f16ffb890d Merge pull request #2969 from Anewbe/mining_cameras
Mining outpost camera console should work now
2017-02-01 16:21:23 -06:00