Commit Graph

200 Commits

Author SHA1 Message Date
Eearslya
85c3e22873 Polaris sync 2016-08-06 20:34:44 -07:00
Yoshax
fe8d1b24af Ensures xeno loadout validation is done correctly 2016-08-06 20:27:23 +01:00
PsiOmegaDelta
0f830b0f98 no message 2016-08-05 17:58:15 +01:00
Yoshax
77dda80477 Removes whitelist taj from furs and mantle 2016-08-05 17:38:08 +01:00
PsiOmegaDelta
4d74a8f5c2 Various fixes.
Client Login() now calls ..() before setting up preferences, ensuring a mob has actually been assigned. Fixes #12560 (and probably other somehow subtle sanitation issues).
The alien whitelist now checks the rights of the supplied mob, not usr.
When granting xeno loadout gear the mob's current species must match the gear's whiteliste species.
2016-08-05 17:35:43 +01:00
redstryker
97f9cd3fb2 Adds Customs Clothes, Vests, and Sweaters, Oh My! 2016-08-01 14:11:40 -04:00
viv_eret
2cdec12e11 Adds horsehalf saddlebag in loadout.
Shouuuld let you get a bag sprited for horsetaurs in loadout
accessories.
2016-07-24 16:24:08 -07:00
SinTwo
1a6504a47c more item_state fixes: worn_state purge 2016-07-24 19:03:15 -04:00
redstryker
dccc6f5713 Fixes Flannels. Also adds a Brown Flannel 2016-07-22 16:09:51 -04:00
Mark9013100
f950b7ea23 Adds the corporate berets to loadout 2016-07-19 22:07:57 -04:00
Yoshax
517dd50038 Merge pull request #2128 from Neerti/7/13/2016_younger_synths
Allows FBPs to potentially have different age limits.
2016-07-13 23:53:22 +01:00
Neerti
6e281def77 Allows FBPs to potentially have different age limits.
Cyborgs have their minimum be equal to their species' minimum, and maximum be their species maximum plus twenty years.
Posibrains have a minimum of 1, and a maximum of 220, as discussed by EmperorJon.
Digital brains (drones) have a minimum of 1 and maximum of 150, as discussed by Spookerton.
2016-07-13 18:25:07 -04:00
woodratt
47ab279b9b 1.5.5 Fancy Green Uniforms
- Adds, one green suit and formal jacket.
- One new military like jacket that can be selected from the loadout.
- A new holster type, leg holster. Can be selected from the loadout as well.
- Cleaned up a couple of the sprites for outfits that have ties (rolled up sleeve versions on a couple still had the tie sprite).
2016-07-12 17:19:39 -07:00
Anewbe
0396675865 Corrects a "Wardem" reference 2016-07-10 07:01:31 -05:00
PsiOmegaDelta
d405dfb102 Can now toggle loadout and job preview equipment separately. 2016-07-10 04:53:49 +01:00
redstryker
8fe62d584f Adds Flannels 2016-07-08 17:32:44 -04:00
Anewbe
15fb0149b3 Lets sec characters spawn with fuzzy coats 2016-07-07 19:14:31 -05:00
Arokha Sieyes
86fe574faf Fix inconsistency with alien whitelist 2016-07-05 14:48:17 -04:00
Spades
fc059ab4e8 Merge pull request #397 from Cameron653/master
Egg TF revamp, adds xeno egg sprite, bug fixes, reverts #382
2016-07-03 20:10:34 -04:00
Arokha Sieyes
484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris
# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm
2016-07-03 16:21:21 -04:00
Anewbe
f375595d30 #MoreDice2016 (#2016)
* Adds more dice

* Adds sprites, fixes some pathing
2016-07-03 19:48:28 +01:00
Cameron653
13d75315bb Adds in selectable egg TF, reverts #382, a few tf fixes. 2016-07-02 20:52:07 -04:00
Mechoid
d1eb23ee8b Allows Circuit-Brains (Digital) to be chosen as an FBP brain-type. (#2008)
* Allows Circuit-Brains (Digital) to be chosen as an FBP brain-type.

* Fixes an Oops made with Status. (Thanks Zuh)
2016-06-30 09:03:53 -04:00
redstryker
be3d6608e7 Adds Evening Gloves (#2002)
* Adds Evening Gloves

* makes evening gloves a subtype of gloves

* makes evening gloves a subtype of gloves

* updates path in loadout

* updates loadout path
2016-06-30 00:41:54 -04:00
Datraen
ccda51ab68 Adds fluff antag factions, antag visibility options for uplinks.
No mechanical changes come of this change, only the ability to have an antagonist faction, as well as having specified visbility for the affiliation itself.
Also adds Skrell home system to the home system list.
2016-06-29 11:25:52 -04:00
Yoshax
38200a3e20 Introduces max record length for record, converts uses of max book length to max paper length barring books 2016-06-27 16:26:31 +01:00
Arokha Sieyes
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
Arokha Sieyes
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
Arokha Sieyes
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
Leshana
11107cb851 Removing redundant sanitizing; prefs has already been sanitized by this point. 2016-06-12 13:28:24 -04:00
Leshana
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
Yoshax
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
Anewbe
c182da0fe1 Adds fine smokables to the loadout 2016-06-10 22:04:07 -05:00
Anewbe
01224f0e89 Allows anyone who can loadout a large webbing select any large webbing 2016-06-10 21:09:21 -05:00
Arokha Sieyes
08972b1dc5 Better, now. 2016-06-09 18:28:16 -04:00
Arokha Sieyes
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
Arokha Sieyes
eb6f979fc0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	vorestation.dme
2016-06-07 18:37:47 -04:00
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