cb65295059
Fixes issues with update:
...
Replaces glass boxes on map with new path
Removes duplicate code accepted into Polaris
Moves supplypacks_vr to science_vr
2016-06-14 15:01:37 -04:00
0350a266d1
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
...
# Conflicts:
# code/modules/client/preferences.dm
2016-06-14 12:01:42 -04:00
878cf928f8
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
...
# Conflicts:
# .travis.yml
# vorestation.dme
2016-06-13 13:12:40 -04:00
11107cb851
Removing redundant sanitizing; prefs has already been sanitized by this point.
2016-06-12 13:28:24 -04:00
fd265861bc
Move preferences copy_to() new player mobs into the preference_setup datums.
...
* The /datum/category_item/player_setup_item datums did a good job of organizing the code for loading/saving/editing preferences data, but all of the code that applies preferences to newly created player mobs was still in a single function.
* This change adds a new proc to player_setup_item datums: copy_to_mob() which is called from the traditional copy_to() proc, allowing each preferences datum to apply its own character data to the mob.
* This allowes new preferences to easily compartmentalize their new code.
* I also moved all the code for existing preferences from copy_to() into the copy_to_mob() on their respective preferences datums.
2016-06-11 23:33:48 -04:00
398709309d
Merge pull request #1916 from Anewbe/vest_freedom
...
Allows anyone who can loadout a large webbing select any large webbing
2016-06-11 13:46:33 +01:00
c182da0fe1
Adds fine smokables to the loadout
2016-06-10 22:04:07 -05:00
01224f0e89
Allows anyone who can loadout a large webbing select any large webbing
2016-06-10 21:09:21 -05:00
08972b1dc5
Better, now.
2016-06-09 18:28:16 -04:00
74a1b59a39
Adds IDs and Wallets
...
Adds variants of ID cards for each department and head, and adds several new colors of wallet. The wallets self-color the little ID in the corner based on the ID inserted so they always show the right picture of the ID, without needing to sprite each ID. Some are snowflaked, notably Gold and Centcom, but the rest are generated on the fly based on colors on the ID.
2016-06-08 19:29:47 -04:00
eb6f979fc0
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
...
# Conflicts:
# vorestation.dme
2016-06-07 18:37:47 -04:00
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
0fb98bbabd
Scheduler now uses btime, and other improvements
2016-06-01 17:56:07 +01:00
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
d7624b2b15
Adds a few more accessories
2016-05-31 06:16:05 -04:00
eae29b9d69
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sink
2016-05-30 22:43:05 -04:00
9aecdce655
Adds more ties to loadout, strangulation not included
2016-05-30 17:00:31 -04:00
26c759c7ad
Fixes #1813 ( #1815 )
2016-05-30 19:57:06 +01:00
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
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
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
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
ba529fabed
Fixes #1790
2016-05-29 04:15:22 +01:00
21f898e047
First commit of manual port of BS12
...
#13042
and
#13086
2016-05-29 00:56:11 +01:00
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
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
420f2c8463
Adds Tracksuits
2016-05-27 15:19:07 -04:00
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
9ed1f2f495
Adds Cards Against The Galaxy to loadout
2016-05-27 00:48:08 +01:00
beee32f237
Allow disabling styling of fake nanoui windows
2016-05-26 18:07:38 +01:00
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
9b8aefed5b
Adds towels
2016-05-25 18:38:16 +01:00
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
02fa5585c5
Fixes loadout skirts all spawning as black skirts
2016-05-23 19:35:13 +01:00
eaf0e1e4dd
Fixes #175
2016-05-23 18:07:36 +01:00
0554eac2fc
Replaces instances of Xenobotanist in loadout with Xenobiologist
2016-05-23 16:14:28 +01:00
334a0238ae
Replaces instances of Xenobotanist in loadout with Xenobiologist
2016-05-22 14:22:47 +01:00
adace754f0
Merge pull request #124 from VOREStation/heatfix
...
Initial Simple Fixes
2016-05-21 13:20:12 -04:00
10030a30fd
Fixes #132
...
As message.
2016-05-21 12:31:37 -04:00
f750a94b05
Adds nudity permit
2016-05-21 00:25:36 -04:00
027dae5369
Ports wedding rings from Citadel
2016-05-20 21:39:50 -04:00
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
8230732453
Merge branch 'sync' of https://github.com/VOREStation/Polaris into 05192016_sync
2016-05-19 23:52:00 -04:00
ec3e4a0315
Merge pull request #1698 from VOREStation/bored,_fix_polaris
...
Fixes two high-priority issues
2016-05-19 14:29:46 -04:00
5e59efd8dc
Fixes #802
...
OR not AND
2016-05-19 12:09:50 -04:00
2a6e86f4fc
Merge pull request #1578 from SinTwo/clothes
...
Skirt addition and loadout refactor
2016-05-19 09:00:41 -04:00
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
3ed17ad1ec
Back to /rank/
2016-05-18 15:08:18 -04:00
7914c9d943
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync
2016-05-18 10:13:26 -04:00
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