diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index dc6177aa9b62..67cbd0a9f81c 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -279,6 +279,18 @@ /obj/item/clothing/suit/armor/vest) crate_name = "armor crate" +/datum/supply_pack/security/stormtrooper + name = "Stormtrooper Crate" + desc = "Three Sets of standard issue Stormtrooper Armor, Should help you defeat light wielding wizards . Requires Security access to open." + cost = 10000 + contains = list(/obj/item/clothing/suit/armor/stormtrooper, + /obj/item/clothing/suit/armor/stormtrooper, + /obj/item/clothing/suit/armor/stormtrooper, + /obj/item/clothing/head/stormer, + /obj/item/clothing/head/stormer, + /obj/item/clothing/head/stormer) + crate_name = "Stormtrooper crate" + /datum/supply_pack/security/disabler name = "Disabler Crate" desc = "Three stamina-draining disabler weapons. Requires Security access to open." diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 2355a80b89a5..42f1d4e9d86c 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -147,6 +147,22 @@ icon_state = "justice2" toggle_message = "You turn off the light on" alt_toggle_message = "You turn on the light on" + +/obj/item/clothing/head/stormer + name = "Storm Trooper Helmet" + desc = "Battle Helmet from a long lost empire" + icon_state = "startrooperhelmet" + item_state = "startrooperhelmet" + armor = list("melee" = 30, "bullet" = 20, "laser" = 40,"energy" = 30, "bomb" = 25, "bio" = 40, "rad" = 20, "fire" = 50, "acid" = 50) + flags_inv = HIDEEARS + cold_protection = HEAD + min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT + heat_protection = HEAD + max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT + strip_delay = 60 + resistance_flags = NONE + flags_cover = HEADCOVERSEYES + flags_inv = HIDEHAIR /obj/item/clothing/head/helmet/swat name = "\improper SWAT helmet" @@ -396,4 +412,4 @@ set_light(0) for(var/X in actions) var/datum/action/A = X - A.UpdateButtonIcon() \ No newline at end of file + A.UpdateButtonIcon() diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 7cd9d54c7fa0..152d8a0f43ff 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -269,3 +269,14 @@ cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT armor = list("melee" = 25, "bullet" = 20, "laser" = 20, "energy" = 10, "bomb" = 20, "bio" = 50, "rad" = 20, "fire" = -10, "acid" = 50) + +/obj/item/clothing/suit/armor/stormtrooper + name = "Storm Trooper Armor" + desc = "Battle Armor from a long lost empire" + icon_state = "startrooper" + item_state = "startrooper" + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor = list("melee" = 20, "bullet" = 20, "laser" = 60, "energy" = 20, "bomb" = 30, "bio" = 20, "rad" = 10, "fire" = 80, "acid" = 80) + slowdown = 0.9 diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 977dda0370ec..f42ad2618dac 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 4f7884788ab4..c79a5101bfb0 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