From cef6aeef55e22a1d061a4d7580da388953a1f91c Mon Sep 17 00:00:00 2001 From: yackemflam Date: Wed, 25 Dec 2024 12:32:08 -0500 Subject: [PATCH] Goblin changes (#319) * Nerf goblin armor * Update goblin.dm * Update goblin.dm --- code/modules/clothing/rogueclothes/npc/goblin.dm | 8 ++++++++ code/modules/mob/living/carbon/human/npc/goblin.dm | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/rogueclothes/npc/goblin.dm b/code/modules/clothing/rogueclothes/npc/goblin.dm index 9c15068a9f3..30cdeced7c6 100644 --- a/code/modules/clothing/rogueclothes/npc/goblin.dm +++ b/code/modules/clothing/rogueclothes/npc/goblin.dm @@ -2,6 +2,8 @@ name = "goblin mail" icon_state = "plate_armor_item" item_state = "plate_armor" + armor = list("blunt" = 40, "slash" = 50, "stab" = 40, "bullet" = 50, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + max_integrity = 125 icon = 'icons/roguetown/mob/monster/goblins.dmi' smeltresult = /obj/item/ingot/iron allowed_race = list(/datum/species/goblin, /datum/species/goblin/hell, /datum/species/goblin/cave, /datum/species/goblin/sea, /datum/species/goblin/moon) @@ -13,6 +15,8 @@ name = "goblin armor" icon_state = "leather_armor_item" item_state = "leather_armor" + armor = list("blunt" = 30, "slash" = 25, "stab" = 20, "bullet" = 15, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + max_integrity = 75 icon = 'icons/roguetown/mob/monster/goblins.dmi' body_parts_covered = CHEST|GROIN|ARMS|VITALS flags_inv = HIDEBOOB @@ -42,6 +46,8 @@ /obj/item/clothing/head/roguetown/helmet/leather/goblin name = "goblin helmet" icon = 'icons/roguetown/clothing/head.dmi' + armor = list("blunt" = 40, "slash" = 35, "stab" = 30, "bullet" = 25, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + max_integrity = 50 mob_overlay_icon = 'icons/roguetown/clothing/onmob/head.dmi' icon_state = "leather_helm_item" item_state = "leather_helm" @@ -53,8 +59,10 @@ name = "goblin helmet" icon_state = "plate_helm_item" item_state = "plate_helm" + armor = list("blunt" = 45, "slash" = 50, "stab" = 40, "bullet" = 50, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) icon = 'icons/roguetown/mob/monster/goblins.dmi' allowed_race = list(/datum/species/goblin, /datum/species/goblin/hell, /datum/species/goblin/cave, /datum/species/goblin/sea, /datum/species/goblin/moon) body_parts_covered = HEAD|EARS|HAIR|EYES sellprice = 0 + max_integrity = 100 smeltresult = /obj/item/ingot/iron diff --git a/code/modules/mob/living/carbon/human/npc/goblin.dm b/code/modules/mob/living/carbon/human/npc/goblin.dm index 83bfd825811..06f1e207c7f 100644 --- a/code/modules/mob/living/carbon/human/npc/goblin.dm +++ b/code/modules/mob/living/carbon/human/npc/goblin.dm @@ -281,7 +281,7 @@ if(headdy) headdy.icon = 'icons/roguetown/mob/monster/goblins.dmi' headdy.icon_state = "[src.dna.species.id]_head" - headdy.sellprice = rand(7,40) + headdy.sellprice = 30 src.grant_language(/datum/language/orcish) var/obj/item/organ/eyes/eyes = src.getorganslot(ORGAN_SLOT_EYES) if(eyes)