Skip to content

Commit

Permalink
Goblin changes (#319)
Browse files Browse the repository at this point in the history
* Nerf goblin armor

* Update goblin.dm

* Update goblin.dm
  • Loading branch information
yackemflam authored Dec 25, 2024
1 parent a34ee30 commit cef6aee
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
8 changes: 8 additions & 0 deletions code/modules/clothing/rogueclothes/npc/goblin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/npc/goblin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit cef6aee

Please sign in to comment.