Commit Graph

322 Commits

Author SHA1 Message Date
Neerti
8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Belsima
d4e3b4453d A load of Teshari stuff: For Real This time 2017-08-10 16:12:16 -04:00
Cameron653
97957fcaee Replaces more macros. (#3647)
* MORE MACRO CHANGES

AHHHHHHHHHHHHHHHHHHHH

* Fixes a few typos

* Fixes compile error

* Fixes for real

* 4 macros left that I can't find
2017-07-27 21:12:21 -05:00
Spades
7e4417d31f It's CentCOM not CentCOMM
I swear to god I have fixed this like three times already and somehow it
keeps coming back.
2017-07-21 04:29:39 -04:00
Anewbe
da004981e6 Rolling sleeves on flannel shirts now uncovers your arms 2017-07-10 16:44:57 -05:00
Anewbe
81e7d9ce42 Merge pull request #3513 from Belsima/snowsuit
Adds snowsuits.
2017-06-25 16:27:43 -05:00
Belsima
a62c91ebd3 Appeases the mergelords. 2017-06-16 20:27:08 -04:00
Leshana
4b46703d9d A plethora of Destroy() fixes - return qdel hints and clean stuff up. 2017-06-14 01:07:35 -04:00
Belsima
11ceb9e92f Adds snowsuits.
Also fixes department jacket access.
2017-06-08 10:02:30 -04:00
MagmaRam
a7d99942f4 Merge pull request #3443 from Anewbe/sifDefenseForce
[Lore] Renames the Sif Homeguard to Sif Defense Force
2017-05-23 20:38:44 -05:00
Schnayy
b1cb74b318 Adds 4 new clothing sprites & puts them in the loadout.
Peacoats: Requested.

Black corset/skirt combo: Requested.

Flower dress: First ss13 sprite I made, threw it in.

Red swept dress: A new, nicer red dress.
2017-05-22 18:08:01 -05:00
Anewbe
3109419c93 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sifDefenseForce 2017-05-12 16:22:09 -05:00
Anewbe
69896f3133 Renames the Sif Homeguard Corps to Sif Defense Force 2017-05-12 16:21:51 -05:00
Anewbe
5bed51da31 Fixes a straightjacket bug 2017-05-06 15:40:38 -05:00
Neerti
6bd0f8742e Finished coding makeshift armor. 2017-04-18 03:16:10 -04:00
Anewbe
8bc31fc027 Fixes the EMT labcoat sprite 2017-04-08 13:15:06 -05:00
Anewbe
e9c4b5a3eb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	icons/mob/back.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
Anewbe
8e9db2b7d4 Aprons now have pockets 2017-04-02 00:28:20 -05:00
Anewbe
7bb3f5fbb7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm
2017-04-01 12:45:45 -05:00
Schnayy
a5384dab83 Fixed in-hand sprites, made adjustment to open icon. 2017-03-29 14:00:57 -05:00
Schnayy
5cf0d35d1d Adds Department Color Jackets
Moves/renames red&black jacket to sec_dep_jacket, adds supply, engineering, medical, and science jackets. Puts them all in the loadout.

Have one issue: when the jacket is open there are no handsprites. How do I fix that without duplicating sprites?
2017-03-28 03:39:10 -05:00
Anewbe
2e5e77997a Reworks how some jackets open 2017-03-26 16:58:27 -05:00
Schnayy
ade40d627e Added 3 clothing sprites w/ appropriate ground/held sprites. (#3134)
* Added 3 clothing sprites w/ appropriate ground/held sprites.

1, white yoga pants, intended to be any color.

2, white kimono, intended to be any color.

3, red and black jacket.

All intended to be in the loadout.

* Put coding in. Jacket has pockets, same cold resistance as a hoodie. Kimono and yoga pants have color selectors. All are in the loadout.

* Removed cold protection from jacket & fixed missing mob sprites. Don't know what happened with the latter, was definitely there when I tested it.
2017-03-25 17:44:04 -05:00
Anewbe
81549fc965 Revert "BlockHeadHair doesn't make players bald." 2017-03-03 17:19:07 -06:00
nachomeep
ef7be38ed4 Fixes hoods.
CLIPPING ERROR DETECTED
2017-02-26 09:17:03 -05:00
nachomeep
9d3aba5832 Fixes blockheadhair tag. 2017-02-25 09:49:24 -05:00
Anewbe
2de037fbbf Ports a bunch of fluff stuff 2017-02-21 13:50:14 -06:00
Anewbe
ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Anewbe
fda82d4b17 Hood tweaks 2017-01-18 17:02:01 -06:00
Anewbe
d53cfc4773 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi
2017-01-17 22:05:38 -06:00
Anewbe
00dfa331f3 Renames SCG Expeditionary Corps to Sif Homeguard Corps (SifGuard) 2017-01-14 18:06:31 -06:00
Anewbe
2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -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
ba1225048e Armor can hold helmets in suit storage 2016-11-16 22:43:32 -06:00
Anewbe
585a6b04af Moves armor set slowdown to torso, from arms 2016-11-14 15:09:29 -06:00
MagmaRam
bff4e6a4e1 Makes clothing actually hide stuff, fixes a couple odd related bugs. 2016-11-10 18:00:31 -06: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
Anewbe
b99ebf5dde Fixes the varsity jacket sprites 2016-10-26 16:32:18 -05:00
Anewbe
b6e1b67246 Sec gear tweaks 2016-10-24 18:50:14 -05:00
Anewbe
510cf17723 Waistcoats are accessories 2016-10-19 22:29:22 -05:00
Spades
2330968176 Replaces Station Administrator 2016-10-06 22:38:02 -04:00
redstryker
1f3a601075 Crowd Control Voidsuits and Bugfix 2016-10-04 21:19:58 -04:00
woodratt
d5b79a7d7b Edits to the radiation hood sprite
Adds "flags_inv = BLOCKHAIR" to the file for the radiation hood so ponytails and other hair doesn't clip through.

Adjusts the sprite of the hood as well to help hide the fact the hair is missing underneath the faceplate.
2016-10-04 14:34:24 -07:00
Anewbe
29141f9606 Merge pull request #2528 from SpadesNeil/heavy-armor-suit
Heavy Armor values reworked for FUN™
2016-10-03 16:53:49 -05:00
redstryker
2839d26e19 Multitude of Halloween Stuffs 2016-10-01 20:33:11 -04:00
redstryker
8befd08226 Fixed Oversight 2016-09-26 20:56:53 -04:00
redstryker
7e291d37df Made the Jackets Toggle and Fixed Errors 2016-09-26 20:55:25 -04:00
redstryker
ad9860afbb Denim Jackets and Leather Jacket Buttons and Variations 2016-09-26 20:47:30 -04:00
woodratt
3915842f7b Trenchcoats and more
- Added unarmored versions of the grey and brown trenchcoats to the loadout.
- Added their accompanying fedoras as well.
- Added a unarmored variant of the 'gentlemen's coat' to the loadout as well, called grey jacket.
2016-09-25 23:40:28 -07:00