Merge pull request #10901 from CosmicScientist/mobcostumes

Adds carp and Ian costumes
This commit is contained in:
Cheridan
2015-08-11 18:16:49 -05:00
15 changed files with 144 additions and 3 deletions
+3 -1
View File
@@ -870,7 +870,9 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/clothing/suit/poncho/green = 1, /obj/item/clothing/suit/poncho/red = 1,
/obj/item/clothing/under/maid = 1, /obj/item/clothing/under/janimaid = 1,/obj/item/clothing/glasses/cold=1,/obj/item/clothing/glasses/heat=1,
/obj/item/clothing/suit/whitedress = 1,
/obj/item/clothing/under/jester = 1, /obj/item/clothing/head/jester = 1)
/obj/item/clothing/under/jester = 1, /obj/item/clothing/head/jester = 1,
/obj/item/clothing/suit/hooded/carp_costume = 1,
/obj/item/clothing/suit/hooded/ian_costume = 1)
contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 2,/obj/item/clothing/glasses/sunglasses/garb = 2)
premium = list(/obj/item/clothing/suit/hgpirate = 2, /obj/item/clothing/head/hgpiratecap = 2, /obj/item/clothing/head/helmet/roman = 1, /obj/item/clothing/head/helmet/roman/legionaire = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, /obj/item/weapon/shield/riot/roman = 1)
refill_canister = /obj/item/weapon/vending_refill/autodrobe
+5 -1
View File
@@ -50,6 +50,10 @@
WL.amount = HH.amount
qdel(HH)
//Corgi costume says goodbye
for(var/obj/item/clothing/suit/hooded/ian_costume/IC in contents)
new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi(src)
qdel(IC)
if(crayon)
var/wash_color
@@ -199,7 +203,7 @@
else if(istype(W,/obj/item/weapon/grab))
if( (state == 1) && hacked)
var/obj/item/weapon/grab/G = W
if(ishuman(G.assailant) && iscorgi(G.affecting))
if(iscorgi(G.affecting))
G.affecting.loc = src
qdel(G)
state = 3
@@ -12,6 +12,14 @@
icon_state = "sheet-corgi"
origin_tech = null
var/global/list/datum/stack_recipe/corgi_recipes = list ( \
new/datum/stack_recipe("corgi costume", /obj/item/clothing/suit/hooded/ian_costume, 3, on_floor = 1), \
)
/obj/item/stack/sheet/animalhide/corgi/New(var/loc, var/amount=null)
recipes = corgi_recipes
return ..()
/obj/item/stack/sheet/animalhide/cat
name = "cat hide"
desc = "The by-product of cat farming."