cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 22:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inhands : the final fuckening (#8696)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2020-04-24 17:36:00 +08:00
committed by GitHub
parent 46b173aed4
commit 723c711022
104 changed files with 245 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/reagent_containers/food.dm
View File

@@ -3,6 +3,10 @@
////////////////////////////////////////////////////////////////////////////////
/obj/item/reagent_containers/food
drop_sound = 'sound/items/drop/food.ogg'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_food.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_food.dmi'
)
flags = OPENCONTAINER
possible_transfer_amounts = null
volume = 50 //Sets the default container amount for all food items.

6
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -3805,6 +3805,10 @@
icon = 'icons/obj/food.dmi'
icon_state = "pizzabox1"
drop_sound = 'sound/items/drop/box.ogg'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_food.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_food.dmi'
)
center_of_mass = list("x" = 16,"y" = 6)
var/open = 0 // Is the box open?
@@ -5535,4 +5539,4 @@
reagents.add_reagent("sugar", 3)
#undef NUTRIMENT_GOOD
#undef NUTRIMENT_BAD
#undef NUTRIMENT_BAD

4
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -93,6 +93,10 @@
name = "beaker"
desc = "A beaker."
icon = 'icons/obj/chemical.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/stacks/lefthand_medical.dmi',
slot_r_hand_str = 'icons/mob/items/stacks/righthand_medical.dmi',
)
icon_state = "beaker"
item_state = "beaker"
center_of_mass = list("x" = 15,"y" = 11)

14
code/modules/reagents/reagent_containers/glass/bottle.dm
View File

@@ -5,8 +5,12 @@
name = "bottle"
desc = "A small bottle."
icon = 'icons/obj/chemical.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/stacks/lefthand_medical.dmi',
slot_r_hand_str = 'icons/mob/items/stacks/righthand_medical.dmi',
)
icon_state = null
item_state = "atoxinbottle"
item_state = "bottle"
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,60)
flags = 0
@@ -66,7 +70,7 @@
desc = "A small bottle. Contains norepinephrine - used to stabilize patients."
icon_state = "bottle-4"
reagents_to_add = list("norepinephrine" = 60)
/obj/item/reagent_containers/glass/bottle/toxin
name = "toxin bottle"
desc = "A small bottle of toxins. Do not drink, it is poisonous."
@@ -127,13 +131,13 @@
if(!icon_state)
icon_state = "bottle-[rand(1,4)]"
reagents.add_reagent("blood", 20, data)
update_icon()
/obj/item/reagent_containers/glass/bottle/with_virus/flu_virion
name = "Flu virion culture bottle"
desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
disease = /datum/disease/advance/flu
disease = /datum/disease/advance/flu
/obj/item/reagent_containers/glass/bottle/with_virus/epiglottis_virion
name = "Epiglottis virion culture bottle"
@@ -268,4 +272,4 @@
name = "thetamycin bottle"
desc = "A small bottle of thetamycin. Used for disinfecting whatever wounds security caused."
icon_state = "bottle-4"
reagents_to_add = list("thetamycin" = 60)
reagents_to_add = list("thetamycin" = 60)

6
code/modules/reagents/reagent_containers/pill.dm
View File

@@ -5,6 +5,10 @@
name = "pill"
desc = "a pill."
icon = 'icons/obj/chemical.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/stacks/lefthand_medical.dmi',
slot_r_hand_str = 'icons/mob/items/stacks/righthand_medical.dmi',
)
icon_state = null
item_state = "pill"
possible_transfer_amounts = null
@@ -278,4 +282,4 @@
/obj/item/reagent_containers/pill/antihistamine/Initialize()
. = ..()
reagents.add_reagent("diphenhydramine", 5)
reagents.add_reagent("diphenhydramine", 5)

6
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -161,7 +161,6 @@
safety = 1
hitsound = "swing_hit"
/obj/item/reagent_containers/spray/pepper/Initialize()
. = ..()
reagents.add_reagent("condensedcapsaicin", 40)
@@ -182,8 +181,13 @@
name = "water flower"
desc = "A seemingly innocent sunflower...with a twist."
icon = 'icons/obj/toy.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_toy.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_toy.dmi',
)
icon_state = "sunflower"
item_state = "sunflower"
drop_sound = 'sound/items/drop/herb.ogg'
amount_per_transfer_from_this = 1
possible_transfer_amounts = null
volume = 10