cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 20:06:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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-07 02:54:20 +08:00
committed by GitHub
parent 45709e1924
commit cc8eab09ef
123 changed files with 1084 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/glassjar.dm
+1 -1
View File
@@ -15,7 +15,7 @@
name = "glass jar"
desc = "A glass jar. Does not contain brain submerged in formaldehyde."
desc_info = "Can be used to hold money, small animals, and gumballs. You can remove the lid and use it as a reagent container."
icon = 'icons/obj/drinks.dmi'
icon = 'icons/obj/item/reagent_containers/glass.dmi'
icon_state = "jar_lid"
w_class = ITEMSIZE_SMALL
matter = list(MATERIAL_GLASS = 200)
code/game/objects/items/weapons/dna_injector.dm
+2 -5
View File
@@ -1,11 +1,8 @@
/obj/item/dnainjector
name = "\improper DNA injector"
desc = "This injects the person with DNA."
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 = "dnainjector"
item_state = "dnainjector"
var/block=0
code/game/objects/items/weapons/implants/implanter.dm
+2 -17
View File
@@ -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
code/game/objects/items/weapons/storage/bags.dm
+1 -4
View File
@@ -325,10 +325,7 @@
/obj/item/storage/bag/chemistry
name = "chemistry bag"
icon = 'icons/obj/chemical.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
)
contained_sprite = TRUE
icon_state = "chembag"
desc = "A bag for storing pills and bottles of medicine."
max_storage_space = 200
code/game/objects/items/weapons/storage/boxes.dm
-4
View File
@@ -747,10 +747,6 @@
name = "portable freezer"
desc = "This nifty shock-resistant device will keep your 'groceries' nice and non-spoiled."
icon = 'icons/obj/storage.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_state = "portafreezer"
item_state = "medicalpack"
max_w_class = ITEMSIZE_NORMAL
code/game/objects/items/weapons/storage/pill_bottle.dm
+1 -4
View File
@@ -3,10 +3,7 @@
desc = "It's an airtight container for storing medication."
icon_state = "pill_canister"
icon = 'icons/obj/chemical.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
)
contained_sprite = TRUE
item_state = "pill_canister"
center_of_mass = list("x" = 16,"y" = 12)
w_class = ITEMSIZE_SMALL
code/game/objects/items/weapons/surgery_tools.dm
+1 -4
View File
@@ -12,13 +12,10 @@
name = "surgery tool parent item"
desc = DESC_PARENT
icon = 'icons/obj/surgery.dmi'
contained_sprite = TRUE
w_class = ITEMSIZE_SMALL
drop_sound = 'sound/items/drop/weldingtool.ogg'
pickup_sound = 'sound/items/pickup/weldingtool.ogg'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
)
recyclable = TRUE
/*
code/game/objects/random/loot.dm
+1 -3
View File
@@ -97,9 +97,7 @@
/obj/item/razor = 0.5,
/obj/item/reagent_containers/extinguisher_refill = 0.1,
/obj/item/reagent_containers/extinguisher_refill/filled = 0.5,
/obj/item/reagent_containers/food/drinks/flask/lithium = 0.3,
/obj/item/reagent_containers/food/drinks/flask/shiny = 0.3,
/obj/item/reagent_containers/food/drinks/teapot = 0.4,
/obj/item/reagent_containers/glass/teapot = 0.4,
/obj/item/reagent_containers/cooking_container/board/bowl = 0.8,
/obj/item/reagent_containers/inhaler/hyperzine = 0.1,
/obj/item/reagent_containers/spray/cleaner = 0.6,
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+4 -4
View File
@@ -50,9 +50,9 @@
/obj/structure/closet/secure_closet/freezer/fridge/fill()
..()
for(var/i = 0, i < 5, i++)
new /obj/item/reagent_containers/food/drinks/milk(src)
new /obj/item/reagent_containers/food/drinks/carton/milk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/reagent_containers/food/drinks/soymilk(src)
new /obj/item/reagent_containers/food/drinks/carton/soymilk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/storage/box/fancy/egg_box(src)
@@ -86,10 +86,10 @@
/obj/structure/closet/secure_closet/freezer/cafe/fill()
..()
for(var/i = 0, i < 6, i++)
new /obj/item/reagent_containers/food/drinks/milk(src)
new /obj/item/reagent_containers/food/drinks/carton/milk(src)
for(var/i = 0, i < 3, i++)
new /obj/item/storage/box/fancy/egg_box(src)
new /obj/item/reagent_containers/food/condiment/flour(src)
for(var/i = 0, i < 2, i++)
new /obj/item/reagent_containers/food/drinks/soymilk(src)
new /obj/item/reagent_containers/food/drinks/carton/soymilk(src)
new /obj/item/reagent_containers/food/condiment/sugar(src)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+1 -1
View File
@@ -204,7 +204,7 @@
/obj/structure/closet/secure_closet/psychiatric/fill()
..()
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/reagent_containers/food/drinks/teapot(src)
new /obj/item/reagent_containers/glass/teapot(src)
new /obj/item/toy/plushie/therapy(src)
new /obj/item/toy/plushie/slime(src)
new /obj/item/toy/plushie/bee(src)