Commit Graph

1582 Commits

Author SHA1 Message Date
Cameron653
475f307753 Fixes dresses
Ports over 301f97a2b3

Instead of syncing (Which would take longer) I'm just manually putting the bugfix in. This will cause a conflict with the next sync, but all that needs to be done is the comment I put in taken out (Along with the heading in github when a conflict occurs) and it'll work fine.

I'll solve the conflict next time we sync next month.
2016-12-11 18:27:23 -05:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
MagmaRam
7e1e710df5 Merge pull request #2847 from Woodratt/1.6.6_shoes_n_gloves
1.6.6 shoes and gloves
2016-12-09 22:53:32 -06:00
woodratt
ad92bc899b 1.6.6 shoes and gloves
Adds shoes and gloves from Bay.

Forensic gloves added to the loadout, detective only.
Work gloves added to the loadout.
Tactical gloves added, not to loadout.
Cowboy boots added (existing sprite, loadout)
Jungle boots and Duty boots added, (loadout).
Dress shoes added white and black, (loadout).
Fixed pathing issue with purple beret.
2016-12-08 20:59:04 -08:00
Anewbe
bcc6ac03e3 EVA hardsuit gets insulated gauntlets 2016-12-07 17:41:42 -06:00
woodratt
5444a4ad52 1.6.5 Port of Bay's uniforms
- Port of all of the uniform items that we did not have.
- Aether, Sweater, Ward-T. Frontier, Focal, Heph. Grayson, M. Bill, PCRC outfits/uniforms ported. (Loadout, some restricted)
- All of the military jumpsuits and uniforms have been ported. (Not Avail).
- Plain utility outfits are available in the loadout, as well as the pt outfits (except for marine).
- Hazard, Sterile, Saare, and Confederate outfits ported. (Not Avail).
2016-11-29 03:07:18 -08:00
Anewbe
e75b6c4b2e Merge pull request #2829 from Woodratt/1.6.4_hathathat
1.6.4 Port of Baystation head items.
2016-11-26 20:24:00 -06:00
woodratt
6dd5c9d657 1.6.4 Port of Baystation head items.
- Port of baystation head slot items. Some in hand sprites created for a few (soft caps). A couple other sprites adjusted so they fit more hairstyles.

- Sol berets. (Loadout)
- Baseball caps, major bills, sol, fleet, expeditionary (Loadout)
- helmets, merc, tact, sol, nt. (Not Avail)
- Utility, wheelcaps, garrison, drill, dress. (Not Avail)
- Resprites for the detective's fedoras.
- Four custom welding hoods, (Loadout, access restricted).
- Two new cowboy hats, taken from Europa code. (Loadout)
2016-11-26 15:57:15 -08:00
Anewbe
5204348ce6 Corrects magboots and the shoe toggle thing 2016-11-24 23:22:58 -06:00
Anewbe
c5c38d5914 Merge pull request #2822 from Woodratt/1.6.3_suit_clothing
1.6.3 Ports of Bay's suit clothing
2016-11-24 21:33:49 -06:00
woodratt
454e6870d9 1.6.3 Ports of Bay's suit clothing
- Whole scale port of clothing items from bay.
- Solgov armor vests, as well as a 'tactical vest' (None avail. in game)
- Alternate atmos, engineering, mining, medical, and security suits. (Due to their stats, only available through cargo).
- Three new hazard vest colors, blue, green, white. (Load out option)
- 'Service jackets' Black and Green (Load out option).
- Solgov fleet dress uniforms, surgical apron, marshal jacket (None avail. in game, may change with the surgical apron in the future.)
- As a side change the Construction, HAZMAT, Biohazard, and EMT voidsuits are also now available from cargo. HAZMAT and Biohzard come with slightly adjusted stats to sort of reflect what they are designed for.
2016-11-24 19:19:26 -08:00
Anewbe
7075adba42 Adds toggle shoe layer, fixes knives 2016-11-23 18:23:39 -06:00
redstryker
469082aa59 Head Item Additions and Changes 2016-11-21 17:00:23 -05:00
Cameron653
f5deb57014 Fixes a fluff item so it isn't bugged 2016-11-20 00:51:24 -05:00
Cameron653
b459ae11e3 Quick bugfix since wolf taur armor wasn't showing up. 2016-11-20 00:46:16 -05:00
MagmaRam
435484e1d1 Merge pull request #2781 from Nerezza/bulkyjumpsuits
Makes jumpsuits hide under space suits under right conditions.
2016-11-19 22:22:59 -06:00
Nerezza
9bda933376 Makes jumpsuits hide under space suits under right conditions.
Mostly noticeable on tesh wearing voidsuits, bulky jumpsuits were overlayed by the voidsuit making them 'peek' around the latter's icons.

Now, spacesuits in general will outright hide jumpsuits with exception only to rigsuits. Yeah I'm looking at you rescue suit, you and your ****ed up icons =3=
2016-11-19 15:52:11 -06:00
Nerezza
733f908799 Accessories on teshari now use the right sprites
Teshari can (finally) into webbing, too!

