cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-22 16:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,372 Commits 2 Branches 1 Tag
24f7c0ca2cac15f9aa55e32b50ec4162d563dfb3
Commit Graph

22674 Commits

Author SHA1 Message Date
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
Neerti
3a5412df3a Merge pull request #190 from PolarisSS13/master 
Master to Dev 9/6/2015
 2015-09-06 17:30:54 -04:00
GinjaNinja32
a1b9dc2b4a Resomi language tweaks, fixes every species' names being generated in Galcom 2015-09-06 22:10:39 +01:00
Neerti
0451544692 Update nuclear.dm 2015-09-06 16:43:25 -04: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
Neerti
463ba53c3a Adds system to describe how protective a piece of clothing is. 
Also adds unused icons because byond won't let me use more than one per stat_icons.dm() proc.  Hopefully someone finds a use for them later.
 2015-09-06 15:52:46 -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
PsiOmegaDelta
7c3adad15f Merge pull request #11002 from Sligneris/patch-1 
Morgue access
 2015-09-05 17:29:16 +02:00
Zuhayr
f8bf428e66 Merge pull request #10981 from comma/technoir 
MrSnapwalk's Detective Uniform Resprite
 2015-09-06 00:48:50 +09:30
Zuhayr
6dc3b22432 Death to flashrev (compile fix) 2015-09-06 00:45:13 +09:30
Zuhayr
d03d9eebca removing now unneeded limb define. 2015-09-06 00:42:54 +09:30
Zuhayr
34a0c2f080 Added Resomi blood/damage masks. 2015-09-06 00:42:02 +09:30
Zuhayr
3e015d7c71 Added three human subspecies. 2015-09-06 00:39:08 +09:30
Zuhayr
808bbee90f Added species vars for oxy/tox/rad/flash resistance. 2015-09-06 00:39:05 +09:30
PsiOmega
5ae74883d2 Hull shields should no longer prevent the departure shuttle from leaving. 
If hull shields are left alone by the crew (due to being, for example, all dead) the departure shuttle is unable to leave.
This should destroy any shields faster than they can regenerate, thus ensuring a safe and pleasant departure.
 2015-09-05 16:49:15 +02:00
PsiOmega
d77f0f3997 Status display alarms now clear properly on all mode changes. 
Previously one had to first set the display mode to Clear before the overlays would go away.
This corrects situations where, for example, the emergency shuttle ETA could be covered by a NT logo.
 2015-09-05 12:02:17 +02:00
Zuhayr
b09e836d95 Removed an unused file. 2015-09-05 18:51:39 +09:30
Zuhayr
90c9d31782 Refactored the antagHUD to work better with the new antagonist system. 2015-09-05 18:51:17 +09:30
Zuhayr
3951b1d62c Added a handful of new mixed-antagonist modes. 2015-09-05 18:05:39 +09:30
Zuhayr
89a7c9667b Reverts a testing value. 2015-09-05 17:31:27 +09:30
PsiOmega
95b12da391 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/gamemode.dm
	code/game/antagonist/outsider/ert.dm
	code/game/gamemodes/ninja/ninja.dm
 2015-09-05 09:35:02 +02:00
PsiOmega
8191ff658e Compilation and code relocation. 2015-09-05 09:29:12 +02:00
PsiOmega
69fde6af03 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/objects/items/robot/robot_parts.dm
	code/setup.dm
 2015-09-05 09:24:30 +02:00
Zuhayr
2d91711fcc Tail icons now use tail_hair var for overlays. 2015-09-05 16:07:24 +09:30
GinjaNinja32
8311e06d2b Merge pull request #11003 from Zuhayr/secretfix 
Fixes Secret.
 2015-09-05 07:17:47 +01:00
Zuhayr
1c2cea708d Mousedrop runtime fix. 2015-09-05 14:45:57 +09:30
Chinsky
34662a83b5 Merge pull request #10998 from Zuhayr/antagsystem 
Antag system fixes.
 2015-09-05 07:56:42 +03:00
Zuhayr
a0187f66e3 Fixes Secret. 2015-09-05 14:12:20 +09:30
Zuhayr
f74182680c Fixes autotraitor. 2015-09-05 13:15:30 +09:30
Zuhayr
7af1f27b28 More debug feedback. 2015-09-05 12:57:20 +09:30
Zuhayr
58cd8c3e03 Added debug verbs/feedback. 2015-09-05 12:05:32 +09:30