mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
Adds missing apple interactions with jobs (#89715)
## About The Pull Request If you throw an apple at a doctor they will take 2 damage, successfully repelling them for another day. If you throw an apple at a scientist and hit them in the head, there is a small chance that they will suddenly have an impressive scientific insight. This chance is significantly higher if it falls on them from a higher z level, because that's going to happen in about 3 rounds ever. ## Why It's Good For The Game It's how apples work in real life and thus adds to our deep and complex simulation. ## Changelog 🆑 add: Apples now react appropriately if they impact doctors or scientists under the expected circumstances. /🆑
This commit is contained in:
@@ -29,6 +29,36 @@
|
||||
/obj/item/food/grown/apple/make_processable()
|
||||
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/appleslice, 5, 20, screentip_verb = "Slice")
|
||||
|
||||
/obj/item/food/grown/apple/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
|
||||
. = ..()
|
||||
if (.) //it's been caught.
|
||||
return
|
||||
if (!ishuman(hit_atom))
|
||||
return
|
||||
var/mob/living/carbon/human/einstein = hit_atom
|
||||
var/obj/item/organ/liver/liver_organ = einstein.get_organ_slot(ORGAN_SLOT_LIVER)
|
||||
if (isnull(liver_organ))
|
||||
return
|
||||
if (HAS_TRAIT(liver_organ, TRAIT_MEDICAL_METABOLISM))
|
||||
einstein.apply_damage(2, BRUTE, throwingdatum.target_zone)
|
||||
else if (HAS_TRAIT(liver_organ, TRAIT_BALLMER_SCIENTIST) && throwingdatum.target_zone == BODY_ZONE_HEAD && prob(2))
|
||||
gravity_reminder(einstein)
|
||||
|
||||
/obj/item/food/grown/apple/onZImpact(turf/impacted_turf, levels, impact_flags)
|
||||
. = ..()
|
||||
var/mob/living/carbon/human/einstein = locate(/mob/living/carbon/human) in impacted_turf
|
||||
if (isnull(einstein))
|
||||
return
|
||||
var/obj/item/organ/liver/liver_organ = einstein.get_organ_slot(ORGAN_SLOT_LIVER)
|
||||
if (liver_organ && HAS_TRAIT(liver_organ, TRAIT_BALLMER_SCIENTIST) && prob(40))
|
||||
gravity_reminder(einstein)
|
||||
|
||||
/// Provide an important insight
|
||||
/obj/item/food/grown/apple/proc/gravity_reminder(mob/living/einstein)
|
||||
einstein.do_alert_animation()
|
||||
playsound(einstein, 'sound/machines/chime.ogg', 50, TRUE)
|
||||
einstein.say(pick_list_replacements(VISTA_FILE, "ballmer_good_msg"), forced = "apple inspiration")
|
||||
|
||||
// Gold Apple
|
||||
/obj/item/seeds/apple/gold
|
||||
name = "golden apple seed pack"
|
||||
|
||||
Reference in New Issue
Block a user