From 772e931706557be51eb3e3329d88e41ee5cc7ab7 Mon Sep 17 00:00:00 2001 From: Artorp Date: Sun, 22 Feb 2015 20:45:26 +0100 Subject: [PATCH] Mime backpack: Mandatory & added to supply crates --- code/datums/supplypacks.dm | 1 + code/game/jobs/job/support.dm | 14 ++++---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index a3fbd9c9f86..60d0f2269a0 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1183,6 +1183,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/clothing/mask/gas/clown_hat, /obj/item/clothing/under/rank/clown, /obj/item/weapon/bikehorn, + /obj/item/weapon/storage/backpack/mime, /obj/item/clothing/under/mime, /obj/item/clothing/shoes/black, /obj/item/clothing/gloves/color/white, diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index f1f51148da9..08258a8f7cc 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -247,8 +247,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - if(H.backbag == 2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/mime(H), slot_back) - if(H.backbag == 3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) + H.equip_or_collect(new /obj/item/weapon/storage/backpack/mime(H), slot_back) if(H.gender == FEMALE) H.equip_or_collect(new /obj/item/clothing/under/sexymime(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/mask/gas/sexymime(H), slot_wear_mask) @@ -261,14 +260,9 @@ H.equip_or_collect(new /obj/item/clothing/gloves/color/white(H), slot_gloves) H.equip_or_collect(new /obj/item/clothing/head/beret(H), slot_head) H.equip_or_collect(new /obj/item/clothing/suit/suspenders(H), slot_wear_suit) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - H.equip_or_collect(new /obj/item/toy/crayon/mime(H), slot_l_store) - H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_l_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/toy/crayon/mime(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/toy/crayon/mime(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack) H.verbs += /client/proc/mimespeak H.verbs += /client/proc/mimewall H.mind.special_verbs += /client/proc/mimespeak