Moves reagent fill code and adds caps to plastic water bottles (#46878)

* Adds caps to plastic bottles

* Non-crafted water bottles now spawned closed

* Added warning message for closed bottles, fixed minor bug

* meme

* Makes the warning only show up when doing valid actions with the bottle

* Clumsy people now have a chance to lose the cap

* Fix small bottle's cap when fallen over, bottles now turn upright when opened on the floor

* Add a minor positive moodlet on bottle flip

* Adds a relic lavaland water bottle that always lands upright

* Moves container fill overlay to reagent_containers, changes glass/beaker/waterbottle to glass/waterbottle

* Make actions with closed cap early return

* Minor code cleanup
This commit is contained in:
Urumasi
2019-10-09 12:05:52 -04:00
committed by moo
parent f50eb4e3d4
commit 6e7801550b
21 changed files with 188 additions and 164 deletions
@@ -13,7 +13,7 @@
desc = "It's watching you suspiciously."
/obj/structure/closet/crate/necropolis/tendril/PopulateContents()
var/loot = rand(1,28)
var/loot = rand(1,29)
switch(loot)
if(1)
new /obj/item/shared_storage/red(src)
@@ -79,6 +79,8 @@
new /obj/item/bedsheet/cult(src)
if(28)
new /obj/item/clothing/neck/necklace/memento_mori(src)
if(29)
new /obj/item/reagent_containers/glass/waterbottle/relic(src)
//KA modkit design discs
/obj/item/disk/design_disk/modkit_disc
@@ -325,6 +327,11 @@
if(!isnull(lighting_alpha))
user.lighting_alpha = min(user.lighting_alpha, lighting_alpha)
// Relic water bottle
/obj/item/reagent_containers/glass/waterbottle/relic
desc = "A bottle of water filled at an old Earth bottling facility. It seems to be radiating some kind of energy."
flip_chance = 100 // FLIPP
//Red/Blue Cubes
/obj/item/warp_cube
name = "blue cube"