Tested and works, only issue is that any accessories not in seromi/ties.dmi will not be visible. This is how everything but jumpsuits handles things for them anyhow.
2016-11-19 13:15:14 -06:00
MagmaRam
f7f2b7837d Merge pull request #2764 from Anewbe/rig_sprint
Adds hardsuit sprint module
2016-11-17 20:41:17 -06:00
Anewbe
e30b96421f Adds hardsuit sprint module 2016-11-17 18:30:40 -06:00
Anewbe
ba1225048e Armor can hold helmets in suit storage 2016-11-16 22:43:32 -06:00
Anewbe
7d532f573e Merge pull request #2751 from Kholdstare34/outbox
Clothing additions, minor clothing tweaks, and undershirts
2016-11-16 17:29:36 -06:00
MagmaRam
f0c26f980c Fixes welding masks disappearing when flipped wrong. 2016-11-15 21:09:03 -06:00
Kholdstare34
f37251496e Adds several feminine undershirts, tweaks the warden and HoS jumpskirt to bring them in line with the other departmental jumpskirts, and adds white short shorts and a denim skirt. 2016-11-15 19:08:27 -06:00
Anewbe
585a6b04af Moves armor set slowdown to torso, from arms 2016-11-14 15:09:29 -06:00
MagmaRam
8dae3942f0 Merge pull request #2719 from Anewbe/half_gas
Ports bay's half gasmak
2016-11-12 21:44:24 -06:00
MagmaRam
5eff6494cd Merge pull request #2712 from Anewbe/turban
Turban doesn't cover beard
2016-11-12 14:17:50 -06:00
Anewbe
d3d290b9f3 Merge pull request #2717 from MagmaRam/concealed_carry
Concealed holsters, suits hiding accessories.
2016-11-11 19:08:20 -06:00
MagmaRam
c0486a164f Changed the visible holsters back to not being an entire subclass. 2016-11-11 16:39:17 -06:00
Arokha Sieyes
5a5a50f7b0 Improves bandanas
No more tie verb. Just put it into whatever slot and it (correctly) adjusts the needed stuff to work. Added 'Can be worn on the head or face' to the description to indicate that.

Currently wearing a bandana on your head makes it impossible to eat, which doesn't make sense, so this fixes that too.
2016-11-11 10:51:35 -05:00
Anewbe
cc2d9d9528 Ports bay's half gasmak 2016-11-10 23:08:29 -06:00
MagmaRam
bff4e6a4e1 Makes clothing actually hide stuff, fixes a couple odd related bugs. 2016-11-10 18:00:31 -06:00
MagmaRam
b418d57dd6 Makes it so that holsters can be hidden by suit-slot items.
I have yet to actually make any suit-slot items hide holsters.
2016-11-09 23:23:19 -06:00
Cameron653
492b3a9d23 Update armor_vr.dm 2016-11-09 16:21:24 -05:00
Cameron653
6140d1234d Fixes taursuits? 2016-11-09 16:19:55 -05:00
Anewbe
9664e09ae7 Turban doesn't cover beard 2016-11-08 20:43:54 -06:00
Cameron653
f2df54c60b Fixes taur armor
I hate using the github website since it creates a mass of commits, but this isn't a big enough change to open it all up in github.
2016-11-08 14:16:18 -05:00
Cameron653
a868a7f679 Fixes taursuits while I'm at it 2016-11-08 14:14:31 -05:00
redstryker
c8bf4cfce2 Changelog and Inventory Flags 2016-11-05 18:12:11 -04:00
redstryker
87d7d05048 Guy Fawkes Mask 2016-11-05 18:07:29 -04:00
Arokha Sieyes
d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.
2016-11-04 15:42:32 -04:00
Atermonera
ac064b0717 Fixes #2643, v2 (#2693)
* Fixes #2643, unifies list syntax within /code/modules/clothing/suits/jobs.dm

* Capitalizes "Hush" in chaplain's hoodie examine text.

* Pulls Anewbe's Sec Gear Tweak changes, should resolve the conflicts.

* Ok, now I think I did it. Forgot to add cigarettes and lighters to the forensics jacket inventory.

* Forgot a comma, thanks Yosh

* Revert fix. I'm a donk

* Properly reverts fix for #2643

* Fixes #2643

* Unifies List syntax within /code/modules/clothing/suits/jobs.dm

* Config snuck into a commit
2016-10-28 22:29:18 -05:00
Neerti
2062083176 Merge pull request #2684 from Anewbe/varsity
Fixes the varsity jacket sprites
2016-10-26 23:17:30 -04:00
Anewbe
59d410348a Fixes Aviators blocking flash incorrectly, adds in stylish aviators 2016-10-26 21:06:51 -05:00
Anewbe
b99ebf5dde Fixes the varsity jacket sprites 2016-10-26 16:32:18 -05:00
Yoshax
11209a5b0e Tweaks path from sechud/toggle to sechud/aviator 2016-10-25 20:40:26 +01:00
Yoshax
cf35da203b Tweak the code, adds a couple of ❄️ to make it work 2016-10-25 19:18:01 +01:00
Yoshax
5a232b8837 Ports Baystation12/Baystation12#14433 2016-10-25 18:54:16 +01:00
Anewbe
b6e1b67246 Sec gear tweaks 2016-10-24 18:50:14 -05:00
Neerti
7dadc5f6f9 Merge pull request #2658 from Anewbe/waistcoat
Waistcoats are accessories
2016-10-24 19:33:12 -04:00