Merge pull request #3583 from Belsima/sweaters

Adds a boatload of sweaters.
This commit is contained in:
Anewbe
2017-07-11 11:24:15 -05:00
committed by GitHub
5 changed files with 99 additions and 1 deletions

View File

@@ -316,3 +316,16 @@
shirts["red hawaii shirt"] = /obj/item/clothing/accessory/hawaii/red
shirts["random colored hawaii shirt"] = /obj/item/clothing/accessory/hawaii/random
gear_tweaks += new/datum/gear_tweak/path(shirts)
/datum/gear/accessory/sweater
display_name = "Sweater Selection"
path = /obj/item/clothing/accessory/sweater
/datum/gear/accessory/sweater/New()
..()
var/list/sweaters = list()
for(var/sweater in typesof(/obj/item/clothing/accessory/sweater))
var/obj/item/clothing/suit/sweater_type = sweater
sweaters[initial(sweater_type.name)] = sweater_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sweaters))

View File

@@ -173,3 +173,52 @@
/obj/item/clothing/accessory/wcoat/swvest/red
name = "red sweatervest"
icon_state = "sweatervest_red"
/obj/item/clothing/accessory/sweater
name = "sweater"
desc = "A warm knit sweater."
icon_override = 'icons/mob/ties.dmi'
icon_state = "sweater"
slot_flags = SLOT_OCLOTHING | SLOT_TIE
body_parts_covered = UPPER_TORSO|LOWER_TORSO
w_class = ITEMSIZE_NORMAL
/obj/item/clothing/accessory/sweater/pink
name = "pink sweater"
desc = "A warm knit sweater. This one's pink in color."
icon_state = "sweater_pink"
/obj/item/clothing/accessory/sweater/mint
name = "mint sweater"
desc = "A warm knit sweater. This one has a minty tint to it."
icon_state = "mint_sweater"
/obj/item/clothing/accessory/sweater/blue
name = "blue sweater"
desc = "A warm knit sweater. This one's colored in a lighter blue."
icon_state = "sweater_blue"
/obj/item/clothing/accessory/sweater/heart
name = "heart sweater"
desc = "A warm knit sweater. This one's colored in a lighter blue, and has a big pink heart right in the center!"
icon_state = "sweater_blueheart"
/obj/item/clothing/accessory/sweater/nt
name = "dark blue sweater"
desc = "A warm knit sweater. This one's a darker blue."
icon_state = "sweater_nt"
/obj/item/clothing/accessory/sweater/keyhole
name = "keyhole sweater"
desc = "A lavender sweater with an open chest."
icon_state = "keyholesweater"
/obj/item/clothing/accessory/sweater/blackneck
name = "black turtleneck"
desc = "A tight turtleneck, entirely black in coloration."
icon_state = "turtleneck_black"
/obj/item/clothing/accessory/sweater/winterneck
name = "Christmas turtleneck"
desc = "A really cheesy holiday sweater, it actually kinda itches."
icon_state = "turtleneck_winterred"

View File

@@ -0,0 +1,36 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Belsima
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Added a load of sweaters to the accessories tab of the loadout."

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 30 KiB