cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various removals. (#14135)

Browse Source
This commit is contained in:
TheDanseMacabre
2022-07-17 22:12:11 +02:00
committed by GitHub
parent fce1a34c24
commit ed43343dcc
41 changed files with 119 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/background/citizenship/human.dm
+1 -1
View File
@@ -35,7 +35,7 @@
/datum/outfit/job/representative/consular/ceti
name = "Tau Ceti Consular Officer"
uniform = /obj/item/clothing/under/lawyer/blue
uniform = /obj/item/clothing/under/suit_jacket/navy
accessory = /obj/item/clothing/accessory/tc_pin
backpack_contents = list(
/obj/item/storage/box/ceti_visa = 1,
code/modules/cargo/random_stock/t2_uncommon.dm
-4
View File
@@ -131,10 +131,6 @@ STOCK_ITEM_UNCOMMON(jetpack, 3)
if(prob(40))
new /obj/item/tank/emergency_oxygen/double(L)
STOCK_ITEM_UNCOMMON(xenocostume, 1)
new /obj/item/clothing/suit/xenos(L)
new /obj/item/clothing/head/xenos(L)
STOCK_ITEM_UNCOMMON(inhaler, 1)
var/obj/item/reagent_containers/inhaler/I = pick(subtypesof(/obj/item/reagent_containers/inhaler))
new I(L)
code/modules/client/preference_setup/loadout/loadout_uniform.dm
-2
View File
@@ -79,7 +79,6 @@
var/list/suits = list()
suits["amish suit"] = /obj/item/clothing/under/sl_suit
suits["black suit"] = /obj/item/clothing/under/suit_jacket
suits["blue suit"] = /obj/item/clothing/under/lawyer/blue
suits["burgundy suit"] = /obj/item/clothing/under/suit_jacket/burgundy
suits["charcoal suit"] = /obj/item/clothing/under/suit_jacket/charcoal
suits["checkered suit"] = /obj/item/clothing/under/suit_jacket/checkered
@@ -88,7 +87,6 @@
suits["purple suit"] = /obj/item/clothing/under/lawyer/purple
suits["red suit"] = /obj/item/clothing/under/suit_jacket/red
suits["red lawyer suit"] = /obj/item/clothing/under/lawyer/red
suits["shiny black suit"] = /obj/item/clothing/under/lawyer/black
suits["tan suit"] = /obj/item/clothing/under/suit_jacket/tan
suits["white suit"] = /obj/item/clothing/under/suit_jacket/white
suits["nt skirtsuit"] = /obj/item/clothing/under/suit_jacket/nt_skirtsuit
code/modules/clothing/head/misc.dm
+1 -21
View File
@@ -140,14 +140,6 @@
siemens_coefficient = 2.0
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/cueball
name = "cueball helmet"
desc = "A large, featureless white orb mean to be worn on your head. How do you even see out of this thing?"
icon_state = "cueball"
item_state = "cueball"
flags_inv = BLOCKHAIR
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/cardborg
name = "cardborg helmet"
desc = "A helmet made out of a box."
@@ -179,7 +171,7 @@
/obj/item/clothing/head/rabbitears
name = "rabbit ears"
desc = "Wearing these makes you looks useless, and only good for your sex appeal."
desc = "Wearing these makes you look useless."
icon_state = "bunny"
body_parts_covered = 0
@@ -263,18 +255,6 @@
flags_inv = BLOCKHEADHAIR
siemens_coefficient = 0.7
/obj/item/clothing/head/xenos
name = "xenos helmet"
icon_state = "xenos"
item_state_slots = list(
slot_l_hand_str = "xenos_helm",
slot_r_hand_str = "xenos_helm"
)
desc = "A helmet made out of chitinous alien hide."
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
siemens_coefficient = 2.0
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/philosopher_wig
name = "natural philosopher's wig"
desc = "A stylish monstrosity unearthed from Earth's Renaissance period. With this most distinguish'd wig, you'll be ready for your next soiree!"
code/modules/clothing/shoes/miscellaneous.dm
-7
View File
@@ -72,13 +72,6 @@
body_parts_covered = FALSE
sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/shoes.dmi')
/obj/item/clothing/shoes/sandal/marisa
desc = "A pair of magic, black shoes."
name = "magic shoes"
icon_state = "black"
item_state = "black"
body_parts_covered = FEET
/obj/item/clothing/shoes/sandal/flipflop
name = "flip flops"
desc = "A pair of foam flip flops. For those not afraid to show a little ankle."
code/modules/clothing/suits/jobs.dm
-8
View File
@@ -229,14 +229,6 @@ obj/item/clothing/suit/apron/overalls/blue
//Lawyer
/obj/item/clothing/suit/storage/toggle/lawyer/bluejacket
name = "blue suit jacket"
desc = "A snappy dress jacket."
icon_state = "suitjacket_blue"
item_state = "suitjacket_blue"
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
opened = TRUE
/obj/item/clothing/suit/storage/lawyer/purpjacket
name = "purple suit jacket"
code/modules/clothing/suits/miscellaneous.dm
+1 -19
View File
@@ -68,18 +68,9 @@
flags_inv = HIDEWRISTS|HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
/obj/item/clothing/suit/imperium_monk
name = "imperium monk"
desc = "Have YOU killed a xenos today?"
icon_state = "imperium_monk"
item_state = "imperium_monk"
body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
flags_inv = HIDESHOES|HIDEJUMPSUIT
/obj/item/clothing/suit/chickensuit
name = "chicken suit"
desc = "A suit made long ago by the ancient empire KFC."
desc = "A cheap rubber chicken costume."
icon_state = "chickensuit"
item_state = "chickensuit"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET
@@ -159,15 +150,6 @@
min_cold_protection_temperature = T0C - 20
siemens_coefficient = 0.75
/obj/item/clothing/suit/xenos
name = "xenos suit"
desc = "A suit made out of chitinous alien hide."
icon_state = "xenos"
item_state = "xenos_helm"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
flags_inv = HIDEWRISTS|HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
siemens_coefficient = 1.5
/obj/item/clothing/suit/golden_tailcoat
name = "golden tailcoat"
desc = "A brilliant looking golden tailcoat of sorts."
code/modules/clothing/suits/wiz_robe.dm
-23
View File
@@ -19,11 +19,6 @@
icon_state = "wizard-fake"
body_parts_covered = HEAD|FACE
/obj/item/clothing/head/wizard/marisa
name = "witch Hat"
desc = "Strange-looking hat-wear, makes you want to cast fireballs."
icon_state = "marisa"
/obj/item/clothing/head/wizard/magus
name = "magus Helm"
desc = "A mysterious helmet that hums with an unearthly power"
@@ -67,12 +62,6 @@
icon_state = "redwizard"
item_state = "redwizrobe"
/obj/item/clothing/suit/wizrobe/marisa
name = "witch robe"
desc = "Magic is all about the spell power, ZE!"
icon_state = "marisa"
item_state = "marisarobe"
/obj/item/clothing/suit/wizrobe/magusblue
name = "magus robe"
desc = "A set of armored robes that seem to radiate a dark power"
@@ -110,18 +99,6 @@
icon_state = "wizard-fake"
item_state = "wizrobe"
/obj/item/clothing/head/wizard/marisa/fake
name = "witch hat"
desc = "Strange-looking hat-wear, makes you want to cast fireballs."
icon_state = "marisa"
/obj/item/clothing/suit/wizrobe/marisa/fake
name = "witch robe"
desc = "Magic is all about the spell power, ZE!"
icon_state = "marisa"
item_state = "marisarobe"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
//black robes
/obj/item/clothing/head/wizard/black
code/modules/clothing/under/jobs/civilian.dm
+2 -14
View File
@@ -113,26 +113,14 @@
desc = "Slick threads."
name = "lawyer suit"
/obj/item/clothing/under/lawyer/black
name = "black lawyer suit"
icon_state = "lawyer_black"
item_state = "lawyer_black"
worn_state = "lawyer_black"
/obj/item/clothing/under/lawyer/red
name = "red Lawyer suit"
name = "garish red suit"
icon_state = "lawyer_red"
item_state = "lawyer_red"
worn_state = "lawyer_red"
/obj/item/clothing/under/lawyer/blue
name = "blue Lawyer suit"
icon_state = "lawyer_blue"
item_state = "lawyer_blue"
worn_state = "lawyer_blue"
/obj/item/clothing/under/lawyer/purple
name = "purple suit"
name = "garish purple suit"
icon_state = "lawyer_purple"
item_state = "ba_suit"
worn_state = "lawyer_purple"
code/modules/clothing/under/miscellaneous.dm
+4 -4
View File
@@ -51,7 +51,7 @@
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Captain.\""
name = "officer's dress uniform"
icon_state = "officer"
item_state = "lawyer_black"
item_state = "bl_suit"
worn_state = "officer"
displays_id = 0
@@ -59,7 +59,7 @@
name = "officer's dress uniform"
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Admiral.\""
icon_state = "officer"
item_state = "lawyer_black"
item_state = "bl_suit"
worn_state = "officer"
displays_id = 0
@@ -67,7 +67,7 @@
name = "officer's dress uniform"
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Admiral-Executive.\""
icon_state = "centcom"
item_state = "lawyer_black"
item_state = "bl_suit"
worn_state = "centcom"
displays_id = 0
@@ -112,7 +112,7 @@
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Commander.\ It has a patch denoting a Pheonix on the sleeves."
name = "\improper ERT commander's dress uniform"
icon_state = "centcom"
item_state = "lawyer_black"
item_state = "bl_suit"
worn_state = "centcom"
/obj/item/clothing/under/space
code/modules/ghostroles/spawner/human/emergencypod.dm
-1
View File
@@ -429,7 +429,6 @@
/obj/item/gun/energy/retro,
/obj/item/gun/projectile/silenced,
/obj/item/gun/projectile/colt,
/obj/item/gun/projectile/revolver/deckard,
/obj/item/gun/projectile/revolver/lemat
)
code/modules/hallucinations/text_lists/hallucinated_phrases.txt
-2
View File
@@ -51,9 +51,7 @@ Remember me from high-school? Well I have this great business deal proposition..
Bored?
Once you are a player with MaxBet, you will also receive lucrative weekly and monthly promotions.
Find your secret skrell crush.
Is your sexlife growing dull? Your late-night sessions growing short? Have you considered Unathi testicle transplants? Greater stamina, greater virility, greater fun.
We know who you are. Expect us.
Discovery of this ONE Vaurca pheremone has led to years of genital growth progress!
This staff assistant is making mad credits and basically, you're fucking stupid.
You have a secret admirer!
Where's your ID?
code/modules/materials/material_recipes.dm
+1 -2
View File
@@ -228,8 +228,7 @@
..()
recipes += new /datum/stack_recipe_list("[display_name] costumes",
list(
new /datum/stack_recipe("alien helmet", /obj/item/clothing/head/xenos),
new /datum/stack_recipe("alien suit", /obj/item/clothing/suit/xenos, 3)
new /datum/stack_recipe("leather briefcase", /obj/item/storage/briefcase/real, 4, 1, time = 20)
))
/material/hide/corgi/generate_recipes()
code/modules/mob/living/bot/ed209bot.dm
+7 -7
View File
@@ -9,7 +9,7 @@
#define SECBOT_FOLLOW 8 // follows a target
/mob/living/bot/secbot/ed209
name = "ED-209 Security Robot"
name = "Security Assault Robot"
desc = "A security robot. He looks less than thrilled."
icon = 'icons/obj/aibots.dmi'
icon_state = "ed2090"
@@ -285,12 +285,12 @@
// Assembly
/obj/item/secbot_assembly/ed209_assembly
name = "ED-209 assembly"
name = "security assault robot assembly"
desc = "Some sort of bizarre assembly."
icon = 'icons/obj/aibots.dmi'
icon_state = "ed209_frame"
item_state = "ed209_frame"
created_name = "ED-209 Security Robot"
created_name = "Security Assault Robot"
var/lasercolor = ""
/obj/item/secbot_assembly/ed209_assembly/attackby(var/obj/item/W as obj, var/mob/user as mob)
@@ -372,13 +372,13 @@
if(W.use_tool(src, user, 40, volume = 50) && build_step == 6)
if(C.use(1))
build_step++
to_chat(user, "<span class='notice'>You wire the ED-209 assembly.</span>")
name = "wired ED-209 assembly"
to_chat(user, "<span class='notice'>You wire the security assault robot assembly.</span>")
name = "wired security assault robot assembly"
return
if(7)
if(istype(W, /obj/item/gun/energy/disruptorpistol))
name = "taser ED-209 assembly"
name = "taser security assault robot assembly"
build_step++
to_chat(user, "<span class='notice'>You add [W] to [src].</span>")
item_state = "ed209_taser"
@@ -400,7 +400,7 @@
if(9)
if(istype(W, /obj/item/cell))
build_step++
to_chat(user, "<span class='notice'>You complete the ED-209.</span>")
to_chat(user, "<span class='notice'>You complete the security assault robot.</span>")
var/turf/T = get_turf(src)
new /mob/living/bot/secbot/ed209(T,created_name,lasercolor)
user.drop_from_inventory(W,get_turf(src))
code/modules/mob/living/carbon/human/unarmed_attack.dm
+1 -1
View File
@@ -90,7 +90,7 @@ var/global/list/sparring_attack_cache = list()
target.apply_effect(attack_damage * 0.4, WEAKEN, armor)
if(BP_GROIN)
if(pain_message)
target.visible_message("<span class='warning'>[target] looks like [target.get_pronoun("he")] [target.get_pronoun("is")] in pain!</span>", "<span class='warning'>[(target.gender=="female") ? "Oh god that hurt!" : "Oh no, not your [pick("testicles", "crown jewels", "clockweights", "family jewels", "marbles", "bean bags", "teabags", "sweetmeats", "goolies")]!"]</span>")
target.visible_message("<span class='warning'>[target] looks like [target.get_pronoun("he")] [target.get_pronoun("is")] in pain!</span>", "<span class='warning'>[(target.gender=="female") ? "Oh god that hurt!" : "Oh no, that REALLY hurt!"]</span>")
target.apply_effects(stutter = attack_damage * 2, agony = attack_damage* 3, blocked = armor)
if(BP_L_LEG, BP_L_FOOT, BP_R_LEG, BP_R_FOOT)
if(!target.lying)
code/modules/projectiles/guns/projectile/revolver.dm
-29
View File
@@ -84,35 +84,6 @@
to_chat(M, "You name the gun [input]. Say hello to your new friend.")
return 1
// Blade Runner pistol.
/obj/item/gun/projectile/revolver/deckard
name = "\improper Deckard .44"
desc = "A custom-built revolver, based off the semi-popular Detective Special model."
max_shells = 6
accuracy = 2
icon = 'icons/obj/guns/deckard.dmi'
icon_state = "deckard-empty"
item_state = "deckard"
caliber = "38"
ammo_type = /obj/item/ammo_casing/c38
magazine_type = null
fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
/obj/item/gun/projectile/revolver/deckard/update_icon()
..()
if(loaded.len)
icon_state = "deckard-loaded"
else
icon_state = "deckard-empty"
/obj/item/gun/projectile/revolver/deckard/load_ammo(var/obj/item/A, mob/user)
if(istype(A, /obj/item/ammo_magazine))
flick("deckard-reload",src)
..()
/obj/item/gun/projectile/revolver/deckard/emp
ammo_type = /obj/item/ammo_casing/c38/emp
/obj/item/gun/projectile/revolver/derringer
name = "derringer"
desc = "A small pocket pistol, easily concealed. Uses .357 rounds."
code/modules/psionics/equipment/cerebro_enhancers.dm
+1 -1
View File
@@ -22,7 +22,7 @@
/obj/item/clothing/head/helmet/space/psi_amp/lesser
name = "psionic amplifier"
desc = "A crown-of-thorns cerebro-energetic enhancer that interfaces directly with the brain, isolating and strengthening psionic signals. It kind of looks like a tiara having sex with an industrial robot."
desc = "A crown-of-thorns cerebro-energetic enhancer that interfaces directly with the brain, isolating and strengthening psionic signals. It kind of looks like a tiara."
flags_inv = 0
body_parts_covered = 0
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+16 -16
View File
@@ -2015,7 +2015,7 @@
glass_center_of_mass = list("x"=17, "y"=6)
/decl/reagent/drink/space_cola
name = "Space Cola"
name = "Comet Cola"
description = "A refreshing beverage."
reagent_state = LIQUID
color = "#100800"
@@ -2024,13 +2024,13 @@
carbonated = TRUE
glass_icon_state = "spacecola"
glass_name = "glass of Space Cola"
glass_desc = "A glass of refreshing Space Cola"
glass_name = "glass of Comet Cola"
glass_desc = "A glass of refreshing Comet Cola"
glass_center_of_mass = list("x"=17, "y"=6)
/decl/reagent/drink/spacemountainwind
name = "Mountain Wind"
description = "Blows right through you like a space wind."
name = "Stellar Jolt"
description = "For those who have a stronger need for caffeine than they have sense."
color = "#a2ff8d"
adj_drowsy = -7
adj_sleepy = -1
@@ -2038,8 +2038,8 @@
carbonated = TRUE
glass_icon_state = "Space_mountain_wind_glass"
glass_name = "glass of Space Mountain Wind"
glass_desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
glass_name = "glass of Stellar Jolt"
glass_desc = "Stellar Jolt. Lemony and full of sugar."
/decl/reagent/drink/dr_gibb
name = "Dr. Gibb"
@@ -2054,27 +2054,27 @@
glass_desc = "Dr. Gibb. Not as dangerous as the name might imply."
/decl/reagent/drink/root_beer
name = "RnD Root Beer"
description = "A classic Earth drink from the United Americas province."
name = "Getmore Root Beer"
description = "A classic Earth drink, made from various roots."
color = "#211100"
adj_drowsy = -6
taste_description = "sassafras and anise soda"
carbonated = TRUE
glass_icon_state = "root_beer_glass"
glass_name = "glass of RnD Root Beer"
glass_desc = "A glass of bubbly RnD Root Beer."
glass_name = "glass of Getmore Root Beer"
glass_desc = "A glass of bubbly Getmore Root Beer."
/decl/reagent/drink/spaceup
name = "Space-Up"
name = "Vacuum Fizz"
description = "Tastes like a hull breach in your mouth."
color = "#aee5e4"
taste_description = "a hull breach"
carbonated = TRUE
glass_icon_state = "space-up_glass"
glass_name = "glass of Space-up"
glass_desc = "Space-up. It helps keep your cool."
glass_name = "glass of Vacuum Fizz"
glass_desc = "Vacuum Fizz. It helps keep your cool."
/decl/reagent/drink/lemon_lime
name = "Lemon Lime"
@@ -5147,14 +5147,14 @@
/decl/reagent/drink/diet_cola
name = "Diet Cola"
description = "Space Cola! Now in diet!"
description = "Comet cola! Now in diet!"
color = "#100800"
taste_description = "cola and less calories"
carbonated = TRUE
glass_icon_state = "spacecola"
glass_name = "glass of diet cola"
glass_desc = "Space Cola! Now in diet!"
glass_desc = "Comet cola! Now in diet!"
/decl/reagent/drink/milk/chocolate
name = "Chocolate milk"
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+5 -5
View File
@@ -398,8 +398,8 @@
reagents_to_add = list(/decl/reagent/drink/grenadine = 100)
/obj/item/reagent_containers/food/drinks/bottle/cola
name = "space cola"
desc = "Cola. In space."
name = "comet cola"
desc = "Getmore's most popular line of soda. A generic cola, otherwise."
icon_state = "colabottle"
center_of_mass = list("x"=16, "y"=6)
drink_flags = NO_EMPTY_ICON
@@ -410,7 +410,7 @@
fragile = 0
/obj/item/reagent_containers/food/drinks/bottle/space_up
name = "\improper Space-Up"
name = "\improper Vacuum Fizz"
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up_bottle"
center_of_mass = list("x"=16, "y"=6)
@@ -422,8 +422,8 @@
fragile = 0
/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind
name = "\improper Space Mountain Wind"
desc = "Blows right through you like a space wind."
name = "\improper Stellar Jolt"
desc = "For those who have a need for caffeine stronger than would be sensible."
icon_state = "space_mountain_wind_bottle"
center_of_mass = list("x"=16, "y"=6)
drink_flags = NO_EMPTY_ICON
code/modules/reagents/reagent_containers/food/snacks.dm
+8 -8
View File
@@ -1390,7 +1390,7 @@
/obj/item/reagent_containers/food/snacks/sosjerky
name = "Scaredy's Private Reserve beef jerky"
icon_state = "sosjerky"
desc = "Beef jerky made from the finest space cows."
desc = "Beef jerky. A little oversalted, actually."
trash = /obj/item/trash/sosjerky
filling_color = "#631212"
center_of_mass = list("x"=15, "y"=9)
@@ -1399,9 +1399,9 @@
reagents_to_add = list(/decl/reagent/nutriment/protein = 4, /decl/reagent/sodiumchloride = 3)
/obj/item/reagent_containers/food/snacks/no_raisin
name = "4no Raisins"
name = "Getmore Raisins"
icon_state = "4no_raisins"
desc = "Best raisins in the universe. Not sure why."
desc = "Getmore Raisins. Dry, flavorless, and oversweetened. Sounds about right."
trash = /obj/item/trash/raisins
filling_color = "#343834"
center_of_mass = list("x"=15, "y"=4)
@@ -1410,9 +1410,9 @@
bitesize = 3
/obj/item/reagent_containers/food/snacks/spacetwinkie
name = "space twinkie"
name = "creamy spongecake"
icon_state = "space_twinkie"
desc = "Guaranteed to survive longer then you will."
desc = "Contrary to popular belief, Getmore's sponge cakes don't last forever. They do, however, leave a plastic-esque film coating the inside of your mouth."
trash = /obj/item/trash/space_twinkie
filling_color = "#FFE591"
center_of_mass = list("x"=15, "y"=11)
@@ -1423,7 +1423,7 @@
/obj/item/reagent_containers/food/snacks/cheesiehonkers
name = "Cheesie Honkers"
icon_state = "cheesie_honkers"
desc = "Bite sized cheesie snacks that will honk all over your mouth"
desc = "Bite sized cheesie snacks, made with real cheese! A little bit of it, anyway."
trash = /obj/item/trash/cheesie
filling_color = "#FFA305"
center_of_mass = list("x"=15, "y"=9)
@@ -1432,9 +1432,9 @@
bitesize = 2
/obj/item/reagent_containers/food/snacks/syndicake
name = "Syndi-Cakes"
name = "Nutri-Cakes"
icon_state = "syndi_cakes"
desc = "An extremely moist snack cake that tastes just as good after being nuked."
desc = "An extremely moist snack cake."
filling_color = "#FF5D05"
center_of_mass = list("x"=16, "y"=10)
trash = /obj/item/trash/syndi_cakes