diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index b681f50ffdc..36cfdafc078 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -39,6 +39,19 @@ throwforce = 1 w_class = 3 +/obj/item/weapon/claymore + name = "claymore" + desc = "what are you standing around staring at this for? get to killing!" + icon_state = "claymore" + item_state = "claymore" + flags = FPRINT | ONBELT | TABLEPASS + force = 40 + throwforce = 10 + w_class = 3 + + IsShield() + return 1 + /obj/item/weapon/bodybag name = "body bag" desc = "Bag mixed with a bit of body." diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index f2f27470b88..a59754dee87 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -11,7 +11,6 @@ if(H.stat == 2 || !(H.client)) continue if(is_special_character(H)) continue - ticker.mode.equip_traitor(H) ticker.mode.traitors += H.mind H.mind.special_role = "traitor" @@ -31,5 +30,26 @@ obj_count++ new /obj/item/weapon/pinpointer(H.loc) + for (var/obj/item/I in H) + if (istype(I, /obj/item/weapon/implant)) + continue + del(I) + + + H.equip_if_possible(new /obj/item/clothing/under/kilt(H), H.slot_w_uniform) + H.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(H), H.slot_ears) + H.equip_if_possible(new /obj/item/clothing/head/beret(H), H.slot_head) + H.equip_if_possible(new /obj/item/weapon/claymore(H), H.slot_l_hand) + H.equip_if_possible(new /obj/item/clothing/shoes/combat(H), H.slot_shoes) + + var/obj/item/weapon/card/id/W = new(H) + W.name = "[H.real_name]'s ID Card" + W.icon_state = "centcom" + W.access = get_all_accesses() + W.access += get_all_centcom_access() + W.assignment = "Highlander" + W.registered = H.real_name + H.equip_if_possible(W, H.slot_wear_id) + message_admins("\blue [key_name_admin(usr)] used THERE CAN BE ONLY ONE!", 1) log_admin("[key_name(usr)] used there can be only one.") \ No newline at end of file diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index d3f19588391..95ee3203994 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 5ca0f2fd8a5..ea608238b60 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index bf8e2b275c8..c5b07d9864c 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