cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,362 Commits 2 Branches 1 Tag
36755f077c94bbdd4db12836ea8c901b39daae86
Commit Graph

1326 Commits

Author SHA1 Message Date
PsiOmega
5bf7158c9d Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys. 
Conflicts:
	html/changelogs/PsiOmegaDelta-Radio.yml
 2015-11-22 21:37:21 -05:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge 
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
 2015-11-06 17:41:18 -05:00
Datraen
994bee3876 Adds Changelog 2015-11-05 18:45:09 -05:00
PsiOmegaDelta
dc4d01cc80 Updates changelog. 2015-11-02 10:09:30 +01:00
Chinsky
1417f4f40b Merge pull request #11344 from Hubblenaut/tape 
Tape - Sprites and Algorithm Changes
 2015-11-02 00:10:03 +03:00
PsiOmegaDelta
9d6c99aaf3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	html/changelogs/.all_changelog.yml
 2015-10-27 13:08:33 +01:00
PsiOmegaDelta
3db2c4fb49 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
 2015-10-27 12:38:28 +01:00
PsiOmegaDelta
8c56aaa372 Updates changelog. 2015-10-27 12:31:18 +01:00
Hubblenaut
f0fac760a4 Updates Changelog 2015-10-22 14:31:09 +02:00
PsiOmegaDelta
52da4a409d Changelog. 2015-10-21 10:41:00 +02:00
PsiOmegaDelta
55f6c1c0b5 Merge pull request #11204 from Hubblenaut/medical 
Bruise Packs, Changes and small Fixes
 2015-10-19 16:17:16 +02:00
Hubblenaut
74244fdbd0 Updates Changelog 2015-10-16 16:36:08 +02:00
Mike
4db9677c88 Fixes pepperspray confusion 
Eye protection now prevents blindness, face protection prevents stun, instead of face protection doing both.
 2015-10-14 14:49:52 -04:00
PsiOmegaDelta
50f137b2e7 Updates changelog. 2015-10-14 08:42:32 +02:00
PsiOmegaDelta
3fd28dd361 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	html/changelogs/.all_changelog.yml
 2015-10-14 08:41:38 +02:00
PsiOmegaDelta
3fd172ee63 Merge pull request #11294 from Baystation12/master 
Dev-freeze
 2015-10-14 08:40:03 +02:00
PsiOmegaDelta
e5ef8d5485 Updates changelog. 2015-10-14 08:22:28 +02:00
Chinsky
8c8b5a34d3 Merge pull request #11288 from PsiOmegaDelta/151310-RandomBlob 
Blob spawn locations are now more random
 2015-10-14 03:24:28 +03:00
PsiOmegaDelta
a19829e968 Merge pull request #11289 from Kearel/secRemoveMaster 
Pointed secret changes to master
 2015-10-13 20:27:56 +02:00
Kearel
78956843a8 Pointed secret changes to master 
New gamemodes on dev will still need to be changed.
 2015-10-13 12:30:52 -05:00
PsiOmegaDelta
58dfe817f1 Changelog entry. 2015-10-13 18:50:02 +02:00
Zuhayr
5dc6ff5da1 Merge pull request #11230 from PsiOmegaDelta/xenomorphs 
Xenomorph update
 2015-10-13 08:31:27 +10:30
mwerezak
46f5bbc1d4 Merge pull request #11277 from Hubblenaut/stacks 
Fixes stack creation logic and return value
 2015-10-12 11:25:51 -04:00
Hubblenaut
ab5c5486e0 Update Changelog 2015-10-12 16:38:42 +02:00
Hubblenaut
1c8ec1a700 Fixes stack creation logic and return value 2015-10-11 22:02:05 +02:00
PsiOmegaDelta
452e2e36df Updates changelog. 2015-10-11 17:41:35 +02:00
PsiOmegaDelta
27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml
 2015-10-11 17:37:01 +02:00
PsiOmegaDelta
070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-10-11 17:17:41 +02:00
Hubblenaut
cd182a3e1c Updates Changelog 2015-10-10 15:59:47 +02:00
PsiOmegaDelta
13b175c529 Merge remote-tracking branch 'upstream/dev' into xenomorphs 
Conflicts:
	code/game/objects/effects/aliens.dm
	code/game/objects/structures/lamarr_cage.dm
 2015-10-10 12:05:36 +02:00
PsiOmegaDelta
92ea0f6e9a Updates changelog. 2015-10-10 10:15:14 +02:00
GinjaNinja32
d5928d9927 Merge pull request #11260 from mwerezak/ttv 
Fixes TTV Yield
 2015-10-10 09:05:00 +01:00
HarpyEagle
6c3bbb9ee8 Updates changelog, fixes comment 2015-10-09 11:39:22 -04:00
PsiOmegaDelta
4ca487e291 Merge pull request #10113 from mwerezak/wheredoesthepowercomefrom 
Makes newly fabricated power cells start uncharged
 2015-10-09 12:42:22 +02:00
HarpyEagle
40ab99b354 Rubber bullets and beanbags now check melee armour instead of bullet armour 2015-10-08 16:36:51 -04:00
HarpyEagle
b9feb805c1 Adds changelog 2015-10-08 16:11:17 -04:00
Hubblenaut
a7cad04264 Amendments to light replacer and janitor supply crate 2015-10-06 19:59:56 +02:00
PsiOmegaDelta
8eee143177 Merge remote-tracking branch 'upstream/dev' into xenomorphs 
Conflicts:
	baystation12.dme
 2015-10-01 09:48:51 +02:00
PsiOmegaDelta
9f33920a9c Merge pull request #11226 from Baystation12/dev-freeze 
Dev
 2015-09-30 08:34:54 +02:00
PsiOmegaDelta
d2f7a6e036 Merge pull request #11225 from Baystation12/master 
Dev-freeze
 2015-09-30 08:27:16 +02:00
Dibasic
a65daf42fb changelog.css readability and redundancy 
Removed redundant CSS lines, fixed "Baystation 12 Credit List" font, and added line breaks and indentation to blocks with more than one line.
 2015-09-28 10:47:00 -05:00
PsiOmega
b3c5344cb3 Updates changelog. 2015-09-26 08:52:31 +02:00
Zuhayr
95f270ad3a Xenomorph Queens can now infest victims. 2015-09-21 20:36:51 +09:30
Zuhayr
13e0682a22 Changelog. 2015-09-21 20:36:51 +09:30
PsiOmega
0d056f7088 Changelog entry. 2015-09-18 21:47:49 +02:00
PsiOmegaDelta
fd855a0d7c Updates changelog. 2015-09-11 08:54:33 +02:00
PsiOmegaDelta
a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
 2015-09-11 08:54:03 +02:00
PsiOmegaDelta
f81ac77884 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-09-11 08:38:28 +02:00
PsiOmegaDelta
1d1f96ff18 Updates changelog. 2015-09-11 08:32:07 +02:00