cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 23:49:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks skirt pathing

Browse Source
This commit is contained in:
Anewbe
2016-09-06 22:31:42 -05:00
parent a94073a900
commit b7353696db
3 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+3 -3
View File
@@ -517,9 +517,9 @@
new /obj/item/clothing/under/color/yellow(src)
new /obj/item/clothing/under/color/green(src)
new /obj/item/clothing/under/color/pink(src)
new /obj/item/clothing/under/skirt/plaid_blue(src)
new /obj/item/clothing/under/skirt/plaid_red(src)
new /obj/item/clothing/under/skirt/plaid_purple(src)
new /obj/item/clothing/under/skirt/outfit/plaid_blue(src)
new /obj/item/clothing/under/skirt/outfit/plaid_red(src)
new /obj/item/clothing/under/skirt/outfit/plaid_purple(src)
new /obj/item/clothing/shoes/blue(src)
new /obj/item/clothing/shoes/yellow(src)
new /obj/item/clothing/shoes/green(src)
code/modules/clothing/under/shorts.dm
+13 -12
View File
@@ -91,10 +91,10 @@
//Argh, skirts be below this line -> ------------------------------
/obj/item/clothing/under/skirt
name = "black skirt"
desc = "A black skirt, very fancy!"
icon_state = "blackskirt"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
name = "short black skirt"
desc = "A skirt that is a shiny black."
icon_state = "skirt_short_black"
body_parts_covered = LOWER_TORSO
rolled_sleeves = -1
/obj/item/clothing/under/skirt/khaki
@@ -102,11 +102,6 @@
desc = "A skirt that is a khaki color."
icon_state = "skirt_khaki"
/obj/item/clothing/under/skirt/black
name = "short black skirt"
desc = "A skirt that is a shiny black."
icon_state = "skirt_short_black"
/obj/item/clothing/under/skirt/blue
name = "short blue skirt"
desc = "A skirt that is a shiny blue."
@@ -122,19 +117,25 @@
desc = "A skirt that is swept to one side."
icon_state = "skirt_swept"
/obj/item/clothing/under/skirt/plaid_blue
/obj/item/clothing/under/skirt/outfit
name = "black skirt"
desc = "A black skirt, very fancy!"
icon_state = "blackskirt"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/skirt/outfit/plaid_blue
name = "blue plaid skirt"
desc = "A preppy blue skirt with a white blouse."
icon_state = "plaid_blue"
item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
/obj/item/clothing/under/skirt/plaid_red
/obj/item/clothing/under/skirt/outfit/plaid_red
name = "red plaid skirt"
desc = "A preppy red skirt with a white blouse."
icon_state = "plaid_red"
item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
/obj/item/clothing/under/skirt/plaid_purple
/obj/item/clothing/under/skirt/outfit/plaid_purple
name = "blue purple skirt"
desc = "A preppy purple skirt with a white blouse."
icon_state = "plaid_purple"
html/changelogs/Anewbe - Skirts.yml
+36
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: N3X15
# 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:
- tweak: "Split skirts into 'skirts', which are just a skirt, and 'skirt outfits', which cover the upper body. Check your loadouts, they should remain otherwise unchanged."