diff --git a/code/modules/clothing/head/hood_vr.dm b/code/modules/clothing/head/hood_vr.dm index c7d5725df14..bca4854c646 100644 --- a/code/modules/clothing/head/hood_vr.dm +++ b/code/modules/clothing/head/hood_vr.dm @@ -18,6 +18,11 @@ armor = list(melee = 80, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 3 +/obj/item/clothing/head/hood/chain + name = "robin hood" + armor = list(melee = 60, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) + siemens_coefficient = 3 + // Costume Versions Here /obj/item/clothing/head/hood/galahad_costume name = "galahad costume hood" diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 9a7ca77f67e..e499f16a334 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -97,6 +97,18 @@ icon_state = "bedevere" body_parts_covered = CHEST +/obj/item/clothing/suit/armor/combat/crusader/quizzler + name = "knight's armor" + desc = "ye olde knight, risen again." + icon_state = "quizzler" + armor = list(melee = 60, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) + +/obj/item/clothing/suit/armor/combat/crusader/pink + name = "knight's armor" + desc = "ye olde knight, risen again." + icon_state = "pink" + armor = list(melee = 60, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) + // Costume Versions Here /obj/item/clothing/suit/armor/combat/crusader_costume name = "crusader costume armor" diff --git a/code/modules/clothing/suits/hooded_vr.dm b/code/modules/clothing/suits/hooded_vr.dm index 02702601dac..5ebdaea5623 100644 --- a/code/modules/clothing/suits/hooded_vr.dm +++ b/code/modules/clothing/suits/hooded_vr.dm @@ -45,6 +45,24 @@ slowdown = -1 siemens_coefficient = 3 +// Weaker variants for the redgate + +/obj/item/clothing/suit/storage/hooded/knight/chain + name = "chain armor" + icon_state = "chain" + hoodtype = /obj/item/clothing/head/hood/chain + armor = list(melee = 60, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) + slowdown = 0.5 + actions_types = list(/datum/action/item_action/toggle_knight_headgear) + +/obj/item/clothing/suit/storage/hooded/knight/chain/lezzy + icon_state = "lezzy" + hoodtype = /obj/item/clothing/head/hood/chain + +/obj/item/clothing/suit/storage/hooded/knight/chain/black_white + icon_state = "black_white" + hoodtype = /obj/item/clothing/head/hood/chain + // Costume Knight Gear Here /obj/item/clothing/suit/storage/hooded/knight_costume name = "crusader's costume armor" diff --git a/icons/obj/clothing/knights_vr.dmi b/icons/obj/clothing/knights_vr.dmi index 969b7530bbf..2f8df24cb44 100644 Binary files a/icons/obj/clothing/knights_vr.dmi and b/icons/obj/clothing/knights_vr.dmi differ diff --git a/maps/redgate/fantasy.dmm b/maps/redgate/fantasy.dmm index 55f01bacf1d..fdadd523904 100644 --- a/maps/redgate/fantasy.dmm +++ b/maps/redgate/fantasy.dmm @@ -7,12 +7,24 @@ /obj/structure/undies_wardrobe, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/house) +"ac" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/suit/armor/combat/crusader/quizzler, +/turf/simulated/floor/wood/alt, +/area/redgate/fantasy/house) "ad" = ( /obj/structure/bed/chair/sofa/left/purp{ dir = 8 }, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/castle) +"ae" = ( +/obj/structure/closet/crate/wooden, +/obj/item/flashlight/lantern, +/obj/item/material/knife/tacknife/boot, +/obj/item/clothing/suit/armor/combat/crusader/pink, +/turf/simulated/floor/wood/alt/panel, +/area/redgate/fantasy/walls) "ag" = ( /obj/machinery/light/small/torch, /turf/simulated/floor/carpet/purple, @@ -975,7 +987,7 @@ "gg" = ( /obj/structure/closet/crate/wooden, /obj/item/clothing/gloves/combat/knight, -/obj/item/clothing/suit/storage/hooded/knight/robin, +/obj/item/clothing/suit/storage/hooded/knight/chain, /obj/item/clothing/head/welding/knight, /obj/item/clothing/shoes/knight/black, /obj/machinery/light/small/torch{ @@ -7926,8 +7938,8 @@ /area/redgate/fantasy/streets) "XB" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/map_effect/interval/effect_emitter/smoke/fire, /obj/structure/bonfire, +/obj/effect/map_effect/interval/effect_emitter/smoke, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "XC" = ( @@ -9180,7 +9192,7 @@ Ew KM Jo KM -Jo +ae KM Cu KM @@ -10809,7 +10821,7 @@ Wt qK XO XO -XO +ac HC Wt dL diff --git a/maps/redgate/fantasy_dungeon.dmm b/maps/redgate/fantasy_dungeon.dmm index f542454e1e7..995f9720d41 100644 --- a/maps/redgate/fantasy_dungeon.dmm +++ b/maps/redgate/fantasy_dungeon.dmm @@ -1,4 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/item/clothing/suit/storage/hooded/knight/chain/lezzy, +/turf/simulated/floor/wmarble, +/area/redgate/fantasy/dungeon) "ac" = ( /turf/simulated/mineral/ignore_cavegen{ nitrogen = 93.7835; @@ -2019,6 +2023,7 @@ "OE" = ( /obj/structure/closet/crate/chest, /obj/random/fantasy_item, +/obj/item/clothing/suit/storage/hooded/knight/chain/black_white, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "OF" = ( @@ -17890,8 +17895,8 @@ kn kn kn kn -kn -kn +cK +cK kn cK Ux @@ -18032,9 +18037,9 @@ kn kn kn kn -kn -kn -kn +aa +cK +NF cK Ux IB @@ -18174,8 +18179,8 @@ kn kn kn kn -kn -kn +cK +cK kn cK Ux