mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-14 16:44:33 +01:00
d1dad9a639
* Import several foods and recipes from Hispania! * Fix trailing newlines, remove hispania icon reference. * Fix list spacing, add drink reagents, correct annona spelling. * Amend drink description, move icons * Apply new timer from @CRUNCH-Borg Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan <alfalfascout@users.noreply.github.com> * Apply @CRUNCH-Borg's attack chain suggestions Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan <alfalfascout@users.noreply.github.com> * Fix many duplicate vars. * Fix more duplicate vars. * Remove duplicate toast. * Fix unreachable callback. Now with @CRUNCH-Borg! Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan <alfalfascout@users.noreply.github.com> * Amend some icons. * Add vendor seeds, tweak plant sprites. - Add base seeds to MegaSeed Servitor. - Change smoked salmon sushi to use smoked salmon instead of salmon steak. - Make maize dough yellower. - Fix capitalization in peyote description. - Make coconut inedible. - Modify cream cheese recipe to remove conflict with butter. - Tweak sprites of growing plants to sit inside hydroponics trays and not move around so much. * Add guacamole recipe, agave distill reagent. - Add prep bowl recipe for guacamole, condiment container and icons. - Change cactus salad icon to use new plastic cup shape. - Add distill reagent "tequila" to agave. - Make coconuts only attack on harm intent. - Fix some whitespace. * Prevent bombonuts from detonating instantly. Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Alan <alfalfascout@users.noreply.github.com> * Spellcheck. Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan <alfalfascout@users.noreply.github.com> * Change some item names, descriptions, recipes. - Make custom robot head recipe step so that those recipes don't just call for "a head". - Replace smoked salmon sushi ingredient with new smoked salmon. - Fix some confusing item names. - Update descriptions of cacti. - Add raw mouse as mouse butchering result. * Modify reagent colors. Make cream cheese bread with cream cheese. * Adjust some recipes and descriptions. - Remove hipster ridicule from mate. Add it as a reagent to the plant. - Touch up some grammar. - Amend recipe for sweet arepas. * Fix grown food slicing debug message. * Grammar improvements feat. CRUNCH Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan <alfalfascout@users.noreply.github.com> --------- Signed-off-by: Alan <alfalfascout@users.noreply.github.com> Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
226 lines
5.6 KiB
Plaintext
226 lines
5.6 KiB
Plaintext
//Items labled as 'trash' for the trash bag.
|
|
//TODO: Make this an item var or something...
|
|
|
|
//Added by Jack Rost
|
|
/obj/item/trash
|
|
icon = 'icons/obj/trash.dmi'
|
|
w_class = WEIGHT_CLASS_TINY
|
|
desc = "This is rubbish."
|
|
resistance_flags = FLAMMABLE
|
|
// Recycle your litter, kids!
|
|
materials = list(MAT_PLASTIC = 100)
|
|
new_attack_chain = TRUE
|
|
|
|
/obj/item/trash/decompile_act(obj/item/matter_decompiler/C, mob/user)
|
|
if(isdrone(user))
|
|
C.stored_comms["metal"] += 2
|
|
C.stored_comms["wood"] += 1
|
|
C.stored_comms["glass"] += 1
|
|
qdel(src)
|
|
return TRUE
|
|
return ..()
|
|
|
|
/obj/item/trash/raisins
|
|
name = "4no raisins"
|
|
icon_state= "4no_raisins"
|
|
|
|
/obj/item/trash/candy
|
|
name = "Candy"
|
|
icon_state= "candy"
|
|
|
|
/obj/item/trash/cheesie
|
|
name = "Cheesie honkers"
|
|
icon_state = "cheesie_honkers"
|
|
|
|
/obj/item/trash/chips
|
|
name = "Chips"
|
|
icon_state = "chips"
|
|
|
|
/obj/item/trash/twimsts
|
|
name = "Twimsts"
|
|
icon_state = "twimsts"
|
|
|
|
/obj/item/trash/popcorn
|
|
name = "popcorn"
|
|
icon_state = "popcorn"
|
|
gender = PLURAL
|
|
|
|
/obj/item/trash/sosjerky
|
|
name = "Scaredy's Private Reserve Beef Jerky"
|
|
icon_state = "sosjerky"
|
|
|
|
/obj/item/trash/spacetwinkie
|
|
name = "Space Twinkie"
|
|
icon_state = "space_twinkie"
|
|
|
|
/obj/item/trash/syndi_cakes
|
|
name = "Syndi cakes"
|
|
icon_state = "syndi_cakes"
|
|
|
|
/obj/item/trash/waffles
|
|
name = "Waffles"
|
|
icon_state = "waffles"
|
|
|
|
/obj/item/trash/plate
|
|
name = "plate"
|
|
icon_state = "plate"
|
|
resistance_flags = NONE
|
|
|
|
/obj/item/trash/snack_bowl
|
|
name = "snack bowl"
|
|
icon_state = "snack_bowl"
|
|
|
|
/obj/item/trash/fried_vox
|
|
name = "Kentucky Fried Vox"
|
|
icon_state = "fried_vox_empty"
|
|
slot_flags = ITEM_SLOT_HEAD
|
|
dog_fashion = /datum/dog_fashion/head/fried_vox_empty
|
|
sprite_sheets = list(
|
|
"Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
|
|
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
|
|
"Kidan" = 'icons/mob/clothing/species/kidan/head.dmi'
|
|
)
|
|
|
|
/obj/item/trash/fried_nian
|
|
name = "Moffolo Wild Wings"
|
|
icon_state = "fried_nian_empty"
|
|
slot_flags = ITEM_SLOT_HEAD
|
|
dog_fashion = /datum/dog_fashion/head/fried_nian_empty
|
|
sprite_sheets = list(
|
|
"Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
|
|
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
|
|
"Kidan" = 'icons/mob/clothing/species/kidan/head.dmi'
|
|
)
|
|
|
|
/obj/item/trash/pistachios
|
|
name = "Pistachios pack"
|
|
icon_state = "pistachios_pack"
|
|
|
|
/obj/item/trash/semki
|
|
name = "Semki pack"
|
|
icon_state = "semki_pack"
|
|
|
|
/obj/item/trash/tray
|
|
name = "Tray"
|
|
icon_state = "tray"
|
|
resistance_flags = NONE
|
|
materials = list(MAT_METAL = 100)
|
|
|
|
/obj/item/trash/candle
|
|
name = "candle"
|
|
icon = 'icons/obj/candle.dmi'
|
|
icon_state = "candle4"
|
|
|
|
/obj/item/trash/liquidfood
|
|
name = "\improper \"LiquidFood\" ration"
|
|
icon_state = "liquidfood"
|
|
|
|
/obj/item/trash/can
|
|
name = "crushed can"
|
|
icon_state = "cola"
|
|
var/is_glass = 0
|
|
var/is_plastic = 0
|
|
resistance_flags = NONE
|
|
materials = list(MAT_METAL = 200)
|
|
|
|
/obj/item/trash/gum
|
|
name = "chewed gum"
|
|
desc = "NOT free candy."
|
|
icon_state = "gum"
|
|
|
|
/obj/item/trash/tastybread
|
|
name = "bread tube"
|
|
icon_state = "tastybread"
|
|
|
|
/obj/item/trash/tapetrash
|
|
name = "old duct tape"
|
|
icon_state = "tape"
|
|
desc = "Not sticky anymore."
|
|
throw_range = 1
|
|
|
|
/obj/item/trash/popsicle_stick
|
|
name = "used popsicle stick"
|
|
icon_state = "popsicle_stick_s"
|
|
desc = "Still tastes sweet."
|
|
|
|
/obj/item/trash/caviar
|
|
name = "caviar can"
|
|
icon_state = "caviar-empty"
|
|
desc = "There's none left."
|
|
materials = list(MAT_METAL = 100)
|
|
|
|
// Ammo casings
|
|
/obj/item/trash/spentcasing
|
|
icon = 'icons/obj/bullet.dmi'
|
|
name = "arbitrary spent casing item"
|
|
desc = ABSTRACT_TYPE_DESC
|
|
icon_state = "pistol_brass"
|
|
scatter_distance = 10
|
|
materials = list(MAT_METAL = 100)
|
|
|
|
/obj/item/trash/spentcasing/Initialize(mapload)
|
|
. = ..()
|
|
scatter_atom()
|
|
transform = turn(transform, rand(0, 360))
|
|
|
|
/obj/item/trash/spentcasing/shotgun
|
|
name = "spent buckshot shell"
|
|
desc = "A spent shotgun shell. It smells like cordite."
|
|
icon_state = "buckshot"
|
|
|
|
/obj/item/trash/spentcasing/shotgun/rubbershot
|
|
name = "spent rubbershot shell"
|
|
desc = "A spent shotgun shell. It smells like cordite and singed rubber."
|
|
icon_state = "rubbershot"
|
|
|
|
/obj/item/trash/spentcasing/shotgun/beanbag
|
|
name = "spent beanbag shell"
|
|
icon_state = "beanbag"
|
|
|
|
/obj/item/trash/spentcasing/shotgun/slug
|
|
name = "spent slug shell"
|
|
icon_state = "slug"
|
|
|
|
/obj/item/trash/spentcasing/shotgun/dragonsbreath
|
|
name = "spent dragonsbreath shell"
|
|
desc = "A spent shotgun shell. It smells like cordite, burnt plastic, and a hint of petroleum."
|
|
icon_state = "dragonsbreath"
|
|
|
|
/obj/item/trash/spentcasing/shotgun/stun
|
|
name = "spent stun shell"
|
|
icon_state = "taser"
|
|
|
|
/obj/item/trash/spentcasing/bullet
|
|
name = "spent bullet casing"
|
|
desc = "A spent bullet casing. It smells of brass and cordite."
|
|
icon_state = "rifle_brass"
|
|
|
|
/obj/item/trash/spentcasing/bullet/medium
|
|
name = "spent large bullet casing"
|
|
desc = "A spent high-caliber bullet casing. It smells of brass and cordite."
|
|
icon_state = "heavy_brass"
|
|
|
|
/obj/item/trash/spentcasing/bullet/large
|
|
name = "spent .50 BMG bullet casing"
|
|
desc = "A spent .50 BMG bullet casing. It smells of brass and cordite."
|
|
icon_state = "heavy_steel"
|
|
|
|
/obj/item/trash/spentcasing/bullet/lasershot
|
|
desc = "A spent IK-series single-use lasershot cell. It smells of burnt plastic with a metallic-chemical undertone."
|
|
icon_state = "lasercasing"
|
|
|
|
// Trash from Hispania!
|
|
|
|
/obj/item/trash/empty_jar
|
|
name = "Empty Jar"
|
|
icon_state = "jar"
|
|
|
|
/obj/item/trash/empty_plasticcup
|
|
name = "Empty Plastic Cup"
|
|
icon_state = "cup"
|
|
|
|
/obj/item/trash/barcardine
|
|
name = "barcardine bar wrapper"
|
|
desc = "An empty wrapper from a barcardine bar. You notice the inside has several medical labels. You're not sure if you care or not about that."
|
|
icon_state = "barcardine_trash"
|