Skip to content

Commit

Permalink
Fixes the Working Joe mistake I caused (#3842)
Browse files Browse the repository at this point in the history
# About the pull request

Turns out #3792 made a second Joe species and overwrote it, oops
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game

bug bad
# Changelog

:cl:
fix: Fixes the Working Joe species
/:cl:
  • Loading branch information
BeagleGaming1 authored Jul 10, 2023
1 parent 6a7e68f commit 21b3bbc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
12 changes: 0 additions & 12 deletions code/modules/mob/living/carbon/human/species/synthetic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,6 @@
icobase = 'icons/mob/humans/species/r_synthetic.dmi'
deform = 'icons/mob/humans/species/r_synthetic.dmi'

/datum/species/synthetic/colonial/working_joe
name = SYNTH_WORKING_JOE
name_plural = "Working Joes"
uses_ethnicity = FALSE
burn_mod = 0.65 // made for hazardous environments, withstanding temperatures up to 1210 degrees
mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES, TRAIT_EMOTE_CD_EXEMPT, TRAIT_CANNOT_EAT)

slowdown = 0.45
hair_color = "#000000"
icobase = 'icons/mob/humans/species/r_synthetic.dmi'
deform = 'icons/mob/humans/species/r_synthetic.dmi'

// Synth used for W-Y Deathsquads
/datum/species/synthetic/colonial/combat
name = SYNTH_COMBAT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
name = SYNTH_WORKING_JOE
name_plural = "Working Joes"
uses_ethnicity = FALSE
mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES, TRAIT_EMOTE_CD_EXEMPT)
burn_mod = 0.65 // made for hazardous environments, withstanding temperatures up to 1210 degrees
mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES, TRAIT_EMOTE_CD_EXEMPT, TRAIT_CANNOT_EAT)

slowdown = 0.45
hair_color = "#000000"
icobase = 'icons/mob/humans/species/r_synthetic.dmi'
deform = 'icons/mob/humans/species/r_synthetic.dmi'


/datum/species/synthetic/colonial/working_joe/handle_post_spawn(mob/living/carbon/human/joe)
. = ..()
give_action(joe, /datum/action/joe_emote_panel)
Expand Down

0 comments on commit 21b3bbc

Please sign in to comment.