05-25-2016, 06:34 AM
Finally implementing most of the rest of this (I am very distractable) with a couple changes:
from here:
I think I was the one who suggested doing this in the first place but I realized there was a much simpler way to do it than a bunch of istype()s:
(beakers.len check goes first because it's more important than the size check)
from here:
I realized there was actually a simple way to prevent people wandering out and being protected from space in only a helmet and mask:
now it only checks for masks if a helmet isn't already present
from here:
Code:
else if (istype(W,/obj/item/reagent_containers/glass) && stage == 1)
else if (istype(W,/obj/item/reagent_containers/glass) && stage == 1) // this actually includes watering cans, oil cans, and such.
if (istype(W,/obj/item/reagent_containers/glass/beaker/large) || istype(W,/obj/item/reagent_containers/glass/wateringcan) || istype(W,/obj/item/reagent_containers/glass/oilcan)) //no more 240 unit grenades, sorry.
boutput(user, "<span style=\"color:red\">This beaker is too large!</span>")
return
I think I was the one who suggested doing this in the first place but I realized there was a much simpler way to do it than a bunch of istype()s:
Code:
else if (istype(W,/obj/item/reagent_containers/glass) && stage == 1)
if (beakers.len == 2)
boutput(user, "<span style='color:red'>The grenade can not hold more containers.</span>")
return
var/obj/item/reagent_containers/glass/G = W
if (G.initial_volume > 50) // anything bigger than a regular beaker, but someone could varedit their reagent holder beyond this for admin nonsense
boutput(user, "<span style='color:red'>This beaker is too large!</span>")
return
from here:
Code:
if (head && (head.c_flags & SPACEWEAR))
space_suit += 0.5
if (wear_mask && (wear_mask.c_flags & SPACEWEAR)) // why on earth was this commented out?
space_suit += 0.5 // so you can't just wear helmets and masks and be safe
I realized there was actually a simple way to prevent people wandering out and being protected from space in only a helmet and mask:
Code:
if (head && (head.c_flags & SPACEWEAR))
space_suit++
else if (wear_mask && (wear_mask.c_flags & SPACEWEAR))
space_suit++
