cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 09:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,200 Commits 2 Branches 1 Tag
c3d0f7e2dd5a411bea453b54e8c20c8cf564aedc
Commit Graph

2046 Commits

Author SHA1 Message Date
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
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
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
Anewbe
867c0ba2f4 Merge pull request #2972 from Yoshax/vending 
Vending machine logging
 2017-01-31 20:48:26 -06:00
Anewbe
dd38e42dc5 Ahelp take button 2017-01-31 15:27:07 -06:00
Yoshax
336df49d35 changelog 2017-01-30 23:59:13 +00:00
Anewbe
ccfbd7c9ac Mining outpost camera console should work now 2017-01-29 15:25:53 -06:00
MagmaRam
5401dfe3bd Changelog updates 2017-01-28 21:37:18 -06:00
Anewbe
fa0096e6c0 Fixes some things that should make mining more interesting 2017-01-28 19:35:48 -06:00
Anewbe
f924f5ef05 Diona can regrow limbs 2017-01-27 23:47:44 -06:00
Anewbe
b50190d762 Merge pull request #2934 from Anewbe/char_reset 
Ports Bay's character resets
 2017-01-27 20:44:54 -06:00
Anewbe
09ce761931 Adds Medical and Meson Aviators 2017-01-26 22:25:37 -06:00
Anewbe
1b294ed8a4 Medical hardsuit sprint 2017-01-25 22:43:53 -06:00
MagmaRam
ea60c5144c Changelog update 2017-01-23 18:22:23 -06:00
Anewbe
8832fe647e Merge pull request #2948 from Anewbe/firedoor_access 
More people can open firedoors
 2017-01-21 22:38:33 -05:00
Anewbe
3be442e766 Merge pull request #2947 from Anewbe/surgery_things 
Surgical tools will no longer cause damage on help intent
 2017-01-21 22:38:25 -05:00
Anewbe
01afb9d170 More people can open firedoors 2017-01-21 21:19:52 -06:00
Anewbe
ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Anewbe
d3607df788 Prosthetic organs have sprites and take emp damage properly 2017-01-21 16:04:43 -06:00
Anewbe
cacdd56366 Merge pull request #2938 from Anewbe/chaplain_hoodie 
Hood tweaks
 2017-01-18 21:40:10 -05:00
Anewbe
c71007fa58 Xenotaser should work now 2017-01-18 17:47:38 -06:00
Anewbe
fda82d4b17 Hood tweaks 2017-01-18 17:02:01 -06:00
Anewbe
9a451c826e Human mobs spawn in with a random amount of nutrition 2017-01-17 23:07:17 -06:00
Anewbe
81c8570ba8 Merge pull request #2904 from Anewbe/theUnboxingBegins 
Returns the Vox, who now breath Phoron
 2017-01-17 23:49:14 -05:00
Anewbe
d53cfc4773 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins 
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi
 2017-01-17 22:05:38 -06:00
Anewbe
5b1fc48712 Ports Bay's character resets 2017-01-16 19:02:41 -06:00
Anewbe
c805befca6 Breath mask action button 2017-01-16 18:14:35 -06:00
Anewbe
14a59686c3 Merge pull request #2926 from Anewbe/custodial_tweaks 
Ports Bay's custodial bag tweaks
 2017-01-15 18:54:02 -05:00
Anewbe
3b95575da6 Merge pull request #2924 from Anewbe/language_things 
Bay Ports, mostly Languages
 2017-01-15 18:53:54 -05:00
Anewbe
4521a6a2c0 Merge pull request #2922 from Anewbe/crate_event 
Ports Bay's Shipping Error event
 2017-01-15 18:17:02 -05:00