mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 02:54:41 +01:00
Adds Botany Jugs, and fixes hydroponic trays draining sealed containers [now without map edits] (#14212)
* Adds Botany Jugs, and lid test for hydro trays * adds 1u and 2u transfer amounts back to changed items * fixed item references in some .dmm * improves weed/pest killer jug sprites, and corrects overlays procs * removes uneeded image def * improves sprites further * adjusts coloring of l4z reagant * Buffs Jugs to 80u each (from 50u) * balances nutrient vending numbers * resizes jugs * fixes conflict in .dmi * Resizes Jugs again * removes commented out code * Fixes * futher fixes * Fixes some issues, adds sounds for jugs. * reverts to using New() * removes jug.dm and reverts all nutrient back to bottles
This commit is contained in:
@@ -603,7 +603,7 @@
|
||||
name = "Left 4 Zed"
|
||||
id = "left4zednutriment"
|
||||
description = "Unstable nutriment that makes plants mutate more often than usual."
|
||||
color = "#1A1E4D" // RBG: 26, 30, 77
|
||||
color = "#2A1680" // RBG: 42, 128, 22
|
||||
tox_prob = 25
|
||||
taste_description = "evolution"
|
||||
|
||||
|
||||
@@ -1054,7 +1054,7 @@
|
||||
id = "atrazine"
|
||||
description = "A herbicidal compound used for destroying unwanted plants."
|
||||
reagent_state = LIQUID
|
||||
color = "#17002D"
|
||||
color = "#773E73" //RGB: 47 24 45
|
||||
lethality = 2 //Atrazine, however, is definitely toxic
|
||||
|
||||
|
||||
|
||||
@@ -50,16 +50,25 @@
|
||||
if(!QDELETED(src))
|
||||
..()
|
||||
|
||||
|
||||
/obj/item/reagent_containers/proc/add_lid()
|
||||
if(has_lid)
|
||||
container_type ^= REFILLABLE | DRAINABLE
|
||||
update_icon()
|
||||
|
||||
/obj/item/reagent_containers/proc/remove_lid()
|
||||
if(has_lid)
|
||||
container_type |= REFILLABLE | DRAINABLE
|
||||
update_icon()
|
||||
|
||||
/obj/item/reagent_containers/attack_self(mob/user)
|
||||
if(has_lid)
|
||||
if(is_open_container())
|
||||
to_chat(usr, "<span class='notice'>You put the lid on [src].</span>")
|
||||
container_type ^= REFILLABLE | DRAINABLE
|
||||
add_lid()
|
||||
else
|
||||
to_chat(usr, "<span class='notice'>You take the lid off [src].</span>")
|
||||
container_type |= REFILLABLE | DRAINABLE
|
||||
update_icon()
|
||||
return
|
||||
remove_lid()
|
||||
|
||||
/obj/item/reagent_containers/attack(mob/M, mob/user, def_zone)
|
||||
if(user.a_intent == INTENT_HARM)
|
||||
|
||||
Reference in New Issue
Block a user