cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-23 00:22:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,465 Commits 2 Branches 1 Tag
9ce56f3f9173f3745b42b5c9ea38d2533eea0263
Commit Graph

20682 Commits

Author SHA1 Message Date
PsiOmegaDelta
9ce56f3f91 Correctly intends a world-message. 2015-09-10 08:05:35 +02:00
PsiOmegaDelta
cbd621ae41 Merge remote-tracking branch 'upstream/dev' into 150907-UplinkUses 2015-09-09 08:18:26 +02:00
PsiOmegaDelta
6a956d0d0a Uplink fixes. 
Adds a default welcome message. Was lost in a game mode cleanup.
Traitors should now have telecrystals again. Also lost in the game mode cleanup.
Uplinks without correctly defined owners are now also printed in the round end summary.
 2015-09-08 08:43:40 +02:00
PsiOmegaDelta
23a3433e67 Moves nanomanager.close_uis(src) into datum/proc/Destroy() instead of /obj/Destroy() now that NanoUI supports datums. 2015-09-08 08:32:09 +02:00
PsiOmegaDelta
94b4c483ba Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-08 08:22:37 +02:00
PsiOmegaDelta
ec7e2491be Updates "on merge" entries. Relocates code. 2015-09-08 08:03:14 +02:00
PsiOmegaDelta
2f183e1cee Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/devices/uplink.dm
	code/modules/nano/modules/human_appearance.dm
 2015-09-08 07:58:25 +02:00
PsiOmega
0e2f44e3ac Admin logs bought uplink items. 2015-09-07 20:02:43 +02:00
Zuhayr
412ee32d1c Stops autotraitor grabbing minds from the lobby for antag roles. 2015-09-07 17:01:34 +09:30
GinjaNinja32
4b73518d49 Merge pull request #11036 from PsiOmegaDelta/150907-AlwaysDoItYourself 
Re-adds recharge station checks.
 2015-09-07 07:19:50 +01:00
PsiOmega
1633cde787 Adds missing </font> 2015-09-07 08:18:53 +02:00
PsiOmega
8e9705b6c7 Re-adds recharge station checks. 
Because no one who stuffs non-operational/dead borgs into recharge stations will bother to eject them.
 2015-09-07 08:16:31 +02:00
PsiOmega
3a2b1be8e1 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-07 08:09:01 +02:00
Zuhayr
787f48146e Merge pull request #10980 from GinjaNinja32/autohiss 
Add autohiss/purr on a per-client toggle
 2015-09-07 15:37:46 +09:30
PsiOmega
8dea4d40c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-07 08:01:15 +02:00
Zuhayr
211e426009 Tweak. 2015-09-07 14:43:20 +09:30
Zuhayr
c2908bfc50 Fixes #10951 2015-09-07 14:43:12 +09:30
Zuhayr
88b95e1207 Fixes #7951 2015-09-07 14:40:23 +09:30
Zuhayr
43a349ee2a Fixes #11022 2015-09-07 14:25:45 +09:30
Zuhayr
e27eda4c86 Merge pull request #10672 from mwerezak/frag-grenade 
Adds fragmentation grenades
 2015-09-07 14:12:27 +09:30
Zuhayr
479e637823 Merge pull request #10398 from Soadreqm/patch-1 
Increase changeling genetic points
 2015-09-07 14:01:42 +09:30
Zuhayr
dd81250b1b Merge pull request #10784 from Kelenius/masterRuntimes 
Fixes two runtimes
 2015-09-07 14:01:24 +09:30
Zuhayr
e0cfd8fdbd Merge pull request #10420 from Kearel/sbike 
[Feature] Space Bikes!
 2015-09-07 13:58:25 +09:30
Zuhayr
0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs 
Makes it possible to define multiple tag pairs for the Travis check.
 2015-09-07 13:57:09 +09:30
Zuhayr
fca95039bf Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/game/gamemodes/intercept_report.dm
	code/game/gamemodes/traitor/traitor.dm
	code/global.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/living.dm
	html/changelogs/.all_changelog.yml
 2015-09-07 11:31:19 +09:30
