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

Janitor, hydroponics and medical inhands (#8456)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2020-03-21 13:36:49 +01:00
committed by GitHub
parent a15f5de7f8
commit b9b42f4f8f
89 changed files with 475 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/dropper.dm
+5
View File
@@ -2,7 +2,12 @@
name = "dropper"
desc = "A dropper. Transfers 5 units."
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',
)
icon_state = "dropper0"
item_state = "dropper"
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(1,2,3,4,5)
w_class = ITEMSIZE_TINY
code/modules/reagents/reagent_containers/food/drinks.dm
+9 -9
View File
@@ -127,7 +127,7 @@
name = "robust coffee"
desc = "Careful, the beverage you're about to enjoy is extremely hot."
icon_state = "coffee_vended"
item_state = "contvapour"
item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=16, "y"=11)
@@ -139,7 +139,7 @@
name = "seasonal pumpkin spice latte"
desc = "A limited edition pumpkin spice coffee drink!"
icon_state = "psl_vended"
item_state = "contvapour"
item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=16, "y"=11)
@@ -151,7 +151,7 @@
name = "duke purple tea"
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
icon_state = "coffee_vended"
item_state = "contvapour"
item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=16, "y"=14)
@@ -163,7 +163,7 @@
name = "green tea"
desc = "Tasty green tea. It's good for you!"
icon_state = "greentea_vended"
item_state = "contvapour"
item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=16, "y"=14)
@@ -175,7 +175,7 @@
name = "hot cider"
desc = "A hearty apple drink, spiced just right."
icon_state = "soy_latte_vended"
item_state = "contvapour"
item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=16, "y"=14)
@@ -187,7 +187,7 @@
name = "chai Tea"
desc = "The name is redundant but the flavor is delicious!"
icon_state = "chai_vended"
item_state = "contvapour"
item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=16, "y"=14)
@@ -199,7 +199,7 @@
name = "ice cup"
desc = "Careful, cold ice, do not chew."
icon_state = "coffee_vended"
item_state = "contvapour"
item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=15, "y"=10)
@@ -211,7 +211,7 @@
name = "dutch hot coco"
desc = "Made in Space South America."
icon_state = "hot_coco"
item_state = "contvapour"
item_state = "coffee"
trash = /obj/item/trash/coffee
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=15, "y"=13)
@@ -223,7 +223,7 @@
name = "cup ramen"
desc = "Just add 10ml water, self heats! A taste that reminds you of your school years."
icon_state = "ramen"
item_state = "contvapour"
item_state = "coffee"
trash = /obj/item/trash/ramen
drop_sound = 'sound/items/drop/papercup.ogg'
center_of_mass = list("x"=16, "y"=11)
code/modules/reagents/reagent_containers/glass.dm
+4
View File
@@ -221,6 +221,10 @@
desc = "A blue plastic bucket."
name = "bucket"
icon = 'icons/obj/janitor.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
)
icon_state = "bucket"
item_state = "bucket"
center_of_mass = list("x" = 16,"y" = 10)
code/modules/reagents/reagent_containers/hypospray.dm
+8 -1
View File
@@ -8,6 +8,10 @@
description_fluff = "The Zeng-Hu Pharmaceuticals' Hypospray - 9 out of 10 doctors recommend it!"
description_info = "Unlike a syringe, reagents have to be poured into the hypospray before it can be used."
icon = 'icons/obj/syringe.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
)
item_state = "hypo"
icon_state = "hypo"
amount_per_transfer_from_this = 5
@@ -95,8 +99,8 @@
name = "autoinjector"
desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel."
icon_state = "autoinjector1"
item_state = "autoinjector1"
var/empty_state = "autoinjector0"
item_state = "autoinjector"
flags = OPENCONTAINER
amount_per_transfer_from_this = 5
volume = 5
@@ -105,6 +109,7 @@
/obj/item/reagent_containers/hypospray/autoinjector/Initialize()
. =..()
icon_state = empty_state
item_state = empty_state
update_icon()
/obj/item/reagent_containers/hypospray/autoinjector/attack(var/mob/M, var/mob/user, target_zone)
@@ -136,8 +141,10 @@
/obj/item/reagent_containers/hypospray/autoinjector/update_icon()
if(reagents.total_volume > 0 && !is_open_container())
icon_state = initial(icon_state)
item_state = initial(icon_state)
else
icon_state = empty_state
item_state = empty_state
/obj/item/reagent_containers/hypospray/autoinjector/examine(mob/user)
..(user)
code/modules/reagents/reagent_containers/spray.dm
+8
View File
@@ -2,6 +2,10 @@
name = "spray bottle"
desc = "A spray bottle, with an unscrewable top."
icon = 'icons/obj/janitor.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_janitor.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_janitor.dmi',
)
icon_state = "cleaner"
item_state = "cleaner"
center_of_mass = list("x" = 16,"y" = 10)
@@ -240,6 +244,10 @@
name = "Plant-B-Gone"
desc = "Kills those pesky weeds!"
icon = 'icons/obj/hydroponics_machines.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_hydro.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_hydro.dmi',
)
icon_state = "plantbgone"
item_state = "plantbgone"
volume = 100
code/modules/reagents/reagent_containers/syringes.dm
+4
View File
@@ -10,6 +10,10 @@
name = "syringe"
desc = "A syringe."
icon = 'icons/obj/syringe.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
)
item_state = "syringe_0"
icon_state = "0"
center_of_mass = list("x" = 16,"y" = 14)