Skip to content

Commit

Permalink
disable halloween species (shiptest-ss13#2434)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
urhhhhhghhhh
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
They are dullahans at worst (nonfunctional) or dumb at best. 
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Halloween no longer allows different species in prefs
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
thgvr authored Oct 29, 2023
1 parent 3b63ee3 commit abc0e8e
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@

var/obj/item/dullahan_relay/myhead


/datum/species/dullahan/check_roundstart_eligible()
if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
return TRUE
return FALSE

/datum/species/dullahan/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
. = ..()
H.lose_hearing_sensitivity(ORGAN_TRAIT)
Expand Down
5 changes: 0 additions & 5 deletions code/modules/mob/living/carbon/human/species_types/golems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -696,11 +696,6 @@
REMOVE_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
..()

/datum/species/golem/cloth/check_roundstart_eligible()
if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
return TRUE
return ..()

/datum/species/golem/cloth/random_name(gender,unique,lastname)
var/pharaoh_name = pick("Neferkare", "Hudjefa", "Khufu", "Mentuhotep", "Ahmose", "Amenhotep", "Thutmose", "Hatshepsut", "Tutankhamun", "Ramses", "Seti", \
"Merenptah", "Djer", "Semerkhet", "Nynetjer", "Khafre", "Pepi", "Intef", "Ay") //yes, Ay was an actual pharaoh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@
else if (light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) //heal in the dark
H.heal_overall_damage(1,1, 0, BODYTYPE_ORGANIC)

/datum/species/shadow/check_roundstart_eligible()
if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
return TRUE
return ..()

/datum/species/shadow/nightmare
name = "Nightmare"
id = "nightmare"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@
species_l_leg = /obj/item/bodypart/leg/left/skeleton
species_r_leg = /obj/item/bodypart/leg/right/skeleton

/datum/species/skeleton/check_roundstart_eligible()
if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
return TRUE
return ..()

//Can still metabolize milk through meme magic
/datum/species/skeleton/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
if(chem.type == /datum/reagent/consumable/milk)
Expand Down
8 changes: 0 additions & 8 deletions code/modules/mob/living/carbon/human/species_types/vampire.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@
var/info_text = "You are a <span class='danger'>Vampire</span>. You will slowly but constantly lose blood if outside of a coffin. If inside a coffin, you will slowly heal. You may gain more blood by grabbing a live victim and using your drain ability."
var/obj/effect/proc_holder/spell/targeted/shapeshift/bat/batform //attached to the datum itself to avoid cloning memes, and other duplicates




/datum/species/vampire/check_roundstart_eligible()
if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
return TRUE
return FALSE

/datum/species/vampire/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
. = ..()
to_chat(C, "[info_text]")
Expand Down
5 changes: 0 additions & 5 deletions code/modules/mob/living/carbon/human/species_types/zombies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
species_l_leg = /obj/item/bodypart/leg/left/zombie
species_r_leg = /obj/item/bodypart/leg/right/zombie

/datum/species/zombie/check_roundstart_eligible()
if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
return TRUE
return ..()

/datum/species/zombie/infectious
name = "\improper Infectious Zombie"
id = "memezombies"
Expand Down

0 comments on commit abc0e8e

Please sign in to comment.