Zuhayr
b9c01bf2f2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/objects/items/devices/uplink.dm
 2015-09-07 11:17:06 +09:30
Zuhayr
9d5f14298d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/gamemodes/traitor/traitor.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-09-07 11:03:41 +09:30
Chinsky
9533f2d154 Merge pull request #11026 from GinjaNinja32/announcement 
Improve formatting of admin announcements
 2015-09-07 01:02:36 +03:00
Chinsky
47f382b892 Merge pull request #11027 from Datraen/master 
[BOTANY] Fixes plant nutrient storage unit check
 2015-09-07 01:02:21 +03:00
GinjaNinja32
a1b9dc2b4a Resomi language tweaks, fixes every species' names being generated in Galcom 2015-09-06 22:10:39 +01:00
Datraen
05a29f8f3a [BOTANY] Fixes plant storage nutrient check 
Reported only high, low or none with previous system.
 2015-09-06 16:42:58 -04:00
GinjaNinja32
5a335c9140 Improve formatting of admin announcements 2015-09-06 20:41:06 +01:00
Chinsky
2563821832 Merge pull request #10972 from Zuhayr/resomi 
Adds the Resomi.
 2015-09-06 13:09:34 +03:00
Zuhayr
ef21f562fd Added some Resomi uniforms/loadout options. 2015-09-06 18:49:33 +09:30
PsiOmega
cc960624b9 Fixes mercenary mode not listing bought items. 
The mercenary leader now spawns with the uplink, as is set as its owner.
 2015-09-06 10:43:09 +02:00
Zuhayr
63cb207eb8 Merge pull request #10890 from PsiOmegaDelta/150826-AltLangKeys 
Languages now use alternative prefix keys.
 2015-09-06 17:20:51 +09:30
Chinsky
d99c4ffaaa Merge pull request #11021 from Zuhayr/antagsystem 
Forgot a couple of tweaks.
 2015-09-06 08:06:48 +03:00
Zuhayr
eacc1e7da7 Tweaks. 2015-09-06 11:19:54 +09:30
GinjaNinja32
3bb0e2503a Merge pull request #11020 from Zuhayr/antagsystem 
More antag fixes.
 2015-09-06 02:47:12 +01:00
Zuhayr
111ff96312 Should fix antag candidate selection. 2015-09-06 10:59:59 +09:30
Chinsky
71d1853ede Merge pull request #10993 from Zuhayr/species 
Human subspecies.
 2015-09-06 04:25:21 +03:00
Zuhayr
efa995b372 Should fix antag scaling. 2015-09-06 10:53:32 +09:30
Zuhayr
2b2e27d380 Species flash cleanup. 2015-09-06 10:09:03 +09:30
Samuel Novák
12a0bae5bd Stop resting when pAI chassis collapses 2015-09-05 21:53:21 +02:00
GinjaNinja32
8685ff42a4 Merge pull request #11008 from Zuhayr/antaghud 
Refactored the antagHUD to work better with the new antagonist system.
 2015-09-05 17:01:57 +01:00
GinjaNinja32
fb0732dbf4 Merge pull request #11006 from Zuhayr/mixedmodes 
Added a handful of new mixed-antagonist modes.
 2015-09-05 17:01:28 +01:00
GinjaNinja32
0ae3b1dd0c Merge pull request #11013 from PsiOmegaDelta/150905-ShieldCrush 
Hull shields should no longer prevent the departure shuttle from leaving
 2015-09-05 16:59:58 +01:00
GinjaNinja32
71b2213233 Merge pull request #11009 from PsiOmegaDelta/150905-JustGoAwayAlready 
Status display alarms now clear properly on all mode changes.
 2015-09-05 16:59:52 +01:00
GinjaNinja32
348f678b81 Merge pull request #10997 from PsiOmegaDelta/150904-RadioAccess 
Observers can now view radio settings, admins can alter them.
 2015-09-05 16:59:42 +01:00
GinjaNinja32
ef208a55aa Merge pull request #10996 from PsiOmegaDelta/150804-CrawlThroughThoseVents 
Vent crawling now explicitly checks for equipped items.
 2015-09-05 16:59:33 +01:00