Extinguisher + Container Reworks (#4793)

Reworked how slipping on tiles work. If there is too much lube/water on one tile, it will spread to all adjacent tiles.

Fixed a potential bug where spilling copious amounts of water on a tile will turn it to ice.

Containers are much more saner now. They all share a standard system, unless specified.

You can drink from any open holdable container using help intent. You can splash the contents of the container on anything via harm intent.

Sinks are more saner, you can refill or empty them easier with various refill amounts.

Removed silly exclusive cyborg limb checking for hyposprays.

Added a new chemsprayer, the "Xenoblaster" which is a significantly weaker chem sprayer. Two can be found in xenobiology.

Large reagent containers (beer kegs, water tanks, fuel tanks) now share a system together. Both can leak their reagents via harm intent with a wrench, and bother can accept any sort of reagent, with exception to the fuel tank.

Large reagent container leaking happens over time as opposed to just leaking every time it moves.

New chemical, Monoammonium phosphate. Monoammonium phosphate is a fertilizer and also a potent fire extinguishing and preventing chemical. It can be made with 1 part ammonia, 1 part sulfuric acid, 1 part sodium, 1 part phosphorus.

All extinguishers now have monoammonium phosphate in them instead of water.

Extinguishers can hold any reagent, however they must be filled using an extinguisher refiller cartridge. These can be ordered or found in atmospherics.

Nerfed the extinguisher range so it only sprays in a 3x3 radius.

Mini-extinguishers spray in a 1x1 radius.

Adds Monoammonium phosphate containers across the station.

Most watertanks are replaced with Monoammonium phosphate containers.
This commit is contained in:
BurgerLUA
2018-08-05 20:14:00 +03:00
committed by Erki
parent 4cd7b99e43
commit 1620d81661
54 changed files with 820 additions and 523 deletions
@@ -701,3 +701,11 @@
return pickweight(random_stock_uncommon)
if ("3")
return pickweight(random_stock_common)
/obj/structure/closet/crate/extinguisher_catridges
name = "crate of extinguisher cartridges"
desc = "Contains a dozen empty extinguisher cartridges."
/obj/structure/closet/crate/extinguisher_catridges/fill()
for(var/a = 1 to 12)
new /obj/item/weapon/reagent_containers/extinguisher_refill(src)
+1 -1
View File
@@ -91,7 +91,7 @@
desc = "It looks dead."
dead = 1
//No complex interactions, just make them fragile
/obj/structure/flora/pottedplant/ex_act()
/obj/structure/flora/pottedplant/ex_act(var/severity = 2.0)
death()
return ..()
+14 -4
View File
@@ -369,6 +369,16 @@
desc = "A sink used for washing one's hands and face."
anchored = 1
var/busy = 0 //Something's being washed at the moment
var/amount_per_transfer_from_this = 10
var/possible_transfer_amounts = list(5,10,15,25,30,50,60,100,120,250,300)
/obj/structure/sink/verb/set_APTFT() //set amount_per_transfer_from_this
set name = "Set transfer amount"
set category = "Object"
set src in view(1)
var/N = input("Amount per transfer from this:","[src]") as null|anything in possible_transfer_amounts
if (N)
amount_per_transfer_from_this = N
/obj/structure/sink/attack_hand(mob/user as mob)
if (ishuman(user))
@@ -427,7 +437,7 @@
usr << "<span class='warning'>\The [RG] is already full.</span>"
return
RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, amount_per_transfer_from_this))
oviewers(3, usr) << "<span class='notice'>[usr] fills \the [RG] using \the [src].</span>"
usr << "<span class='notice'>You fill \the [RG] using \the [src].</span>"
if ("Empty")
@@ -435,9 +445,9 @@
usr << "<span class='warning'>\The [RG] is already empty.</span>"
return
RG.reagents.clear_reagents()
oviewers(3, usr) << "<span class='notice'>[usr] empties \the [RG] into \the [src].</span>"
usr << "<span class='notice'>You empty \the [RG] into \the [src].</span>"
var/empty_amount = RG.reagents.trans_to(src, RG.amount_per_transfer_from_this)
oviewers(3, usr) << "<span class='notice'>[usr] empties [empty_amount]u of \the [RG] into \the [src].</span>"
usr << "<span class='notice'>You empty [empty_amount]u of \the [RG] into \the [src].</span>"
return
// Filling/empying Syringes
+1 -1
View File
@@ -525,7 +525,7 @@
/obj/structure/window/reinforced/crescent/attackby()
return
/obj/structure/window/reinforced/crescent/ex_act()
/obj/structure/window/reinforced/crescent/ex_act(var/severity = 2.0)
return
/obj/structure/window/reinforced/crescent/hitby()