From 694726e89dc05a33af6230722488639db4326157 Mon Sep 17 00:00:00 2001 From: Firecage Date: Wed, 9 May 2018 07:48:57 +0200 Subject: [PATCH 1/2] Replaces the Roman Shield and Roman Helmets in the autodrobe with fake versions with no block chance nor armour values. (#37683) * removes the block chance from the Roman Shield. * replaces the Roman Shield in the autodrobe with a toy version with no block chance. * replaces the armoured roman helmets from the autodrobe with fake ones. --- code/game/objects/items/shields.dm | 5 +++++ code/modules/clothing/head/helmet.dm | 8 ++++++++ code/modules/vending/autodrobe.dm | 6 +++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index dd8d8f8a10..367a10d21f 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -45,6 +45,11 @@ lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' +/obj/item/shield/riot/roman/fake + desc = "Bears an inscription on the inside: \"Romanes venio domus\". It appears to be a bit flimsy." + block_chance = 0 + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + /obj/item/shield/riot/buckler name = "wooden buckler" desc = "A medieval wooden buckler." diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 2e9b7f83f2..4bf68c3bd0 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -158,12 +158,20 @@ strip_delay = 100 dog_fashion = null +/obj/item/clothing/head/helmet/roman/fake + desc = "An ancient helmet made of plastic and leather." + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + /obj/item/clothing/head/helmet/roman/legionaire name = "roman legionaire helmet" desc = "An ancient helmet made of bronze and leather. Has a red crest on top of it." icon_state = "roman_c" item_state = "roman_c" +/obj/item/clothing/head/helmet/roman/legionaire/fake + desc = "An ancient helmet made of plastic and leather. Has a red crest on top of it." + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + /obj/item/clothing/head/helmet/gladiator name = "gladiator helmet" desc = "Ave, Imperator, morituri te salutant." diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 889b159762..c0cfe661d7 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -114,11 +114,11 @@ /obj/item/clothing/mask/muzzle = 2) premium = list(/obj/item/clothing/suit/pirate/captain = 2, /obj/item/clothing/head/pirate/captain = 2, - /obj/item/clothing/head/helmet/roman = 1, - /obj/item/clothing/head/helmet/roman/legionaire = 1, + /obj/item/clothing/head/helmet/roman/fake = 1, + /obj/item/clothing/head/helmet/roman/legionaire/fake = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, - /obj/item/shield/riot/roman = 1, + /obj/item/shield/riot/roman/fake = 1, /obj/item/skub = 1) refill_canister = /obj/item/vending_refill/autodrobe