Leshana
e004a8bfc0
Merge remote-tracking branch 'polaris/master' into sink
...
# Conflicts:
# code/_onclick/item_attack.dm
# code/modules/client/preferences.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
# code/modules/mob/new_player/preferences_setup.dm
# nano/images/nanomap_z1.png
# vorestation.dme
2016-05-29 16:22:07 -04:00
Jon
21f898e047
First commit of manual port of BS12
...
#13042
and
#13086
2016-05-29 00:56:11 +01:00
Arokha Sieyes
8230732453
Merge branch 'sync' of https://github.com/VOREStation/Polaris into 05192016_sync
2016-05-19 23:52:00 -04:00
Yoshax
96b7772f55
Revert "Disables alternative title validation to allow for admins to give people/themselves retainable non-standard titles"
2016-05-18 22:43:08 +01:00
Arokha Sieyes
7914c9d943
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync
2016-05-18 10:13:26 -04:00
Yoshax
c53f214b7b
Disables alternative title validation to allow for admins to give people/themselves retainable non-standard titles
2016-05-17 16:48:12 +01:00
Arokha Sieyes
f8fe9994e5
Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update
...
# Conflicts:
# code/world.dm
# config/example/config.txt
Resolved by removing old lines.
2016-05-15 12:39:30 -04:00
Arokha Sieyes
88dd4973c8
Hid latejoin_only jobs from occupations screen
2016-05-14 20:15:27 -04:00
PsiOmegaDelta
a6dd6bfa4a
Ports Bay's adjustments of the faux-nanoui character setup and related
2016-05-12 18:26:24 +01:00
Datraen
d7ea30c158
Changes the colors of the occupation setup tab.
2016-05-11 21:23:40 -04:00
Datraen
761ea91a70
Changes the colors of the occupation setup tab.
2016-05-11 21:14:33 -04:00
Arokha Sieyes
5692ad76ad
Removed imaginary </style> tag from previous work
2016-05-08 14:20:18 -04:00
Arokha Sieyes
286d6ba43e
Remove errant imaginary </style>
2016-05-08 14:18:34 -04:00
Arokha Sieyes
9e215a1122
Character setup fake nanoui
...
Makes them look nicer! Woo!
2016-05-08 03:36:32 -04:00
Arokha Sieyes
45e9b4f10a
Removed earlier attempt at color
2016-05-08 03:22:33 -04:00
Arokha Sieyes
b6a602ba9a
New Player/Character Setup (Fake)NanoUI
...
While I consider Polaris' character setup screen to be mechanically better
than most others, it wasn't prettier. Well. It was a bit. But now it's
more pretty-er.
Used the fake NanoUI 'browser' datum to render the pages for the New
Player panel and the Character Setup screen.
2016-05-08 03:19:09 -04:00
Datraen
e1c0256477
Brings the jumpsuits, pants, shorts, ponchos and hoodies under the path system.
2016-04-05 14:44:31 -04:00
Zuhayr
b2ab041c3f
Added checks for character age to numerous jobs.
2015-12-11 15:07:28 +10:30
PsiOmegaDelta
e715c16093
Character setup refactoring.
...
Begins breaking down the large character setup in more manageable modules, allowing for easier additions, edits, and removals.
(cherry picked from commit e116721977
2015-11-20 07:46:31 -05:00
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
PsiOmegaDelta
e116721977
Character setup refactoring.
...
Begins breaking down the large character setup in more manageable modules, allowing for easier additions, edits, and removals.
2015-10-18 17:34:35 +02:00
