mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 13:07:46 +01:00
New suit for captain added to captain's locker:
-captain tunic -cap. New suits for chaplain were placed in his/her wardrobe: -Nun robe -Hoodie -outfit of Imperium monk Credits for captain's and chaplain's stuff belongs to Farart. Red jumpsuit (worn by security) for fat cops was fixed by axc9. Glitch with items placed to/got from container laying on floor was fixed by Laguis. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1539 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user