Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/datums/helper_datums/butchering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,10 @@
if(color_data)
F.color = color_data["hex"]
F.name = "[color_data["name"]] feather"
if(amount == 0)
if(amount >= 5) // Stores original tone when the first feather is plucked.
if(!V.original_vox_tone)
V.original_vox_tone = V.my_appearance.s_tone
if(amount == 0)
V.my_appearance.s_tone = VOXPLUCKED
to_chat(V, "<span class='notice'>Your plumage is looking a bit bare...</span>")
V.species.updatespeciescolor(V)
Expand Down
6 changes: 5 additions & 1 deletion code/modules/dna/genes/monkey.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@
if (borer.controlling)
Mo.do_release_control(0)

var/mob/living/carbon/human/O = new(src)
var/mob/living/carbon/human/O
if(Mo.greaterform == "Vox")
O = new /mob/living/carbon/human/vox(src) //Special case for vox, needed for vox chickens else they never get feathers.
else
O = new(src)
if(Mo.greaterform)
O.set_species(Mo.greaterform) //Damage transfer is handled later in the code
Mo.transferImplantsTo(O)
Expand Down
Loading