diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm index 55cea8a97d2..3d9e50a99b9 100644 --- a/code/defines/obj/clothing/head.dm +++ b/code/defines/obj/clothing/head.dm @@ -248,4 +248,15 @@ name = "pirate hat" desc = "Yarr." icon_state = "pirate" - item_state = "pirate" \ No newline at end of file + item_state = "pirate" + + +/obj/item/clothing/head/helmet/cap + name = "Captain's cap" + icon_state = "capcap" + flags = FPRINT|TABLEPASS|SUITSPACE + +/obj/item/clothing/head/chaplain_hood + name = "Chaplain's hood" + icon_state = "chaplain_hood" + flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index 0e416139aa3..57dab3ae0e8 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -392,4 +392,34 @@ item_state = "pirate" w_class = 3 allowed = list(/obj/item/weapon/gun,/obj/item/weapon/ammo,/obj/item/weapon/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) - slowdown = 0 \ No newline at end of file + slowdown = 0 + + +/obj/item/clothing/suit/captunic + name = "Captain's parade tunic" + icon_state = "captunic" + item_state = "bio_suit" + flags = FPRINT | TABLEPASS | ONESIZEFITSALL + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + +/obj/item/clothing/suit/nun + name = "Nun robe" + desc = "Maximum piety in this star system." + icon_state = "nun" + item_state = "nun" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS + +/obj/item/clothing/suit/chaplain_hoodie + name = "Chaplain hoodie" + desc = "This suit says you 'hush'!" + icon_state = "chaplain_hoodie" + item_state = "chaplain_hoodie" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + +/obj/item/clothing/suit/imperium_monk + name = "Imperium monk everyday outfit" + desc = "Are YOU killed a xenos today?" + icon_state = "imperium_monk" + item_state = "imperium_monk" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + diff --git a/code/game/objects/closets/secure/captain.dm b/code/game/objects/closets/secure/captain.dm index 9373d545d37..160789c983a 100644 --- a/code/game/objects/closets/secure/captain.dm +++ b/code/game/objects/closets/secure/captain.dm @@ -10,4 +10,6 @@ new /obj/item/clothing/glasses/sunglasses( src ) new /obj/item/clothing/suit/armor/vest( src ) new /obj/item/clothing/head/helmet/swat( src ) + new /obj/item/clothing/suit/captunic( src ) + new /obj/item/clothing/head/helmet/cap( src ) return diff --git a/code/game/objects/closets/wardrobe.dm b/code/game/objects/closets/wardrobe.dm index 7cd38a25db8..4466c953112 100644 --- a/code/game/objects/closets/wardrobe.dm +++ b/code/game/objects/closets/wardrobe.dm @@ -74,19 +74,16 @@ new /obj/item/clothing/head/that( src ) new /obj/item/clothing/head/that( src ) return + /obj/closet/wardrobe/chaplain_black/New() - new /obj/item/clothing/under/rank/chaplain( src ) - new /obj/item/clothing/under/rank/chaplain( src ) - new /obj/item/clothing/under/rank/chaplain( src ) - new /obj/item/clothing/under/rank/chaplain( src ) + new /obj/item/clothing/suit/imperium_monk( src ) new /obj/item/clothing/under/rank/chaplain( src ) new /obj/item/clothing/under/rank/chaplain( src ) new /obj/item/clothing/shoes/black( src ) new /obj/item/clothing/shoes/black( src ) - new /obj/item/clothing/shoes/black( src ) - new /obj/item/clothing/shoes/black( src ) - new /obj/item/clothing/shoes/black( src ) - new /obj/item/clothing/shoes/black( src ) + new /obj/item/clothing/suit/nun( src ) + new /obj/item/clothing/suit/chaplain_hoodie( src ) + new /obj/item/clothing/head/chaplain_hood( src ) return /obj/closet/wardrobe/green/New() diff --git a/code/game/objects/storage/storage.dm b/code/game/objects/storage/storage.dm index 8abaa8c6ae6..af59727e4b8 100644 --- a/code/game/objects/storage/storage.dm +++ b/code/game/objects/storage/storage.dm @@ -64,21 +64,22 @@ src.closer.screen_loc = text("[],[]", mx, my) return + /obj/item/weapon/storage/proc/orient2hud(mob/user as mob) + var/mob/living/carbon/human/H = user if (src == user.l_hand) src.orient_objs(3, 11, 3, 4) else if(src == user.r_hand) src.orient_objs(1, 11, 1, 4) else if(src == user.back) src.orient_objs(4, 10, 4, 3) - else if(istype(user, /mob/living/carbon/human))//only humans have belts - var/mob/living/carbon/human/H = user - if(src == H.belt) - src.orient_objs(1, 3, 8, 3) - else + else if(istype(user, /mob/living/carbon/human) && src == H.belt)//only humans have belts + src.orient_objs(1, 3, 8, 3) + else src.orient_objs(7, 8, 10, 7) return + /obj/item/weapon/storage/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if(isrobot(user)) diff --git a/icons/Thumbs.db b/icons/Thumbs.db deleted file mode 100644 index 735318b5f40..00000000000 Binary files a/icons/Thumbs.db and /dev/null differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index c52fe00aff1..ef3e6ee5df7 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index c02fa6b9019..e8ae45b06b0 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 826917695bc..a73021358b0 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 79c1693a587..fb3955a4bba 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform_fat.dmi b/icons/mob/uniform_fat.dmi index c6c53109d7d..fd67967a2cc 100644 Binary files a/icons/mob/uniform_fat.dmi and b/icons/mob/uniform_fat.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 4eae23ec43e..c16e54014a3 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 424fa4318b4..f51ce181a97 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/pda_icons/Thumbs.db b/icons/pda_icons/Thumbs.db deleted file mode 100644 index 9539a94b773..00000000000 Binary files a/icons/pda_icons/Thumbs.db and /dev/null differ