Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lizard Livers Let You Eat Rat (Safely) #409

Merged
merged 1 commit into from
Feb 3, 2024
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
6 changes: 6 additions & 0 deletions code/datums/components/infective.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@
/datum/component/infective/proc/try_infect_eat(datum/source, mob/living/eater, mob/living/feeder)
SIGNAL_HANDLER

// NON-MODULE CHANGE
var/obj/item/organ/internal/liver/liver = eater.get_organ_slot(ORGAN_SLOT_LIVER)
if(is_type_in_typecache(parent, liver?.disease_free_foods))
return
// NON-MODULE CHANGE END

if(!eater.has_quirk(/datum/quirk/deviant_tastes))
eater.add_mood_event("disgust", /datum/mood_event/disgust/dirty_food)

Expand Down
1 change: 1 addition & 0 deletions maplestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6449,6 +6449,7 @@
#include "maplestation_modules\code\modules\surgery\organs\autosurgeon.dm"
#include "maplestation_modules\code\modules\surgery\organs\ears.dm"
#include "maplestation_modules\code\modules\surgery\organs\eyes.dm"
#include "maplestation_modules\code\modules\surgery\organs\liver.dm"
#include "maplestation_modules\code\modules\surgery\organs\tails.dm"
#include "maplestation_modules\code\modules\surgery\organs\tongue.dm"
#include "maplestation_modules\code\modules\uplink\uplink_devices.dm"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// -- Lizardperson species additions --
/datum/species/lizard
mutantliver = /obj/item/organ/internal/liver/lizard

/datum/species/lizard/get_species_speech_sounds(sound_type)
// These sounds have been ported from Goonstation.
Expand Down
14 changes: 14 additions & 0 deletions maplestation_modules/code/modules/surgery/organs/liver.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Liver stuff
/obj/item/organ/internal/liver
/// Typecache of food we can eat that will never give us disease.
var/list/disease_free_foods

// Lizard liver to Let Them Eat Rat
/obj/item/organ/internal/liver/lizard
name = "lizardperson liver"
desc = "A liver native to a Lizardperson of Tiziran... or maybe one of its colonies."
color = COLOR_VERY_DARK_LIME_GREEN

/obj/item/organ/internal/liver/lizard/Initialize(mapload)
. = ..()
disease_free_foods = typecacheof(/obj/item/food/deadmouse)
Loading