mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-16 01:23:41 +01:00
massive burndown (#29894)
This commit is contained in:
@@ -4,13 +4,9 @@
|
||||
/obj/item/reagent_containers/glass/bottle
|
||||
name = "bottle"
|
||||
desc = "A small bottle."
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
icon_state = "bottle"
|
||||
item_state = "atoxinbottle"
|
||||
amount_per_transfer_from_this = 10
|
||||
possible_transfer_amounts = list(5, 10, 15, 25, 30, 40, 50)
|
||||
container_type = OPENCONTAINER
|
||||
volume = 50
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/on_reagent_change()
|
||||
update_icon(UPDATE_OVERLAYS)
|
||||
@@ -250,7 +246,6 @@
|
||||
/obj/item/reagent_containers/glass/bottle/thermite
|
||||
name = "thermite bottle"
|
||||
desc = "A small bottle of thermite, a substance that burns extremely hot."
|
||||
icon_state = "bottle"
|
||||
list_reagents = list("thermite" = 50)
|
||||
|
||||
////////////////////Traitor Poison Bottle//////////////////////////////
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
name = " "
|
||||
var/base_name = " "
|
||||
desc = " "
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
amount_per_transfer_from_this = 10
|
||||
possible_transfer_amounts = list(5,10,15,25,30,50)
|
||||
volume = 50
|
||||
@@ -121,7 +120,6 @@
|
||||
/obj/item/reagent_containers/glass/beaker
|
||||
name = "beaker"
|
||||
desc = "A simple glass beaker, nothing special."
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
icon_state = "beaker"
|
||||
item_state = "beaker"
|
||||
belt_icon = "beaker"
|
||||
@@ -227,9 +225,7 @@
|
||||
icon_state = "beakerlarge"
|
||||
materials = list(MAT_GLASS=2500)
|
||||
volume = 100
|
||||
amount_per_transfer_from_this = 10
|
||||
possible_transfer_amounts = list(5,10,15,25,30,50,100)
|
||||
container_type = OPENCONTAINER
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/vial
|
||||
name = "vial"
|
||||
@@ -238,9 +234,7 @@
|
||||
belt_icon = "vial"
|
||||
materials = list(MAT_GLASS=250)
|
||||
volume = 25
|
||||
amount_per_transfer_from_this = 10
|
||||
possible_transfer_amounts = list(5,10,15,25)
|
||||
container_type = OPENCONTAINER
|
||||
can_assembly = 0
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/drugs
|
||||
@@ -250,7 +244,6 @@
|
||||
amount_per_transfer_from_this = 2
|
||||
possible_transfer_amounts = null
|
||||
volume = 10
|
||||
container_type = OPENCONTAINER
|
||||
can_assembly = 0
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/noreact
|
||||
@@ -258,10 +251,7 @@
|
||||
desc = "A cryostasis beaker that allows for chemical storage without reactions."
|
||||
icon_state = "beakernoreact"
|
||||
materials = list(MAT_METAL=3000)
|
||||
volume = 50
|
||||
amount_per_transfer_from_this = 10
|
||||
origin_tech = "materials=2;engineering=3;plasmatech=3"
|
||||
container_type = OPENCONTAINER
|
||||
blocks_emissive = EMISSIVE_BLOCK_GENERIC
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/noreact/Initialize(mapload)
|
||||
@@ -274,9 +264,7 @@
|
||||
icon_state = "beakerbluespace"
|
||||
materials = list(MAT_GLASS=3000)
|
||||
volume = 300
|
||||
amount_per_transfer_from_this = 10
|
||||
possible_transfer_amounts = list(5,10,15,25,30,50,100,300)
|
||||
container_type = OPENCONTAINER
|
||||
blocks_emissive = EMISSIVE_BLOCK_GENERIC
|
||||
origin_tech = "bluespace=5;materials=4;plasmatech=4"
|
||||
|
||||
@@ -309,7 +297,6 @@
|
||||
prefered_slot_flags = ITEM_SLOT_IN_BACKPACK
|
||||
resistance_flags = NONE
|
||||
blocks_emissive = EMISSIVE_BLOCK_GENERIC
|
||||
container_type = OPENCONTAINER
|
||||
dog_fashion = /datum/dog_fashion/head/bucket
|
||||
|
||||
/obj/item/reagent_containers/glass/bucket/update_overlays()
|
||||
@@ -354,8 +341,6 @@
|
||||
item_state = "bottle"
|
||||
list_reagents = list("water" = 49.5, "fluorine" = 0.5) //see desc, don't think about it too hard
|
||||
materials = list(MAT_GLASS = 0)
|
||||
volume = 50
|
||||
amount_per_transfer_from_this = 10
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/waterbottle/empty
|
||||
list_reagents = list()
|
||||
|
||||
@@ -8,8 +8,6 @@
|
||||
item_state = "hypo"
|
||||
icon_state = "hypo"
|
||||
belt_icon = "hypospray"
|
||||
amount_per_transfer_from_this = 5
|
||||
volume = 30
|
||||
possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30)
|
||||
resistance_flags = ACID_PROOF
|
||||
container_type = OPENCONTAINER
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
/obj/item/reagent_containers/patch
|
||||
name = "chemical patch"
|
||||
desc = "A chemical patch for touch based applications."
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
icon_state = "bandaid1"
|
||||
possible_transfer_amounts = null
|
||||
visible_transfer_rate = FALSE
|
||||
volume = 30
|
||||
temperature_min = 270
|
||||
temperature_max = 350
|
||||
var/instant_application = FALSE
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
/obj/item/reagent_containers/pill
|
||||
name = "pill"
|
||||
desc = "A pill."
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
icon_state = null
|
||||
item_state = "pill"
|
||||
possible_transfer_amounts = null
|
||||
|
||||
@@ -8,13 +8,10 @@
|
||||
flags = NOBLUDGEON
|
||||
container_type = OPENCONTAINER
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
throwforce = 0
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
throw_speed = 3
|
||||
throw_range = 7
|
||||
var/spray_maxrange = 3 //what the sprayer will set spray_currentrange to in the attack_self.
|
||||
var/spray_currentrange = 3 //the range of tiles the sprayer will reach when in fixed mode.
|
||||
amount_per_transfer_from_this = 5
|
||||
volume = 250
|
||||
possible_transfer_amounts = null
|
||||
var/delay = CLICK_CD_RANGE * 2
|
||||
@@ -156,7 +153,6 @@
|
||||
visible_message("<span class='warning'>[src] identifies and removes a filthy substance.</span>")
|
||||
|
||||
/obj/item/reagent_containers/spray/cleaner/drone
|
||||
name = "space cleaner"
|
||||
desc = "BLAM!-brand non-foaming space cleaner!"
|
||||
spray_maxrange = 3
|
||||
spray_currentrange = 3
|
||||
@@ -192,7 +188,6 @@
|
||||
belt_icon = null
|
||||
volume = 40
|
||||
spray_maxrange = 4
|
||||
amount_per_transfer_from_this = 5
|
||||
list_reagents = list("condensedcapsaicin" = 40)
|
||||
|
||||
//water flower
|
||||
@@ -219,7 +214,6 @@
|
||||
icon = 'icons/obj/guns/projectile.dmi'
|
||||
icon_state = "chemsprayer"
|
||||
item_state = "chemsprayer"
|
||||
throwforce = 0
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
spray_maxrange = 7
|
||||
spray_currentrange = 7
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
item_state = "syringe_0"
|
||||
icon_state = "0"
|
||||
belt_icon = "syringe"
|
||||
amount_per_transfer_from_this = 5
|
||||
possible_transfer_amounts = null
|
||||
volume = 15
|
||||
var/busy = FALSE
|
||||
|
||||
Reference in New Issue
Block a user