Skip to content

Commit

Permalink
Ghouls can (once again) replace their limbs with meat slabs (#2211)
Browse files Browse the repository at this point in the history
* add ghouls as human mob type

* Fix ghoul limb attach

* change back proc name

Co-authored-by: Sable <[email protected]>
  • Loading branch information
Steals-The-PRs and Thlumyn authored Mar 1, 2024
1 parent f497bde commit 6deefac
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
/mob/living/carbon/human/species/dwarf
race = /datum/species/dwarf

/mob/living/carbon/human/species/ghoul
race = /datum/species/ghoul

/mob/living/carbon/human/species/roundstartslime
race = /datum/species/jelly/roundstartslime

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
set_ghoul_color(human_ghoul)

// 2) BODYPARTS
RegisterSignal(src, COMSIG_ITEM_ATTACK, PROC_REF(attach_meat))
RegisterSignal(human_ghoul, COMSIG_ATOM_ATTACKBY, PROC_REF(attach_meat))
human_ghoul.part_default_head = /obj/item/bodypart/head/mutant/ghoul
human_ghoul.part_default_chest = /obj/item/bodypart/chest/mutant/ghoul
human_ghoul.part_default_l_arm = /obj/item/bodypart/arm/left/mutant/ghoul
Expand All @@ -112,7 +112,7 @@
. = ..()

// 2) BODYPARTS
UnregisterSignal(src, COMSIG_ITEM_ATTACK)
UnregisterSignal(former_ghoul, COMSIG_ATOM_ATTACKBY)
former_ghoul.part_default_head = /obj/item/bodypart/head
former_ghoul.part_default_chest = /obj/item/bodypart/chest
former_ghoul.part_default_l_arm = /obj/item/bodypart/arm/left
Expand Down Expand Up @@ -162,7 +162,7 @@

return COMPONENT_CANCEL_ATTACK_CHAIN

/datum/species/ghoul/proc/attach_meat(obj/item/attacking_item, mob/living/carbon/human/target, mob/living/user, params)
/datum/species/ghoul/proc/attach_meat(mob/living/carbon/human/target, obj/item/attacking_item, mob/living/user, params)
SIGNAL_HANDLER

if(!istype(target))
Expand Down

0 comments on commit 6deefac

Please sign in to comment.