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

Chemistry Sprite Tweaks (#13041)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2022-02-04 19:21:49 +08:00
committed by GitHub
parent f61bf53b82
commit ba6e7b6014
6 changed files with 55 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/trays/tray_reagents.dm
-23
View File
@@ -128,29 +128,6 @@
/obj/item/reagent_containers/glass/fertilizer/update_icon()
cut_overlays()
if(reagents.total_volume)
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "plastic_jug10")
var/percent = round((reagents.total_volume / volume) * 100)
switch(percent)
if(1 to 10)
filling.icon_state = "plastic_jug-10"
if(11 to 29)
filling.icon_state = "plastic_jug25"
if(30 to 45)
filling.icon_state = "plastic_jug40"
if(46 to 61)
filling.icon_state = "plastic_jug55"
if(62 to 77)
filling.icon_state = "plastic_jug70"
if(78 to 92)
filling.icon_state = "plastic_jug85"
if(99 to INFINITY)
filling.icon_state = "plastic_jug100"
filling.color = reagents.get_color()
add_overlay(filling)
if(!is_open_container())
add_overlay("lid_jug")
code/modules/reagents/reagent_containers/dropper.dm
+6 -5
View File
@@ -6,7 +6,7 @@
slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
)
icon_state = "dropper0"
icon_state = "dropper"
item_state = "dropper"
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(1,2,3,4,5)
@@ -91,10 +91,11 @@
update_icon()
/obj/item/reagent_containers/dropper/update_icon()
if(reagents.total_volume)
icon_state = "dropper1"
else
icon_state = "dropper0"
cut_overlays()
if(reagents)
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]")
filling.color = reagents.get_color()
add_overlay(filling)
/obj/item/reagent_containers/dropper/AltClick(mob/user)
var/N = input("Amount per transfer from this:", "[src]") as null|anything in possible_transfer_amounts
code/modules/reagents/reagent_containers/pill.dm
+8 -8
View File
@@ -136,31 +136,31 @@
/obj/item/reagent_containers/pill/corophenidate
name = "2u Corophenidate Pill"
desc = "Improves the ability to concentrate."
icon_state = "pill8"
icon_state = "pill22"
reagents_to_add = list(/decl/reagent/mental/corophenidate = 2)
/obj/item/reagent_containers/pill/emoxanyl
name = "2u Emoxanyl Pill"
desc = "Used to treat anxiety disorders, depression and epilepsy."
icon_state = "pill8"
icon_state = "pill22"
reagents_to_add = list(/decl/reagent/mental/emoxanyl = 2)
/obj/item/reagent_containers/pill/minaphobin
name = "2u Minaphobin Pill"
desc = "Used to treat anxiety disorders and depression."
icon_state = "pill8"
icon_state = "pill22"
reagents_to_add = list(/decl/reagent/mental/minaphobin = 2)
/obj/item/reagent_containers/pill/nerospectan
name = "2u Nerospectan Pill"
desc = "Used to treat a large variety of disorders including tourettes, depression, anxiety and psychosis."
icon_state = "pill8"
icon_state = "pill22"
reagents_to_add = list(/decl/reagent/mental/nerospectan = 2)
/obj/item/reagent_containers/pill/neurapan
name = "2u Neurapan Pill"
desc = "Used to treat a large variety of disorders including tourettes, depression, anxiety and psychosis."
icon_state = "pill8"
icon_state = "pill22"
reagents_to_add = list(/decl/reagent/mental/neurapan = 2)
/obj/item/reagent_containers/pill/neurostabin
@@ -172,13 +172,13 @@
/obj/item/reagent_containers/pill/orastabin
name = "2u Orastabin Pill"
desc = "Used to treat anxiety disorders and speech impediments."
icon_state = "pill8"
icon_state = "pill22"
reagents_to_add = list(/decl/reagent/mental/orastabin = 2)
/obj/item/reagent_containers/pill/parvosil
name = "2u Parvosil Pill"
desc = "Used to treat anxiety disorders such as phobias and social anxiety."
icon_state = "pill8"
icon_state = "pill22"
reagents_to_add = list(/decl/reagent/mental/parvosil = 2)
/obj/item/reagent_containers/pill/inaprovaline
@@ -226,7 +226,7 @@
/obj/item/reagent_containers/pill/happy
name = "Happy Pill"
desc = "Happy happy joy joy!"
icon_state = "pill18"
icon_state = "pill_happy"
reagents_to_add = list(/decl/reagent/space_drugs = 15, /decl/reagent/sugar = 15)
/obj/item/reagent_containers/pill/zoom