Reagent Containers : The 3/4thening & Contained Spritening (and other related food things) (#17231)

* food and drink

* sabrage

* kanpai and blasted on grain alcohol

* beakers

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/drinks/bottle.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/drinks/bottle.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* changelog

* the contained sprite-ening....

* deletes old file

* teapot

* aaaaahhhh

* AAAGH INHANDS

* volume = 30

* fixes invalid icon state

* is this really that fucking esoteric

* Revert "is this really that fucking esoteric"

This reverts commit 5b238c7821.

* this should fix it maybe

* fixes 2

* the simple solution

* skibidi toilet

* god dammit

* jyalra

* redundancy

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
Wowzewow (Wezzy)
2023-09-06 18:54:20 +00:00
committed by GitHub
co-authored by SleepyGemmy
parent 45709e1924
commit cc8eab09ef
123 changed files with 1084 additions and 793 deletions
@@ -1,10 +1,7 @@
/obj/item/implanter
name = "implanter"
icon = 'icons/obj/items.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
)
icon = 'icons/obj/item/reagent_containers/syringe.dmi'
contained_sprite = TRUE
icon_state = "implanter0"
item_state = "syringe_0"
throw_speed = 1
@@ -94,7 +91,6 @@
/obj/item/implanter/compressed
name = "implanter (C)"
icon_state = "cimplanter1"
/obj/item/implanter/compressed/New()
imp = new /obj/item/implant/compressed( src )
@@ -102,17 +98,6 @@
update()
return
/obj/item/implanter/compressed/update()
if (imp)
var/obj/item/implant/compressed/c = imp
if(!c.scanned)
icon_state = "cimplanter1"
else
icon_state = "cimplanter2"
else
icon_state = "cimplanter0"
return
/obj/item/implanter/compressed/attack(mob/M as mob, mob/user as mob)
var/obj/item/implant/compressed/c = imp
if (!c) return