cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 14:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes some grammar for eating things (#9382)

Browse Source 
rscadd: "Food that takes one bite to eat doesn't say 'you finish it' anymore. Sounded kind of weird to 'finish' something in one bite."
    bugfix: "Fixes some grammar with swallowing pills."
This commit is contained in:
Wowzewow (Wezzy)
2020-07-24 16:16:54 +08:00
committed by GitHub
parent fd654e497d
commit 4557fe8a3f
5 changed files with 78 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/reagents/reagent_containers/food.dm
View File

@@ -11,6 +11,8 @@
flags = OPENCONTAINER
possible_transfer_amounts = null
volume = 50 //Sets the default container amount for all food items.
var/bitesize = 1
var/bitecount = 0
var/filling_color = "#FFFFFF" //Used by sandwiches
var/trash = null
var/is_liquid = TRUE
@@ -26,10 +28,12 @@
/obj/item/reagent_containers/food/proc/on_consume(var/mob/user, var/mob/target)
if(!reagents.total_volume)
if(bitecount==1)
target.visible_message("<b>[target]</b> [is_liquid ? "drinks" : "eats"] \the [src].", SPAN_NOTICE("You [is_liquid ? "drink" : "eat"] \the [src]."))
else
target.visible_message("<b>[target]</b> finishes [is_liquid ? "drinking" : "eating"] \the [src].", SPAN_NOTICE("You finish [is_liquid ? "drinking" : "eating"] \the [src]."))
if(trash)
user.drop_from_inventory(src) //so trash actually stays in the active hand.
var/obj/item/trash_item = new trash(user)
user.put_in_hands(trash_item)
target.visible_message("<b>[target]</b> finishes [is_liquid ? "drinking" : "eating"] \the [src].",
SPAN_NOTICE("You finish [is_liquid ? "drinking" : "eating"] \the [src]."))
qdel(src)
var/obj/item/TrashItem = new trash(user)
user.put_in_hands(TrashItem)
qdel(src)

22
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -7,8 +7,6 @@
center_of_mass = list("x"=16, "y"=16)
w_class = 2
is_liquid = FALSE
var/bitesize = 1
var/bitecount = 0
var/slice_path
var/slices_num
var/dried_type = null
@@ -29,14 +27,6 @@
/obj/item/reagent_containers/food/snacks/standard_splash_mob(var/mob/user, var/mob/target)
return 1 //Returning 1 will cancel everything else in a long line of things it should do.
/obj/item/reagent_containers/food/snacks/on_consume(mob/user, mob/target)
if(!reagents.total_volume && !trash)
target.visible_message("<b>[target]</b> finishes [is_liquid ? "drinking" : "eating"] \a [src].",
SPAN_NOTICE("You finish [is_liquid ? "drinking" : "eating"] \a [src]."))
qdel(src)
else
..()
/obj/item/reagent_containers/food/snacks/attack_self(mob/user as mob)
return
@@ -183,7 +173,7 @@
if(!U.reagents)
U.create_reagents(5)
if (U.reagents.total_volume > 0)
if(U.reagents.total_volume > 0)
to_chat(user, SPAN_WARNING("You already have \the [src] on \the [U]."))
return
@@ -202,11 +192,7 @@
reagents.trans_to_obj(U, min(reagents.total_volume,5))
if(is_liquid)
U.is_liquid = TRUE
if (reagents.total_volume <= 0)
if(trash)
var/obj/item/TrashItem = new trash(user)
user.put_in_hands(TrashItem)
qdel(src)
on_consume(user, user)
return
if(is_sliceable())
@@ -464,7 +450,7 @@
bitesize = 2
/obj/item/reagent_containers/food/snacks/candy/koko
name = "\improper koko bar"
name = "koko bar"
desc = "A sweet and gritty candy bar cultivated exclusively on the Compact ruled world of Ha'zana. A good pick-me-up for Unathi, but has no effect on other species."
icon_state = "kokobar"
trash = /obj/item/trash/kokobar
@@ -514,7 +500,7 @@
bitesize = 1
/obj/item/storage/box/fancy/cookiesnack
name = "Carps Ahoy! miniature cookies"
name = "\improper Carps Ahoy! miniature cookies"
desc = "A packet of Cap'n Carpie's miniature cookies! Now 100% carpotoxin free!"
icon = 'icons/obj/food.dmi'
icon_state = "cookiesnack"

4
code/modules/reagents/reagent_containers/glass/bottle.dm
View File

@@ -116,13 +116,13 @@
reagents_to_add = list(/datum/reagent/diethylamine = 60)
/obj/item/reagent_containers/glass/bottle/pacid
name = "Polytrinic Acid Bottle"
name = "polytrinic acid bottle"
desc = "A small bottle. Contains a small amount of Polytrinic Acid"
icon_state = "bottle-4"
reagents_to_add = list(/datum/reagent/acid/polyacid = 60)
/obj/item/reagent_containers/glass/bottle/adminordrazine
name = "Adminordrazine Bottle"
name = "adminordrazine bottle"
desc = "A small bottle. Contains the liquid essence of the gods."
icon = 'icons/obj/drinks.dmi'
icon_state = "holyflask"

43
code/modules/reagents/reagent_containers/pill.dm
View File

@@ -65,7 +65,7 @@
if(proximity && target.is_open_container() && target.reagents)
if(!target.reagents.total_volume)
to_chat(user, SPAN_NOTICE("[target] is empty. Can't dissolve \the [src]."))
to_chat(user, SPAN_NOTICE("You can't dissolve \the [src] in an empty [target]."))
return
to_chat(user, SPAN_NOTICE("You dissolve \the [src] in [target]."))
@@ -87,62 +87,61 @@
//Pills
/obj/item/reagent_containers/pill/antitox
name = "Anti-toxins pill"
name = "anti-toxins pill"
desc = "Neutralizes many common toxins."
icon_state = "pill17"
reagents_to_add = list(/datum/reagent/dylovene = 25)
/obj/item/reagent_containers/pill/tox
name = "Toxins pill"
name = "toxins pill"
desc = "Highly toxic."
icon_state = "pill5"
reagents_to_add = list(/datum/reagent/toxin = 50)
/obj/item/reagent_containers/pill/cyanide
name = "Cyanide pill"
name = "cyanide pill"
desc = "Don't swallow this."
icon_state = "pill5"
reagents_to_add = list(/datum/reagent/toxin/cyanide = 50)
/obj/item/reagent_containers/pill/adminordrazine
name = "Adminordrazine pill"
name = "adminordrazine pill"
desc = "It's magic. We don't have to explain it."
icon_state = "pill16"
reagents_to_add = list(/datum/reagent/adminordrazine = 50)
/obj/item/reagent_containers/pill/stox
name = "Sleeping pill"
name = "sleeping pill"
desc = "Commonly used to treat insomnia."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/soporific = 15)
/obj/item/reagent_containers/pill/kelotane
name = "Kelotane pill"
name = "kelotane pill"
desc = "Used to treat burns."
icon_state = "pill11"
reagents_to_add = list(/datum/reagent/kelotane = 15)
/obj/item/reagent_containers/pill/paracetamol
name = "Paracetamol pill"
name = "paracetamol pill"
desc = "Tylenol! A painkiller for the ages. Chewables!"
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/paracetamol = 15)
/obj/item/reagent_containers/pill/tramadol
name = "Tramadol pill"
name = "tramadol pill"
desc = "A simple painkiller."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/tramadol = 15)
/obj/item/reagent_containers/pill/methylphenidate
name = "Methylphenidate pill"
name = "methylphenidate pill"
desc = "Improves the ability to concentrate."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/mental/methylphenidate = 15)
/obj/item/reagent_containers/pill/escitalopram
name = "Escitalopram pill"
name = "escitalopram pill"
desc = "Mild anti-depressant."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/mental/escitalopram = 15)
@@ -154,43 +153,43 @@
reagents_to_add = list(/datum/reagent/inaprovaline = 30)
/obj/item/reagent_containers/pill/dexalin
name = "Dexalin pill"
name = "dexalin pill"
desc = "Used to treat oxygen deprivation."
icon_state = "pill16"
reagents_to_add = list(/datum/reagent/dexalin = 15)
/obj/item/reagent_containers/pill/dexalin_plus
name = "Dexalin Plus pill"
name = "dexalin plus pill"
desc = "Used to treat extreme oxygen deprivation."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/dexalin/plus = 15)
/obj/item/reagent_containers/pill/dermaline
name = "Dermaline pill"
name = "dermaline pill"
desc = "Used to treat burn wounds."
icon_state = "pill12"
reagents_to_add = list(/datum/reagent/dermaline = 15)
/obj/item/reagent_containers/pill/dylovene
name = "Dylovene pill"
name = "dylovene pill"
desc = "A broad-spectrum anti-toxin."
icon_state = "pill13"
reagents_to_add = list(/datum/reagent/dylovene = 15)
/obj/item/reagent_containers/pill/bicaridine
name = "Bicaridine pill"
name = "bicaridine pill"
desc = "Used to treat physical injuries."
icon_state = "pill18"
reagents_to_add = list(/datum/reagent/bicaridine = 20)
/obj/item/reagent_containers/pill/happy
name = "Happy pill"
name = "happy pill"
desc = "Happy happy joy joy!"
icon_state = "pill18"
reagents_to_add = list(/datum/reagent/space_drugs = 15, /datum/reagent/sugar = 15)
/obj/item/reagent_containers/pill/zoom
name = "Zoom pill"
name = "zoom pill"
desc = "Zoooom!"
icon_state = "pill18"
reagents_to_add = list(/datum/reagent/impedrezene = 10, /datum/reagent/synaptizine = 5, /datum/reagent/hyperzine = 5)
@@ -202,7 +201,7 @@
reagents_to_add = list(/datum/reagent/thetamycin = 15)
/obj/item/reagent_containers/pill/bio_vitamin
name = "Vitamin pill"
name = "vitamin pill"
desc = "Contains a meal's worth of nutrients."
icon_state = "pill11"
reagents_to_add = list(/datum/reagent/nutriment = 20)
@@ -212,8 +211,8 @@
. = ..()
/obj/item/reagent_containers/pill/rmt
name = "RMT pill"
desc = "Contains chemical rampantly used by those seeking to remedy the effects of prolonged zero-gravity adaptations."
name = "regenerative-muscular tissue supplement pill"
desc = "Commonly abbreviated to RMT, it contains chemicals rampantly used by those seeking to remedy the effects of prolonged zero-gravity adaptations."
icon_state = "pill19"
reagents_to_add = list(/datum/reagent/rmt = 15)