From 059e1ad46b27eec3ba6c9090326a5ccb0e5a7ea5 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 10 Jul 2017 18:14:11 -0500 Subject: [PATCH] Replaces clockwork component initials with icons (#1971) --- .../clock_helpers/component_helpers.dm | 4 +++ .../clock_cult/clock_items/clockwork_slab.dm | 30 +++++++++--------- icons/obj/tgui_components.dmi | Bin 0 -> 986 bytes 3 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 icons/obj/tgui_components.dmi diff --git a/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm index ec35ae4c5b..bef9199496 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm @@ -62,6 +62,10 @@ else return null +//returns a component icon from a component id +/proc/get_component_icon(id) + return "" + //returns a component id from a component name /proc/get_component_id(name) switch(name) diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm index 3cbfbb40a5..a462179278 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm @@ -335,7 +335,7 @@ pointers for serving the master well. You should recommended that you check this area for help if you get stuck or need guidance on what to do next.

\ \ Disclaimer: Many objects, terms, and phrases, such as Servant, Cache, and Slab, are capitalized like proper nouns. This is a quirk of the Ratvarian language; \ - do not let it confuse you! You are free to use the names in pronoun form when speaking in normal languages.") + do not let it confuse you! You are free to use the names in pronoun form when speaking in normal languages.
") return textlist.Join() //Gets text for a certain section. "Default" is used for when you first open Recollection. @@ -394,11 +394,11 @@ dat += "Cache: A Tinkerer's Cache, which is a structure that stores and creates components.
" dat += "CV: Construction Value. All clockwork structures, floors, and walls increase this number.
" dat += "Geis: An important scripture used to make normal crew and robots into Servants of Ratvar.
" - dat += "BE: Belligerent Eye, a component type used in offensive scriptures.
" - dat += "VG: Vanguard Cogwheel, a component type used in defensive scriptures.
" - dat += "GC: Geis Capacitor, a component type used in mind-related scriptures.
" - dat += "RA: Replicant Alloy, a component type used in construction scriptures.
" - dat += "HA: Hierophant Ansible, a component type used in energy scriptures.
" + dat += "BE [get_component_icon(BELLIGERENT_EYE)]: Belligerent Eye, a component type used in offensive scriptures.
" + dat += "VG [get_component_icon(VANGUARD_COGWHEEL)]: Vanguard Cogwheel, a component type used in defensive scriptures.
" + dat += "GC [get_component_icon(GEIS_CAPACITOR)]: Geis Capacitor, a component type used in mind-related scriptures.
" + dat += "RA [get_component_icon(REPLICANT_ALLOY)]: Replicant Alloy, a component type used in construction scriptures.
" + dat += "HA [get_component_icon(HIEROPHANT_ANSIBLE)]: Hierophant Ansible, a component type used in energy scriptures.
" dat += "Ark: The cult's win condition, a huge structure that needs to be defended.

" dat += "Items
" dat += "Slab: A clockwork slab, a Servant's most important tool. You're holding one! Keep it safe and hidden.
" @@ -454,11 +454,11 @@ production_text = production_text.Join() dat += "Components & Their Uses

" dat += "Components are your primary resource as a Servant. There are five types of component, with each one being used in different roles:

" - dat += "Belligerent Eyes are aggressive and judgemental, and are used in offensive scripture;
" - dat += "Vanguard Cogwheels are defensive and repairing, and are used in defensive scripture;
" - dat += "Geis Capacitors are for conversion and control, and are used in mind-related scripture;
" //References the old name - dat += "Replicant Alloy is a strong, malleable metal and is used for construction and creation;
" - dat += "Hierophant Ansibles are for transmission and power, and are used in power and teleportation scripture

" + dat += "Belligerent Eyes [get_component_icon(BELLIGERENT_EYE)] are aggressive and judgemental, and are used in offensive scripture;
" + dat += "Vanguard Cogwheels [get_component_icon(VANGUARD_COGWHEEL)] are defensive and repairing, and are used in defensive scripture;
" + dat += "Geis Capacitors [get_component_icon(GEIS_CAPACITOR)] are for conversion and control, and are used in mind-related scripture;
" //References the old name + dat += "Replicant Alloy [get_component_icon(REPLICANT_ALLOY)] is a strong, malleable metal and is used for construction and creation;
" + dat += "Hierophant Ansibles [get_component_icon(HIEROPHANT_ANSIBLE)] are for transmission and power, and are used in power and teleportation scripture

" dat += "Although this is a good rule of thumb, their effects become much more nuanced when used together. For instance, a turret might have both belligerent eyes and \ vanguard cogwheels as construction requirements, because it defends its allies by harming its enemies.

" dat += "Components' primary use is fueling scripture (covered in its own section), and they can be created through various ways. This clockwork slab, for instance, \ @@ -569,14 +569,14 @@ data["components"] = stored_components.Copy() var/list/temp_data = list("") for(var/i in data["components"]) //display the slab's components - temp_data += "[get_component_acronym(i)] [data["components"][i]]" + temp_data += "[get_component_icon(i)] [data["components"][i]]" if(i != HIEROPHANT_ANSIBLE) temp_data += " " else temp_data += " (" if(GLOB.clockwork_caches) //if we have caches, display what's in the global cache for(var/i in GLOB.clockwork_component_cache) - temp_data += "[get_component_acronym(i)] [data["components"][i] + GLOB.clockwork_component_cache[i]]" + temp_data += "[get_component_icon(i)] [data["components"][i] + GLOB.clockwork_component_cache[i]]" if(i != HIEROPHANT_ANSIBLE) temp_data += " " else @@ -608,7 +608,7 @@ data["target_comp"] = "NONE" if(target_component_id) //if we have a component to make, display that, too - data["target_comp"] = "[get_component_acronym(target_component_id)]" + data["target_comp"] = "[get_component_icon(target_component_id)]" generate_all_scripture() @@ -637,7 +637,7 @@ var/list/really_temp_data = list(": ") for(var/i in temp_info["required"]) if(temp_info["required"][i]) - really_temp_data += "[get_component_acronym(i)] [temp_info["required"][i]] " + really_temp_data += "[get_component_icon(i)] [temp_info["required"][i]] " really_temp_data = really_temp_data.Join() temp_info["required"] = really_temp_data else //and if we don't, we won't. diff --git a/icons/obj/tgui_components.dmi b/icons/obj/tgui_components.dmi new file mode 100644 index 0000000000000000000000000000000000000000..eb29ac3fa642302dc73deb74a515f450309da5b9 GIT binary patch literal 986 zcmV<0110>4P)H~+K%|KtF@h&G{33i$v4_jXV=-0C=2*kiiOrFc3t~$yWrumsWc1r6|Qi{RLU$ zHd#m$*`$hp-=NT2@ixP}ft@YYy?L~qs-LZ#ks}4KZt8kEOR>@`fFDFr^n87D^? z@;TsKSPywi$YHWu!ABb0-wmZ|x_W!k7hmIBBMey((EtDfJV``BR7i=fl#6nkFc3vC ziR4tW>?VzDM!e*pG)>?C|8-rhfYAdYI>|D#%)sp7?$s_uF~)9AVU#zw>BHq%L6qfo z2BAek$u`8^%btiki?|D9Kyg_jqrCa#J!jE<9WhnkmXQ=5-6zC>P)ZIFVl0fiS#AUv zlpex9RuOEe4~q~YM7Z-r8$vI}4x&E53voP&&_*v;fXNLIb&Y-L=Zu#AlpWZ?`r0Vh$+P(iB8Hc5F9XPU?Y`$k=-#@}Lk1PjjAv6kf?!(KHOp+Jsq=GkcL-{8fY3Q&aou-2-v{V44dz)mxCnd1b6t$|wG zh&3WaR4^CWp}Hc%F?39T$tv2M3WWwBqKDal>;DnjdSS~^PDH@5&LYswX*ps7EZ3j> zf@y3+kHZ}ip!{zh0iV|KqWkgoR5?Zv>HDWVA{X!acWy-d1J-&w