mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-15 20:52:41 +00:00
Amend Nomenclature for Clarity & Consistency
Opted to leave the trait datum type and name for the sake of reference & mild humour.
This commit is contained in:
@@ -90,12 +90,12 @@
|
|||||||
|
|
||||||
//VOREStation Add
|
//VOREStation Add
|
||||||
/obj/item/stack/material/attack(mob/living/M as mob, mob/living/user as mob)
|
/obj/item/stack/material/attack(mob/living/M as mob, mob/living/user as mob)
|
||||||
if(M.handle_eat_ore(src, user))
|
if(M.handle_eat_minerals(src, user))
|
||||||
return
|
return
|
||||||
..()
|
..()
|
||||||
|
|
||||||
/obj/item/stack/material/attack_generic(var/mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent.
|
/obj/item/stack/material/attack_generic(var/mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent.
|
||||||
if(user.handle_eat_ore(src))
|
if(user.handle_eat_minerals(src))
|
||||||
return
|
return
|
||||||
..()
|
..()
|
||||||
//VOREStation Add End
|
//VOREStation Add End
|
||||||
|
|||||||
@@ -125,12 +125,12 @@
|
|||||||
|
|
||||||
//VOREStation Add
|
//VOREStation Add
|
||||||
/obj/item/weapon/ore/attack(mob/living/M as mob, mob/living/user as mob)
|
/obj/item/weapon/ore/attack(mob/living/M as mob, mob/living/user as mob)
|
||||||
if(M.handle_eat_ore(src, user))
|
if(M.handle_eat_minerals(src, user))
|
||||||
return
|
return
|
||||||
..()
|
..()
|
||||||
|
|
||||||
/obj/item/weapon/ore/attack_generic(var/mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent.
|
/obj/item/weapon/ore/attack_generic(var/mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent.
|
||||||
if(user.handle_eat_ore(src))
|
if(user.handle_eat_minerals(src))
|
||||||
return
|
return
|
||||||
..()
|
..()
|
||||||
//VOREStation Add End
|
//VOREStation Add End
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
var/metabolism = 0.0015
|
var/metabolism = 0.0015
|
||||||
var/lightweight = FALSE //Oof! Nonhelpful bump stumbles.
|
var/lightweight = FALSE //Oof! Nonhelpful bump stumbles.
|
||||||
var/trashcan = FALSE //It's always sunny in the wrestling ring.
|
var/trashcan = FALSE //It's always sunny in the wrestling ring.
|
||||||
var/eat_ore = FALSE //HEAVY METAL DIET
|
var/eat_minerals = FALSE //HEAVY METAL DIET
|
||||||
var/base_species = null // Unused outside of a few species
|
var/base_species = null // Unused outside of a few species
|
||||||
var/selects_bodytype = FALSE // Allows the species to choose from body types intead of being forced to be just one.
|
var/selects_bodytype = FALSE // Allows the species to choose from body types intead of being forced to be just one.
|
||||||
|
|
||||||
|
|||||||
@@ -103,11 +103,11 @@
|
|||||||
name = "Expensive Taste"
|
name = "Expensive Taste"
|
||||||
desc = "You only gain nutrition from raw ore and refined minerals. There's nothing that sates the appetite better than precious gems, exotic or rare minerals and you have damn fine taste. Anything else is beneath you."
|
desc = "You only gain nutrition from raw ore and refined minerals. There's nothing that sates the appetite better than precious gems, exotic or rare minerals and you have damn fine taste. Anything else is beneath you."
|
||||||
cost = 0
|
cost = 0
|
||||||
var_changes = list("gets_food_nutrition" = 0, "eat_ore" = 1) //The verb is given in human.dm
|
var_changes = list("gets_food_nutrition" = 0, "eat_minerals" = 1)
|
||||||
|
|
||||||
/datum/trait/gem_eater/apply(var/datum/species/S,var/mob/living/carbon/human/H)
|
/datum/trait/gem_eater/apply(var/datum/species/S,var/mob/living/carbon/human/H)
|
||||||
..(S,H)
|
..(S,H)
|
||||||
H.verbs |= /mob/living/proc/eat_ore
|
H.verbs |= /mob/living/proc/eat_minerals
|
||||||
|
|
||||||
/datum/trait/glowing_eyes
|
/datum/trait/glowing_eyes
|
||||||
name = "Glowing Eyes"
|
name = "Glowing Eyes"
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
var/can_be_drop_pred = TRUE // Mobs are pred by default.
|
var/can_be_drop_pred = TRUE // Mobs are pred by default.
|
||||||
var/next_preyloop // For Fancy sound internal loop
|
var/next_preyloop // For Fancy sound internal loop
|
||||||
var/adminbus_trash = FALSE // For abusing trash eater for event shenanigans.
|
var/adminbus_trash = FALSE // For abusing trash eater for event shenanigans.
|
||||||
var/adminbus_eat_ore = FALSE // This creature subsists on a diet of pure adminium.
|
var/adminbus_eat_minerals = FALSE // This creature subsists on a diet of pure adminium.
|
||||||
var/vis_height = 32 // Sprite height used for resize features.
|
var/vis_height = 32 // Sprite height used for resize features.
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -646,17 +646,17 @@
|
|||||||
to_chat(src, "<span class='notice'>This item is not appropriate for ethical consumption.</span>")
|
to_chat(src, "<span class='notice'>This item is not appropriate for ethical consumption.</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
/mob/living/proc/eat_ore() //Actual eating abstracted so the user isn't given a prompt due to an argument in this verb.
|
/mob/living/proc/eat_minerals() //Actual eating abstracted so the user isn't given a prompt due to an argument in this verb.
|
||||||
set name = "Eat Ore"
|
set name = "Eat Minerals"
|
||||||
set category = "Abilities"
|
set category = "Abilities"
|
||||||
set desc = "Consume held ore and gems. Snack time!"
|
set desc = "Consume held raw ore, gems and refined minerals. Snack time!"
|
||||||
|
|
||||||
handle_eat_ore()
|
handle_eat_minerals()
|
||||||
|
|
||||||
/mob/living/proc/handle_eat_ore(obj/item/snack, mob/living/user)
|
/mob/living/proc/handle_eat_minerals(obj/item/snack, mob/living/user)
|
||||||
var/mob/living/feeder = user ? user : src //Whoever's doing the feeding - us or someone else.
|
var/mob/living/feeder = user ? user : src //Whoever's doing the feeding - us or someone else.
|
||||||
var/mob/living/carbon/human/H = src
|
var/mob/living/carbon/human/H = src
|
||||||
if(!(adminbus_eat_ore || (istype(H) && H.species.eat_ore))) //Am I awesome enough to eat a shiny rock?
|
if(!(adminbus_eat_minerals || (istype(H) && H.species.eat_minerals))) //Am I awesome enough to eat a shiny rock?
|
||||||
return
|
return
|
||||||
|
|
||||||
if(!vore_selected)
|
if(!vore_selected)
|
||||||
@@ -665,7 +665,7 @@
|
|||||||
|
|
||||||
var/obj/item/I = (snack ? snack : feeder.get_active_hand())
|
var/obj/item/I = (snack ? snack : feeder.get_active_hand())
|
||||||
if(!I)
|
if(!I)
|
||||||
to_chat(feeder, "<span class='notice'>Why is the ore gone?</span>")
|
to_chat(feeder, "<span class='notice'>You look longingly at your empty hands, imagining if they held something edible...</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
if(!istype(I))
|
if(!istype(I))
|
||||||
@@ -731,7 +731,7 @@
|
|||||||
MAT_LEAD = list("nutrition" = 0, "remark" = "It takes some work to break down [O] but you manage it, unlocking lasting tangy goodness in the process. Yum.", "WTF" = FALSE),
|
MAT_LEAD = list("nutrition" = 0, "remark" = "It takes some work to break down [O] but you manage it, unlocking lasting tangy goodness in the process. Yum.", "WTF" = FALSE),
|
||||||
MAT_VERDANTIUM = list("nutrition" = 55, "remark" = "You taste scientific mystery and a rare delicacy. Your tastebuds tingle pleasantly as you eat [O] and the feeling warmly blossoms in your chest for a moment.", "WTF" = FALSE),
|
MAT_VERDANTIUM = list("nutrition" = 55, "remark" = "You taste scientific mystery and a rare delicacy. Your tastebuds tingle pleasantly as you eat [O] and the feeling warmly blossoms in your chest for a moment.", "WTF" = FALSE),
|
||||||
MAT_MORPHIUM = list("nutrition" = 75, "remark" = "The question, the answer and the taste: It all floods your mouth and your mind to momentarily overwhelm the senses. What the hell was that? Your mouth and throat are left tingling for a while.", "WTF" = 10),
|
MAT_MORPHIUM = list("nutrition" = 75, "remark" = "The question, the answer and the taste: It all floods your mouth and your mind to momentarily overwhelm the senses. What the hell was that? Your mouth and throat are left tingling for a while.", "WTF" = 10),
|
||||||
"alienalloy" = list("nutrition" = 120, "remark" = "Working hard for so to rend the material apart has left your jaw sore, but a veritable explosion of mind boggling indescribable flavour is unleashed. Completely alien sensations dazes and overwhelms you while it feels like an interdimensional rift opened in your mouth, briefly numbing your face.", "WTF" = 15)
|
"alienalloy" = list("nutrition" = 120, "remark" = "Working hard for so long to rend the material apart has left your jaw sore, but a veritable explosion of mind boggling indescribable flavour is unleashed. Completely alien sensations daze and overwhelm you while it feels like an interdimensional rift opened in your mouth, briefly numbing your face.", "WTF" = 15)
|
||||||
)
|
)
|
||||||
if(O.default_type in refined_taste)
|
if(O.default_type in refined_taste)
|
||||||
var/obj/item/stack/material/stack = O.split(1) //A little off the top.
|
var/obj/item/stack/material/stack = O.split(1) //A little off the top.
|
||||||
@@ -743,12 +743,12 @@
|
|||||||
playsound(src, 'sound/items/eatfood.ogg', rand(10,50), 1)
|
playsound(src, 'sound/items/eatfood.ogg', rand(10,50), 1)
|
||||||
var/T = (istype(M) ? M.hardness/40 : 1) SECONDS //1.5 seconds to eat a sheet of metal. 2.5 for durasteel and diamond & 1 by default (applies to some ores like raw carbon, slag, etc.
|
var/T = (istype(M) ? M.hardness/40 : 1) SECONDS //1.5 seconds to eat a sheet of metal. 2.5 for durasteel and diamond & 1 by default (applies to some ores like raw carbon, slag, etc.
|
||||||
to_chat(src, "<span class='notice'>You start crunching on [I] with your powerful jaws, attempting to tear it apart...</span>")
|
to_chat(src, "<span class='notice'>You start crunching on [I] with your powerful jaws, attempting to tear it apart...</span>")
|
||||||
if(do_after(feeder, T, ignore_movement = TRUE, exclusive = TRUE))
|
if(do_after(feeder, T, ignore_movement = TRUE, exclusive = TRUE)) //Eat on the move, but not multiple things at once.
|
||||||
if(feeder != src)
|
if(feeder != src)
|
||||||
to_chat(feeder, "<span class='notice'>You feed [I] to [src].</span>")
|
to_chat(feeder, "<span class='notice'>You feed [I] to [src].</span>")
|
||||||
log_admin("VORE: [feeder] fed [src] [I].")
|
log_admin("VORE: [feeder] fed [src] [I].")
|
||||||
else
|
else
|
||||||
log_admin("VORE: [src] used Eat Ore to swallow [I].")
|
log_admin("VORE: [src] used Eat Minerals to swallow [I].")
|
||||||
//Eat the ore using the vorebelly for the sound then get rid of the ore to prevent infinite nutrition.
|
//Eat the ore using the vorebelly for the sound then get rid of the ore to prevent infinite nutrition.
|
||||||
drop_from_inventory(I, vore_selected) //Never touches the ground - straight to the gut.
|
drop_from_inventory(I, vore_selected) //Never touches the ground - straight to the gut.
|
||||||
visible_message("[src] crunches [I] to pieces and swallows it down.",
|
visible_message("[src] crunches [I] to pieces and swallows it down.",
|
||||||
|
|||||||
@@ -1641,9 +1641,9 @@
|
|||||||
#include "code\modules\ai\ai_holder_targeting_vr.dm"
|
#include "code\modules\ai\ai_holder_targeting_vr.dm"
|
||||||
#include "code\modules\ai\interfaces.dm"
|
#include "code\modules\ai\interfaces.dm"
|
||||||
#include "code\modules\ai\say_list.dm"
|
#include "code\modules\ai\say_list.dm"
|
||||||
#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm"
|
#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm"
|
||||||
#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai_vr.dm"
|
#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm"
|
||||||
#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm"
|
#include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm"
|
||||||
#include "code\modules\alarm\alarm.dm"
|
#include "code\modules\alarm\alarm.dm"
|
||||||
#include "code\modules\alarm\alarm_handler.dm"
|
#include "code\modules\alarm\alarm_handler.dm"
|
||||||
#include "code\modules\alarm\atmosphere_alarm.dm"
|
#include "code\modules\alarm\atmosphere_alarm.dm"
|
||||||
|
|||||||
Reference in New Issue
Block a user