mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-29 16:10:02 +01:00
Chewable improvements, and new snacks (#7411)
This commit is contained in:
Wowzewow (Wezzy)
@@ -192,22 +192,17 @@
|
||||
/obj/item/reagent_containers/food/snacks/spacetwinkie = 6,
|
||||
/obj/item/reagent_containers/food/snacks/cheesiehonkers = 6,
|
||||
/obj/item/reagent_containers/food/snacks/tastybread = 6,
|
||||
/obj/item/reagent_containers/food/snacks/cookiesnack = 6,
|
||||
/obj/item/storage/box/gum = 4,
|
||||
/obj/item/clothing/mask/chewable/candy/lolli = 8,
|
||||
/obj/item/storage/box/admints = 4,
|
||||
/obj/item/reagent_containers/food/snacks/skrellsnacks = 3,
|
||||
/obj/item/reagent_containers/food/snacks/meatsnack = 2,
|
||||
/obj/item/reagent_containers/food/snacks/maps = 2,
|
||||
/obj/item/reagent_containers/food/snacks/nathisnack = 2,
|
||||
/obj/item/reagent_containers/food/snacks/koisbar_clean = 4,
|
||||
/obj/item/reagent_containers/food/snacks/candy/koko = 5,
|
||||
/obj/item/reagent_containers/food/snacks/cb01 = 6,
|
||||
/obj/item/reagent_containers/food/snacks/cb02 = 6,
|
||||
/obj/item/reagent_containers/food/snacks/cb03 = 6,
|
||||
/obj/item/reagent_containers/food/snacks/cb04 = 6,
|
||||
/obj/item/reagent_containers/food/snacks/cb05 = 6,
|
||||
/obj/item/reagent_containers/food/snacks/cb06 = 6,
|
||||
/obj/item/reagent_containers/food/snacks/cb07 = 6,
|
||||
/obj/item/reagent_containers/food/snacks/cb08 = 6,
|
||||
/obj/item/reagent_containers/food/snacks/cb09 = 6,
|
||||
/obj/item/reagent_containers/food/snacks/cb10 = 6
|
||||
/obj/item/reagent_containers/food/snacks/tuna = 2
|
||||
)
|
||||
contraband = list(
|
||||
/obj/item/reagent_containers/food/snacks/syndicake = 6,
|
||||
@@ -225,22 +220,17 @@
|
||||
/obj/item/reagent_containers/food/snacks/spacetwinkie = 15,
|
||||
/obj/item/reagent_containers/food/snacks/cheesiehonkers = 15,
|
||||
/obj/item/reagent_containers/food/snacks/tastybread = 18,
|
||||
/obj/item/storage/box/gum = 15,
|
||||
/obj/item/clothing/mask/chewable/candy/lolli = 2,
|
||||
/obj/item/storage/box/admints = 12,
|
||||
/obj/item/reagent_containers/food/snacks/cookiesnack = 20,
|
||||
/obj/item/reagent_containers/food/snacks/skrellsnacks = 40,
|
||||
/obj/item/reagent_containers/food/snacks/meatsnack = 22,
|
||||
/obj/item/reagent_containers/food/snacks/maps = 23,
|
||||
/obj/item/reagent_containers/food/snacks/nathisnack = 24,
|
||||
/obj/item/reagent_containers/food/snacks/koisbar_clean = 60,
|
||||
/obj/item/reagent_containers/food/snacks/candy/koko = 40,
|
||||
/obj/item/reagent_containers/food/snacks/cb01 = 15,
|
||||
/obj/item/reagent_containers/food/snacks/cb02 = 14,
|
||||
/obj/item/reagent_containers/food/snacks/cb03 = 15,
|
||||
/obj/item/reagent_containers/food/snacks/cb04 = 16,
|
||||
/obj/item/reagent_containers/food/snacks/cb05 = 18,
|
||||
/obj/item/reagent_containers/food/snacks/cb06 = 10,
|
||||
/obj/item/reagent_containers/food/snacks/cb07 = 12,
|
||||
/obj/item/reagent_containers/food/snacks/cb08 = 13,
|
||||
/obj/item/reagent_containers/food/snacks/cb09 = 12,
|
||||
/obj/item/reagent_containers/food/snacks/cb10 = 15
|
||||
/obj/item/reagent_containers/food/snacks/tuna = 23
|
||||
)
|
||||
|
||||
/obj/machinery/vending/cola
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
return
|
||||
|
||||
/obj/item/trash/koisbar
|
||||
name = "\improper K'ois Bar Wrapper"
|
||||
name = "\improper k'ois bar wrapper"
|
||||
icon_state = "koisbar"
|
||||
|
||||
/obj/item/trash/kokobar
|
||||
name = "\improper Koko Bar Wrapper"
|
||||
name = "\improper koko bar wrapper"
|
||||
icon_state = "kokobar"
|
||||
|
||||
/obj/item/trash/raisins
|
||||
@@ -24,7 +24,7 @@
|
||||
icon_state= "4no_raisins"
|
||||
|
||||
/obj/item/trash/candy
|
||||
name = "candy"
|
||||
name = "candy wrapper"
|
||||
icon_state= "candy"
|
||||
|
||||
/obj/item/trash/cheesie
|
||||
@@ -50,10 +50,12 @@
|
||||
/obj/item/trash/waffles
|
||||
name = "square tray"
|
||||
icon_state = "waffles"
|
||||
drop_sound = 'sound/items/trayhit1.ogg'
|
||||
|
||||
/obj/item/trash/plate
|
||||
name = "plate"
|
||||
icon_state = "plate"
|
||||
drop_sound = 'sound/items/drop/gloves.ogg'
|
||||
|
||||
/obj/item/trash/plate/steak
|
||||
icon_state = "steak"
|
||||
@@ -61,6 +63,7 @@
|
||||
/obj/item/trash/snack_bowl
|
||||
name = "snack bowl"
|
||||
icon_state = "snack_bowl"
|
||||
drop_sound = 'sound/items/drop/gloves.ogg'
|
||||
|
||||
/obj/item/trash/pistachios
|
||||
name = "pistachios pack"
|
||||
@@ -96,11 +99,12 @@
|
||||
/obj/item/trash/maps
|
||||
name = "maps salty ham"
|
||||
icon_state = "maps-used"
|
||||
drop_sound = 'sound/items/drop/shovel.ogg'
|
||||
|
||||
/obj/item/trash/nathisnack
|
||||
name = "razi-snack corned beef"
|
||||
icon_state = "cbeef-used"
|
||||
drop_sound = 'sound/items/drop/soda.ogg'
|
||||
drop_sound = 'sound/items/drop/shovel.ogg'
|
||||
|
||||
/obj/item/trash/brownies
|
||||
name = "square tray"
|
||||
@@ -137,10 +141,14 @@
|
||||
icon_state = "skrellsnacks"
|
||||
|
||||
/obj/item/trash/space_twinkie
|
||||
name = "space twinkie"
|
||||
name = "\improper space twinkie"
|
||||
icon_state = "space_twinkie"
|
||||
|
||||
/obj/item/trash/grease //used for generic plattered food. example is lasagna.
|
||||
name = "square tray"
|
||||
icon_state = "grease"
|
||||
drop_sound = 'sound/items/trayhit1.ogg'
|
||||
|
||||
/obj/item/trash/cookiesnack
|
||||
name = "\improper Carps Ahoy! miniature cookies"
|
||||
icon_state = "cookiesnack"
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
name = "chewable item master"
|
||||
desc = "If you are seeing this, ahelp it."
|
||||
icon = 'icons/obj/clothing/masks.dmi'
|
||||
drop_sound = 'sound/items/drop/food.ogg'
|
||||
body_parts_covered = 0
|
||||
|
||||
var/type_butt = null
|
||||
@@ -9,13 +10,29 @@
|
||||
var/chewtime = 0
|
||||
var/brand
|
||||
var/list/filling = list()
|
||||
var/wrapped = FALSE
|
||||
|
||||
obj/item/clothing/mask/chewable/New()
|
||||
..()
|
||||
/obj/item/clothing/mask/chewable/attack_self(mob/user)
|
||||
if(wrapped)
|
||||
wrapped = FALSE
|
||||
to_chat(user, span("notice", "You unwrap \the [name]."))
|
||||
playsound(src.loc, 'sound/items/drop/wrapper.ogg', 50, 1)
|
||||
slot_flags = SLOT_EARS | SLOT_MASK
|
||||
update_icon()
|
||||
|
||||
/obj/item/clothing/mask/chewable/update_icon()
|
||||
cut_overlays()
|
||||
if(wrapped)
|
||||
add_overlay("[initial(icon_state)]_wrapper")
|
||||
|
||||
obj/item/clothing/mask/chewable/Initialize()
|
||||
. = ..()
|
||||
flags |= NOREACT // so it doesn't react until you light it
|
||||
create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15
|
||||
for(var/R in filling)
|
||||
reagents.add_reagent(R, filling[R])
|
||||
if(wrapped)
|
||||
slot_flags = null
|
||||
|
||||
/obj/item/clothing/mask/chewable/equipped(var/mob/living/user, var/slot)
|
||||
..()
|
||||
@@ -95,9 +112,10 @@ obj/item/clothing/mask/chewable/Destroy()
|
||||
desc = "A chewy wad of synthetic rubber, laced with nicotine. Possibly the least disgusting method of nicotine delivery."
|
||||
icon_state = "nic_gum"
|
||||
type_butt = /obj/item/trash/spitgum
|
||||
wrapped = TRUE
|
||||
|
||||
/obj/item/clothing/mask/chewable/tobacco/nico/New()
|
||||
..()
|
||||
/obj/item/clothing/mask/chewable/tobacco/nico/Initialize()
|
||||
. = ..()
|
||||
reagents.add_reagent("nicotine", 2)
|
||||
color = reagents.get_color()
|
||||
|
||||
@@ -118,21 +136,34 @@ obj/item/clothing/mask/chewable/Destroy()
|
||||
desc = "A disgusting chewed up wad of gum."
|
||||
icon_state = "spit-gum"
|
||||
|
||||
/obj/item/trash/lollibutt
|
||||
name = "popsicle stick"
|
||||
desc = "A popsicle stick devoid of pop."
|
||||
icon_state = "pop-stick"
|
||||
|
||||
/obj/item/clothing/mask/chewable/candy/gum
|
||||
name = "chewing gum"
|
||||
desc = "A chewy wad of fine synthetic rubber and artificial flavoring."
|
||||
icon_state = "gum"
|
||||
item_state = "gum"
|
||||
wrapped = TRUE
|
||||
|
||||
/obj/item/clothing/mask/chewable/candy/gum/New()
|
||||
..()
|
||||
/obj/item/clothing/mask/chewable/candy/gum/Initialize()
|
||||
. = ..()
|
||||
reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),10)
|
||||
color = reagents.get_color()
|
||||
update_icon()
|
||||
|
||||
/obj/item/storage/box/gum
|
||||
name = "\improper Chewy Fruit flavored gum"
|
||||
desc = "A small pack of chewing gum in various flavors."
|
||||
icon = 'icons/obj/food.dmi'
|
||||
icon_state = "gum_pack"
|
||||
item_state = "candy"
|
||||
slot_flags = SLOT_EARS
|
||||
w_class = 1
|
||||
starts_with = list(/obj/item/clothing/mask/chewable/candy/gum = 5)
|
||||
can_hold = list(/obj/item/clothing/mask/chewable/candy/gum,
|
||||
/obj/item/trash/spitgum)
|
||||
use_sound = 'sound/items/drop/paper.ogg'
|
||||
drop_sound = 'sound/items/drop/wrapper.ogg'
|
||||
max_storage_space = 5
|
||||
foldable = null
|
||||
|
||||
/obj/item/clothing/mask/chewable/candy/lolli
|
||||
name = "lollipop"
|
||||
@@ -140,11 +171,18 @@ obj/item/clothing/mask/chewable/Destroy()
|
||||
type_butt = /obj/item/trash/lollibutt
|
||||
icon_state = "lollipop"
|
||||
item_state = "lollipop"
|
||||
wrapped = TRUE
|
||||
|
||||
/obj/item/clothing/mask/chewable/candy/lolli/New()
|
||||
..()
|
||||
/obj/item/trash/lollibutt
|
||||
name = "popsicle stick"
|
||||
desc = "A popsicle stick devoid of pop."
|
||||
icon_state = "pop-stick"
|
||||
|
||||
/obj/item/clothing/mask/chewable/candy/lolli/Initialize()
|
||||
. = ..()
|
||||
reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),20)
|
||||
color = reagents.get_color()
|
||||
update_icon()
|
||||
|
||||
/obj/item/clothing/mask/chewable/candy/lolli/meds
|
||||
name = "lollipop"
|
||||
@@ -152,8 +190,8 @@ obj/item/clothing/mask/chewable/Destroy()
|
||||
type_butt = /obj/item/trash/lollibutt
|
||||
icon_state = "lollipop"
|
||||
|
||||
/obj/item/clothing/mask/chewable/candy/lolli/meds/New()
|
||||
..()
|
||||
/obj/item/clothing/mask/chewable/candy/lolli/meds/Initialize()
|
||||
. = ..()
|
||||
var/datum/reagent/payload = pick(list(
|
||||
"paracetamol",
|
||||
"tramadol",
|
||||
@@ -167,8 +205,8 @@ obj/item/clothing/mask/chewable/Destroy()
|
||||
desc = "A sucrose sphere on a small handle, it has been infused with medication."
|
||||
filling = list("sugar" = 6)
|
||||
|
||||
/obj/item/clothing/mask/chewable/candy/lolli/weak_meds/New()
|
||||
..()
|
||||
/obj/item/clothing/mask/chewable/candy/lolli/weak_meds/Initialize()
|
||||
. = ..()
|
||||
var/datum/reagent/payload = pick(list(
|
||||
"dylovene",
|
||||
"inaprovaline"))
|
||||
|
||||
@@ -213,6 +213,7 @@
|
||||
name = "cup ramen"
|
||||
desc = "Just add 10ml water, self heats! A taste that reminds you of your school years."
|
||||
icon_state = "ramen"
|
||||
drop_sound = 'sound/items/drop/gloves.ogg'
|
||||
center_of_mass = list("x"=16, "y"=11)
|
||||
Initialize()
|
||||
. = ..()
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,44 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
# balance
|
||||
# admin
|
||||
# backend
|
||||
# security
|
||||
# refactor
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: Wowzewow(Wezzy)
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- rscdel: "Expired Halloween candy has been removed from snack machines."
|
||||
- maptweak: "The archaic lollipop and gumball machines have been removed."
|
||||
- rscadd: "Courtesy of Getmore Corporation, enjoy Carps Ahoy, Tuna snax, Ad-mints, Chewy Fruit gum, and lollipops in your nearest vending machine instead!"
|
||||
- rscadd: "Lollipops and gum come in wrappers now, due to hygenie concerns."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 146 KiB After Width: | Height: | Size: 149 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 16 KiB |
@@ -43166,7 +43166,9 @@
|
||||
icon_state = "tube1";
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/machinery/gumballmachine,
|
||||
/obj/structure/bed/chair{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/reception)
|
||||
"bvj" = (
|
||||
@@ -43196,7 +43198,9 @@
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/reception)
|
||||
"bvm" = (
|
||||
/obj/machinery/gumballmachine/sucker,
|
||||
/obj/structure/bed/chair{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/reception)
|
||||
"bvn" = (
|
||||
@@ -56172,7 +56176,6 @@
|
||||
dir = 4;
|
||||
network = list("Service")
|
||||
},
|
||||
/obj/machinery/gumballmachine,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/crew_quarters/bar)
|
||||
"bVz" = (
|
||||
@@ -64005,14 +64008,6 @@
|
||||
/obj/machinery/hologram/holopad,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/lab)
|
||||
"eNx" = (
|
||||
/obj/effect/floor_decal/spline/fancy/wood{
|
||||
icon_state = "spline_fancy";
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/gumballmachine/sucker,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/crew_quarters/bar)
|
||||
"eNR" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/decal/cleanable/generic,
|
||||
@@ -66799,10 +66794,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/crew_quarters/kitchen)
|
||||
"niw" = (
|
||||
/obj/machinery/gumballmachine/sucker,
|
||||
/turf/simulated/floor/carpet,
|
||||
/area/library)
|
||||
"njF" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
@@ -68394,10 +68385,6 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/maintenance/engineering)
|
||||
"rZl" = (
|
||||
/obj/machinery/gumballmachine,
|
||||
/turf/simulated/floor/carpet,
|
||||
/area/library)
|
||||
"saL" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/table/standard,
|
||||
@@ -96702,7 +96689,7 @@ bMF
|
||||
bJN
|
||||
bOl
|
||||
bOK
|
||||
niw
|
||||
bJL
|
||||
bPR
|
||||
bJL
|
||||
bQO
|
||||
@@ -96959,7 +96946,7 @@ bMF
|
||||
bJN
|
||||
bOm
|
||||
bOK
|
||||
rZl
|
||||
bJL
|
||||
bPS
|
||||
bJL
|
||||
bQP
|
||||
@@ -100060,7 +100047,7 @@ bVX
|
||||
bWl
|
||||
bVx
|
||||
bVX
|
||||
eNx
|
||||
bVX
|
||||
bVX
|
||||
bVX
|
||||
bWL
|
||||
|
||||
Reference in New Issue
Block a user