mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 23:17:02 +01:00
Adds Reycleable Materials to a Bunch of Objects (#31320)
* recycle * moar * Update glass_containers.dm * Update spray.dm * cost adjustment because sheets are 2000, not 1000 * Update hydroitemdefines.dm * Update hydroitemdefines.dm
This commit is contained in:
@@ -74,8 +74,9 @@
|
||||
icon_full = "ashtray_full_bl"
|
||||
max_butts = 8
|
||||
max_integrity = 8
|
||||
material = /obj/item/stack/sheet/plastic
|
||||
throwforce = 3
|
||||
material = /obj/item/stack/sheet/plastic
|
||||
materials = list(MAT_PLASTIC = 2000)
|
||||
|
||||
/obj/item/ashtray/bronze
|
||||
name = "bronze ashtray"
|
||||
@@ -86,6 +87,7 @@
|
||||
max_butts = 16
|
||||
max_integrity = 16
|
||||
throwforce = 10
|
||||
materials = list(MAT_METAL = 2000)
|
||||
|
||||
/obj/item/ashtray/glass
|
||||
name = "glass ashtray"
|
||||
@@ -95,5 +97,6 @@
|
||||
icon_full = "ashtray_full_gl"
|
||||
max_butts = 12
|
||||
max_integrity = 12
|
||||
material = /obj/item/stack/sheet/glass
|
||||
throwforce = 6
|
||||
material = /obj/item/stack/sheet/glass
|
||||
materials = list(MAT_GLASS = 2000)
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
throw_range = 5
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
attack_verb = list("warned", "cautioned", "smashed")
|
||||
materials = list(MAT_PLASTIC = 4000)
|
||||
|
||||
/obj/item/caution/proximity_sign
|
||||
var/timing = FALSE
|
||||
|
||||
@@ -13,7 +13,8 @@
|
||||
desc = "If you can see this, make a bug report on GitHub, something went wrong!"
|
||||
icon_state = "firstaid_generic"
|
||||
throw_range = 8
|
||||
req_one_access =list(ACCESS_MEDICAL, ACCESS_ROBOTICS) //Access and treatment are utilized for medbots.
|
||||
req_one_access = list(ACCESS_MEDICAL, ACCESS_ROBOTICS) //Access and treatment are utilized for medbots.
|
||||
materials = list(MAT_PLASTIC = 8000)
|
||||
var/treatment_brute = "salglu_solution"
|
||||
var/treatment_oxy = "salbutamol"
|
||||
var/treatment_fire = "salglu_solution"
|
||||
@@ -269,6 +270,7 @@
|
||||
storage_slots = 50
|
||||
max_combined_w_class = 50
|
||||
display_contents_with_number = TRUE
|
||||
materials = list(MAT_PLASTIC = 2000)
|
||||
var/base_name = ""
|
||||
var/label_text = ""
|
||||
var/applying_meds = FALSE //To Prevent spam clicking and generating runtimes from apply a deleting pill multiple times.
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
desc = "This is rubbish."
|
||||
resistance_flags = FLAMMABLE
|
||||
// Recycle your litter, kids!
|
||||
materials = list(MAT_PLASTIC = 100)
|
||||
|
||||
/obj/item/trash/decompile_act(obj/item/matter_decompiler/C, mob/user)
|
||||
if(isdrone(user))
|
||||
@@ -104,6 +106,7 @@
|
||||
name = "Tray"
|
||||
icon_state = "tray"
|
||||
resistance_flags = NONE
|
||||
materials = list(MAT_METAL = 100)
|
||||
|
||||
/obj/item/trash/candle
|
||||
name = "candle"
|
||||
@@ -120,6 +123,7 @@
|
||||
var/is_glass = 0
|
||||
var/is_plastic = 0
|
||||
resistance_flags = NONE
|
||||
materials = list(MAT_METAL = 200)
|
||||
|
||||
/obj/item/trash/gum
|
||||
name = "chewed gum"
|
||||
@@ -145,6 +149,7 @@
|
||||
name = "caviar can"
|
||||
icon_state = "caviar-empty"
|
||||
desc = "There's none left."
|
||||
materials = list(MAT_METAL = 100)
|
||||
|
||||
// Ammo casings
|
||||
/obj/item/trash/spentcasing
|
||||
@@ -153,6 +158,7 @@
|
||||
desc = "If you can see this and didn't spawn it, make an issue report on GitHub."
|
||||
icon_state = "pistol_brass"
|
||||
scatter_distance = 10
|
||||
materials = list(MAT_METAL = 100)
|
||||
|
||||
/obj/item/trash/spentcasing/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
icon = 'icons/obj/dice.dmi'
|
||||
icon_state = "d6"
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
materials = list(MAT_PLASTIC = 200)
|
||||
|
||||
var/sides = 6
|
||||
var/result = null
|
||||
|
||||
@@ -13,13 +13,17 @@
|
||||
*/
|
||||
|
||||
/obj/item/kitchen
|
||||
name = "base type kitchen item"
|
||||
desc = ABSTRACT_TYPE_DESC
|
||||
icon = 'icons/obj/kitchen.dmi'
|
||||
origin_tech = "materials=1"
|
||||
materials = list(MAT_METAL = 100)
|
||||
|
||||
/*
|
||||
* Utensils
|
||||
*/
|
||||
/obj/item/kitchen/utensil
|
||||
name = "base type kitchen utensil"
|
||||
lefthand_file = 'icons/mob/inhands/utensil_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/utensil_righthand.dmi'
|
||||
force = 5.0
|
||||
@@ -70,6 +74,7 @@
|
||||
desc = "Yay, no washing up to do."
|
||||
icon_state = "pfork"
|
||||
flags = NONE
|
||||
materials = list(MAT_PLASTIC = 2000)
|
||||
|
||||
/obj/item/kitchen/utensil/spoon
|
||||
name = "spoon"
|
||||
@@ -83,6 +88,7 @@
|
||||
icon_state = "pspoon"
|
||||
attack_verb = list("attacked", "poked")
|
||||
flags = NONE
|
||||
materials = list(MAT_PLASTIC = 2000)
|
||||
|
||||
/obj/item/kitchen/utensil/spork
|
||||
name = "spork"
|
||||
@@ -96,6 +102,7 @@
|
||||
icon_state = "pspork"
|
||||
attack_verb = list("attacked", "sporked")
|
||||
flags = NONE
|
||||
materials = list(MAT_PLASTIC = 2000)
|
||||
|
||||
/*
|
||||
* Knives
|
||||
@@ -113,7 +120,7 @@
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
throw_speed = 3
|
||||
throw_range = 6
|
||||
materials = list(MAT_METAL=12000)
|
||||
materials = list(MAT_METAL = 12000)
|
||||
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
|
||||
sharp = TRUE
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
|
||||
@@ -137,6 +144,7 @@
|
||||
icon_state = "pknife"
|
||||
sharp = FALSE
|
||||
flags = NONE
|
||||
materials = list(MAT_PLASTIC = 2000)
|
||||
|
||||
/obj/item/kitchen/knife/ritual
|
||||
name = "ritual knife"
|
||||
@@ -151,6 +159,7 @@
|
||||
icon = 'icons/obj/weapons/melee.dmi'
|
||||
icon_state = "glass_shiv"
|
||||
flags = NONE
|
||||
materials = list(MAT_METAL = 100, MAT_GLASS = 2000)
|
||||
|
||||
/obj/item/kitchen/knife/shiv/carrot
|
||||
name = "carrot shiv"
|
||||
@@ -163,6 +172,7 @@
|
||||
origin_tech = "biotech=3;combat=2"
|
||||
attack_verb = list("shanked", "shivved")
|
||||
armor = null
|
||||
materials = list()
|
||||
|
||||
/obj/item/kitchen/knife/butcher
|
||||
name = "butcher's cleaver"
|
||||
@@ -172,6 +182,7 @@
|
||||
throwforce = 8
|
||||
attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
materials = list(MAT_METAL = 18000)
|
||||
|
||||
/obj/item/kitchen/knife/butcher/meatcleaver
|
||||
name = "meat cleaver"
|
||||
@@ -224,7 +235,6 @@
|
||||
icon_state = "knife-cheese"
|
||||
materials = list(MAT_METAL = 4000)
|
||||
force = 3
|
||||
materials = list(MAT_METAL = 4000)
|
||||
|
||||
/obj/item/kitchen/knife/pizza_cutter
|
||||
name = "pizza cutter"
|
||||
@@ -232,7 +242,6 @@
|
||||
icon_state = "pizza_cutter"
|
||||
materials = list(MAT_METAL = 10000)
|
||||
force = 8
|
||||
materials = list(MAT_METAL = 10000)
|
||||
|
||||
/*
|
||||
* Rolling Pins
|
||||
@@ -242,10 +251,11 @@
|
||||
name = "rolling pin"
|
||||
desc = "Used to knock out the Bartender."
|
||||
icon_state = "rolling_pin"
|
||||
force = 8.0
|
||||
throwforce = 10.0
|
||||
force = 8
|
||||
throwforce = 10
|
||||
throw_speed = 3
|
||||
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
|
||||
materials = list(MAT_WOOD = 10000)
|
||||
|
||||
/* Trays moved to /obj/item/storage/bag */
|
||||
|
||||
@@ -263,6 +273,7 @@
|
||||
throw_speed = 3
|
||||
throw_range = 3
|
||||
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
|
||||
materials = list(MAT_PLASTIC = 2000)
|
||||
|
||||
/obj/item/reagent_containers/cooking/mould/make_mini()
|
||||
transform *= 0.5
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
name = "wooden buckler"
|
||||
desc = "A medieval wooden buckler."
|
||||
icon_state = "buckler"
|
||||
materials = list()
|
||||
materials = list(MAT_WOOD = 20000)
|
||||
origin_tech = "materials=1;combat=3;biotech=2"
|
||||
resistance_flags = FLAMMABLE
|
||||
|
||||
|
||||
@@ -120,6 +120,7 @@
|
||||
display_contents_with_number = 0 //or else this will lead to stupid behavior.
|
||||
can_hold = list() // any
|
||||
cant_hold = list(/obj/item/disk/nuclear)
|
||||
materials = list(MAT_PLASTIC = 6000)
|
||||
|
||||
/obj/item/storage/bag/plasticbag/mob_can_equip(mob/M, slot, disable_warning = FALSE)
|
||||
if(slot == ITEM_SLOT_HEAD && length(contents))
|
||||
|
||||
@@ -191,6 +191,7 @@
|
||||
throwforce = 12
|
||||
attack_verb = list("beat", "smacked")
|
||||
w_class = WEIGHT_CLASS_HUGE
|
||||
materials = list(MAT_WOOD = 5000)
|
||||
COOLDOWN_DECLARE(last_deflect)
|
||||
var/deflect_cooldown = 5 MINUTES
|
||||
COOLDOWN_DECLARE(next_throw_time)
|
||||
|
||||
Reference in New Issue
Block a user