Apparently the blue lawyer jacket didn't actually button up properly. Now it should button up, and uses the same system as everything else.

This commit is contained in:
MagmaRam
2014-11-11 12:47:02 -05:00
parent 3e5117e3eb
commit d09d8cf921
5 changed files with 8 additions and 28 deletions

View File

@@ -1003,7 +1003,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/formal_wear /datum/supply_packs/formal_wear
contains = list(/obj/item/clothing/head/bowler, contains = list(/obj/item/clothing/head/bowler,
/obj/item/clothing/head/that, /obj/item/clothing/head/that,
/obj/item/clothing/suit/storage/lawyer/bluejacket, /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket,
/obj/item/clothing/suit/storage/lawyer/purpjacket, /obj/item/clothing/suit/storage/lawyer/purpjacket,
/obj/item/clothing/under/suit_jacket, /obj/item/clothing/under/suit_jacket,
/obj/item/clothing/under/suit_jacket/female, /obj/item/clothing/under/suit_jacket/female,

View File

@@ -96,7 +96,7 @@
new /obj/item/clothing/under/lawyer/black(src) new /obj/item/clothing/under/lawyer/black(src)
new /obj/item/clothing/under/lawyer/red(src) new /obj/item/clothing/under/lawyer/red(src)
new /obj/item/clothing/under/lawyer/bluesuit(src) new /obj/item/clothing/under/lawyer/bluesuit(src)
new /obj/item/clothing/suit/storage/lawyer/bluejacket(src) new /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket(src)
new /obj/item/clothing/under/lawyer/purpsuit(src) new /obj/item/clothing/under/lawyer/purpsuit(src)
new /obj/item/clothing/suit/storage/lawyer/purpjacket(src) new /obj/item/clothing/suit/storage/lawyer/purpjacket(src)
new /obj/item/clothing/shoes/brown(src) new /obj/item/clothing/shoes/brown(src)

View File

@@ -141,11 +141,13 @@
sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
//Lawyer //Lawyer
/obj/item/clothing/suit/storage/lawyer/bluejacket /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket
name = "Blue Suit Jacket" name = "Blue Suit Jacket"
desc = "A snappy dress jacket." desc = "A snappy dress jacket."
icon_state = "suitjacket_blue_open" icon_state = "suitjacket_blue_open"
item_state = "suitjacket_blue_open" item_state = "suitjacket_blue_open"
icon_open = "suitjacket_blue_open"
icon_closed = "suitjacket_blue"
blood_overlay_type = "coat" blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS body_parts_covered = UPPER_TORSO|ARMS

View File

@@ -199,28 +199,6 @@
item_state = "ianshirt" item_state = "ianshirt"
body_parts_covered = UPPER_TORSO|ARMS body_parts_covered = UPPER_TORSO|ARMS
//Blue suit jacket toggle
/obj/item/clothing/suit/suit/verb/toggle()
set name = "Toggle Jacket Buttons"
set category = "Object"
set src in usr
if(!usr.canmove || usr.stat || usr.restrained())
return 0
if(src.icon_state == "suitjacket_blue_open")
src.icon_state = "suitjacket_blue"
src.item_state = "suitjacket_blue"
usr << "You button up the suit jacket."
else if(src.icon_state == "suitjacket_blue")
src.icon_state = "suitjacket_blue_open"
src.item_state = "suitjacket_blue_open"
usr << "You unbutton the suit jacket."
else
usr << "You button-up some imaginary buttons on your [src]."
return
update_clothing_icon()
//pyjamas //pyjamas
//originally intended to be pinstripes >.> //originally intended to be pinstripes >.>

View File

@@ -120,7 +120,7 @@
New() New()
..() ..()
var/blocked = list(/obj/item/clothing/suit/chameleon, /obj/item/clothing/suit/space/space_ninja, var/blocked = list(/obj/item/clothing/suit/chameleon, /obj/item/clothing/suit/space/space_ninja,
/obj/item/clothing/suit/golem, /obj/item/clothing/suit/suit, /obj/item/clothing/suit/cyborg_suit, /obj/item/clothing/suit/justice, /obj/item/clothing/suit/golem, /obj/item/clothing/suit/cyborg_suit, /obj/item/clothing/suit/justice,
/obj/item/clothing/suit/greatcoat)//Prevent infinite loops and bad suits. /obj/item/clothing/suit/greatcoat)//Prevent infinite loops and bad suits.
for(var/U in typesof(/obj/item/clothing/suit)-blocked) for(var/U in typesof(/obj/item/clothing/suit)-blocked)
var/obj/item/clothing/suit/V = new U var/obj/item/clothing/suit/V = new U
@@ -257,7 +257,7 @@
icon_state = A.icon_state icon_state = A.icon_state
item_state = A.item_state item_state = A.item_state
item_color = A.item_color item_color = A.item_color
//so our overlays update. //so our overlays update.
if (ismob(src.loc)) if (ismob(src.loc))
var/mob/M = src.loc var/mob/M = src.loc
@@ -464,7 +464,7 @@
icon_state = A.icon_state icon_state = A.icon_state
item_state = A.item_state item_state = A.item_state
flags_inv = A.flags_inv flags_inv = A.flags_inv
//so our overlays update. //so our overlays update.
if (ismob(src.loc)) if (ismob(src.loc))
var/mob/M = src.loc var/mob/M = src.loc