Arokha Sieyes
63bf71e393
Sanitizing text twice breaks quotes
...
Someone didn't read the comment in text.dm helpers, I see. This text is sanitized 2 lines above. Don't do it twice, nothing changed.
Fixes https://github.com/VOREStation/VOREStation/issues/276
(Do cross-repo magic-word closes work? _We're about to find out!_)
2016-06-02 14:12:48 -04:00
Yoshax
0fb98bbabd
Scheduler now uses btime, and other improvements
2016-06-01 17:56:07 +01:00
Arokha Sieyes
925b1b4a3e
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
...
# Conflicts:
# code/game/mecha/mech_fabricator.dm
2016-05-31 18:17:58 -04:00
Mark9013100
d7624b2b15
Adds a few more accessories
2016-05-31 06:16:05 -04:00
Leshana
eae29b9d69
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sink
2016-05-30 22:43:05 -04:00
Mark9013100
9aecdce655
Adds more ties to loadout, strangulation not included
2016-05-30 17:00:31 -04:00
Spades
26c759c7ad
Fixes #1813 ( #1815 )
2016-05-30 19:57:06 +01:00
EmperorJon
741706e9e3
Underwear + setup merges ( #1812 )
...
* Manually merges 12595 and 12461.
* Moron Jon 2: Moron Boogaloo
* Makes Yosh happier
2016-05-30 19:19:45 +01:00
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
EmperorJon
5a545854a4
Underwear Datums ( #1794 )
...
* One more step to bringing our preferences/setup stuff in line with Bay.
* Whoopsy
* Jon is a moron, more at 11.
2016-05-29 17:29:36 +01:00
KasparoVy
d5aabda108
Ports Models for Cybernetic Limb Manufacturers + More Monitor-head Wallpapers ( #1775 )
...
* Ports Models for Cybernetic Limb Manufacturers + More Monitor-head Wallpapers
As requested!
* Modified as requested.
* Different Names
2016-05-29 15:09:56 +01:00
Jon
ba529fabed
Fixes #1790
2016-05-29 04:15:22 +01:00
Jon
21f898e047
First commit of manual port of BS12
...
#13042
and
#13086
2016-05-29 00:56:11 +01:00
Anewbe
1d3a57cd76
Pathing Tweaks ( #1719 )
...
* Edits some pathing references
* Cleans up a spacing thing
* Map thing
* Adds the \improper tag to NT breacher gear, for improved grammar
2016-05-28 17:17:41 +01:00
EmperorJon
12bc3d2622
Merge pull request #1764 from Yoshax/adminlooc
...
Adds preference to mute remote LOOC chatter heard by admins.
2016-05-28 01:52:15 +01:00
redstryker
420f2c8463
Adds Tracksuits
2016-05-27 15:19:07 -04:00
Leshana
219db3d868
Adds preference to mute remote LOOC chatter heard by admins.
...
* Lets people remain on standby for adminhelps without having all that spam scrolling stuff off the screen if they are not taking on the role of policing LOOC.
2016-05-27 15:10:29 +01:00
Yoshax
9ed1f2f495
Adds Cards Against The Galaxy to loadout
2016-05-27 00:48:08 +01:00
GinjaNinja32
beee32f237
Allow disabling styling of fake nanoui windows
2016-05-26 18:07:38 +01:00
Arokha Sieyes
76567bb7a2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
...
# Conflicts:
# code/modules/mob/living/carbon/human/whisper.dm
Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).
2016-05-26 09:59:18 -04:00
Yoshax
9b8aefed5b
Adds towels
2016-05-25 18:38:16 +01:00
Leshana
a325940040
Adds preference to mute remote LOOC chatter heard by admins.
...
* Lets people remain on standby for adminhelps without having all that spam scrolling stuff off the screen if they are not taking on the role of policing LOOC.
2016-05-23 20:36:22 -04:00
Yoshax
02fa5585c5
Fixes loadout skirts all spawning as black skirts
2016-05-23 19:35:13 +01:00
Yoshax
eaf0e1e4dd
Fixes #175
2016-05-23 18:07:36 +01:00
Yoshax
0554eac2fc
Replaces instances of Xenobotanist in loadout with Xenobiologist
2016-05-23 16:14:28 +01:00
Yoshax
334a0238ae
Replaces instances of Xenobotanist in loadout with Xenobiologist
2016-05-22 14:22:47 +01:00
Arokha Sieyes
adace754f0
Merge pull request #124 from VOREStation/heatfix
...
Initial Simple Fixes
2016-05-21 13:20:12 -04:00
Arokha Sieyes
10030a30fd
Fixes #132
...
As message.
2016-05-21 12:31:37 -04:00
Cameron653
f750a94b05
Adds nudity permit
2016-05-21 00:25:36 -04:00
Cameron653
027dae5369
Ports wedding rings from Citadel
2016-05-20 21:39:50 -04:00
Leshana
ff63ec73da
Ported collars from VirgoStation
...
* Six types of regular collar and one holocollar
* Collars attach to clothing or can be worn in exosuit slot by nude people.
* Holocollar can have its tag description set.
2016-05-20 19:33:39 -04:00
Arokha Sieyes
8230732453
Merge branch 'sync' of https://github.com/VOREStation/Polaris into 05192016_sync
2016-05-19 23:52:00 -04:00
Datraen
ec3e4a0315
Merge pull request #1698 from VOREStation/bored,_fix_polaris
...
Fixes two high-priority issues
2016-05-19 14:29:46 -04:00
Arokha Sieyes
5e59efd8dc
Fixes #802
...
OR not AND
2016-05-19 12:09:50 -04:00
Datraen
2a6e86f4fc
Merge pull request #1578 from SinTwo/clothes
...
Skirt addition and loadout refactor
2016-05-19 09:00:41 -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
SinTwo
3ed17ad1ec
Back to /rank/
2016-05-18 15:08:18 -04: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
silveryferret
82f09c1642
Replaces BE_MONKEY with BE_RENEGADE
...
As title. Also adds Renegade into the antagonism tab underneath
character set up.
2016-05-16 21:20:30 -05:00
Arokha Sieyes
d7e65b22ba
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync
2016-05-16 18:31:38 -04:00
PsiOmegaDelta
6ce5eef293
Can now see how many points have been spent in each loadout category.
...
Also adds a small hack to fix #12560 . Validation no longer occurs if the preference mob doesn't exist.
2016-05-16 17:23:08 +01:00
Neerti
79b91df133
Merge pull request #1615 from redstryker/Varsity-Jackets
...
Adds Varsity Jackets V2 (Because I'm an Idiot)
2016-05-15 18:24:57 -04: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
Arokha Sieyes
231ee5bf35
Work on satisfying travis
2016-05-14 13:38:24 -04:00
Leshana
53a58d7c43
Working on Issue #11 - Added custom race option
...
* Added to character setup screen.
* Added to examine text.
2016-05-13 20:07:39 -04:00
Neerti
76058c701c
Merge pull request #1629 from Datraen/SkrellGotHeadtail
...
Adds more Skrell Headtail choices, loadout tweaks
2016-05-13 00:32:01 -04:00
Leshana
80a95b0cf5
Adds micro/macro and weight gain options to the character setup screen.
...
Moves the location of saved micro/macro variables to the main /datum/preferences for ease of use.
2016-05-12 21:38:41 -04:00
Yoshax
75b1f53141
Comments out ignore and unignoring in character setup, properly removes ability to ignore yourself
2016-05-13 01:16:44 +01:00
