From 99fa431a7679b38a9d85acd10d8bc104447000ed Mon Sep 17 00:00:00 2001 From: Segrain Date: Tue, 27 Feb 2024 20:50:57 +0400 Subject: [PATCH] Names for nodes and traps. (#5831) # About the pull request Selfevident. # Explain why it's good for the game In all honesty, this is a personal gripe. I have poor eyesight and a laptop with small screen, so this annoys me more than it should. Xeno traps, by design, look almost like regular weeded tiles, save for small part of the actual trap in the middle of the weed square. If properly hidden underneath big enough pile of items, the only way to tell without rightclicking is to mouseover it and read the name in the bottom left corner (which is not all that large). With the current sprite for the weed node being a square of weeds with a small node in the middle of it, nodes behave exactly the same. That is not a problem per se: the challenge of telling a trap from a node is no different from the challenge of telling a trap from regular weeds. The problem lies in the fact that their supposedly telltale _names_ are the same save for two letters, and h/n and l/d do not even look all that much different at a glance. To make things worse, these two things require exactly opposite approach. Nodes are completely immune to bullets, and the correct course of action is to come close and take them out with a bayonet. Traps will stun you with acid if you come close with a bayonet, and the correct course of action is to take them out from a distance with a single bullet. Confusing one for another can be irritating at best and fatal for your character at worst. May this little change make life less painful for all the scout players that ever tried to stab an acid trap. # Changelog :cl: spellcheck: Changed names of "resin node" and "resin hole" to "weed node" and "resin trap" respectfully. /:cl: --- code/modules/cm_aliens/structures/trap.dm | 34 +++++++++--------- code/modules/cm_aliens/weeds.dm | 4 +-- .../lesser_drone/lesser_drone_powers.dm | 2 +- .../carbon/xenomorph/resin_constructions.dm | 6 ++-- .../castes/hivelord/resin_whisperer.dm | 2 +- icons/mob/hud/actions_xeno.dmi | Bin 54898 -> 54898 bytes 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/code/modules/cm_aliens/structures/trap.dm b/code/modules/cm_aliens/structures/trap.dm index e4b021e98f46..9cd95f22b158 100644 --- a/code/modules/cm_aliens/structures/trap.dm +++ b/code/modules/cm_aliens/structures/trap.dm @@ -4,7 +4,7 @@ /obj/effect/alien/resin/trap desc = "It looks like a hiding hole." - name = "resin hole" + name = "resin trap" icon_state = "trap0" density = FALSE opacity = FALSE @@ -12,7 +12,7 @@ health = 5 layer = RESIN_STRUCTURE_LAYER var/list/tripwires = list() - var/hivenumber = XENO_HIVE_NORMAL //Hivenumber of the xeno that planted it OR the last Facehugger that was placed (essentially taking over the hole) + var/hivenumber = XENO_HIVE_NORMAL //Hivenumber of the xeno that planted it OR the last Facehugger that was placed (essentially taking over the trap) var/trap_type = RESIN_TRAP_EMPTY var/armed = 0 var/created_by // ckey @@ -247,7 +247,7 @@ to_chat(B, SPAN_XENOWARNING("You must produce more plasma before doing this.")) return XENO_NO_DELAY_ACTION - to_chat(X, SPAN_XENONOTICE("You begin charging the resin hole with acid gas.")) + to_chat(X, SPAN_XENONOTICE("You begin charging the resin trap with acid gas.")) xeno_attack_delay(X) if(!do_after(B, 30, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, src)) return XENO_NO_DELAY_ACTION @@ -268,8 +268,8 @@ playsound(loc, 'sound/effects/refill.ogg', 25, 1) set_state(RESIN_TRAP_GAS) cause_data = create_cause_data("resin gas trap", B) - B.visible_message(SPAN_XENOWARNING("\The [B] pressurises the resin hole with acid gas!"), \ - SPAN_XENOWARNING("You pressurise the resin hole with acid gas!"), null, 5) + B.visible_message(SPAN_XENOWARNING("\The [B] pressurises the resin trap with acid gas!"), \ + SPAN_XENOWARNING("You pressurise the resin trap with acid gas!"), null, 5) else //Non-boiler acid types var/acid_cost = 70 @@ -282,7 +282,7 @@ to_chat(X, SPAN_XENOWARNING("You must produce more plasma before doing this.")) return XENO_NO_DELAY_ACTION - to_chat(X, SPAN_XENONOTICE("You begin charging the resin hole with acid.")) + to_chat(X, SPAN_XENONOTICE("You begin charging the resin trap with acid.")) xeno_attack_delay(X) if(!do_after(X, 3 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, src)) return XENO_NO_DELAY_ACTION @@ -300,8 +300,8 @@ else set_state(RESIN_TRAP_ACID1 + X.acid_level - 1) - X.visible_message(SPAN_XENOWARNING("\The [X] pressurises the resin hole with acid!"), \ - SPAN_XENOWARNING("You pressurise the resin hole with acid!"), null, 5) + X.visible_message(SPAN_XENOWARNING("\The [X] pressurises the resin trap with acid!"), \ + SPAN_XENOWARNING("You pressurise the resin trap with acid!"), null, 5) return XENO_NO_DELAY_ACTION @@ -310,15 +310,15 @@ for(var/turf/T in orange(1,loc)) if(T.density) continue - var/obj/effect/hole_tripwire/HT = new /obj/effect/hole_tripwire(T) - HT.linked_trap = src - tripwires += HT + var/obj/effect/trap_tripwire/new_tripwire = new /obj/effect/trap_tripwire(T) + new_tripwire.linked_trap = src + tripwires += new_tripwire /obj/effect/alien/resin/trap/attackby(obj/item/W, mob/user) if(!(istype(W, /obj/item/clothing/mask/facehugger) && isxeno(user))) return ..() if(trap_type != RESIN_TRAP_EMPTY) - to_chat(user, SPAN_XENOWARNING("You can't put a hugger in this hole!")) + to_chat(user, SPAN_XENOWARNING("You can't put a hugger in this trap!")) return var/obj/item/clothing/mask/facehugger/FH = W if(FH.stat == DEAD) @@ -329,7 +329,7 @@ return if (X.hivenumber != hivenumber) - to_chat(user, SPAN_XENOWARNING("This resin hole doesn't belong to your hive!")) + to_chat(user, SPAN_XENOWARNING("This resin trap doesn't belong to your hive!")) return if (FH.hivenumber != hivenumber) @@ -353,21 +353,21 @@ QDEL_NULL_LIST(tripwires) . = ..() -/obj/effect/hole_tripwire - name = "hole tripwire" +/obj/effect/trap_tripwire + name = "trap tripwire" anchored = TRUE mouse_opacity = MOUSE_OPACITY_TRANSPARENT invisibility = 101 unacidable = TRUE //You never know var/obj/effect/alien/resin/trap/linked_trap -/obj/effect/hole_tripwire/Destroy() +/obj/effect/trap_tripwire/Destroy() if(linked_trap) linked_trap.tripwires -= src linked_trap = null . = ..() -/obj/effect/hole_tripwire/Crossed(atom/A) +/obj/effect/trap_tripwire/Crossed(atom/A) if(!linked_trap) qdel(src) return diff --git a/code/modules/cm_aliens/weeds.dm b/code/modules/cm_aliens/weeds.dm index 5298e7ab02f1..d614d87bf9b9 100644 --- a/code/modules/cm_aliens/weeds.dm +++ b/code/modules/cm_aliens/weeds.dm @@ -123,7 +123,7 @@ update_icon() /obj/effect/alien/weeds/node/weak - name = "weak resin node" + name = "weak weed node" health = WEED_HEALTH_STANDARD alpha = 127 @@ -469,7 +469,7 @@ /obj/effect/alien/weeds/node - name = "resin node" + name = "weed node" desc = "A weird, pulsating node." icon_state = "weednode" // Weed nodes start out with normal weed health and become stronger once they've stopped spreading diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lesser_drone/lesser_drone_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lesser_drone/lesser_drone_powers.dm index 3c6b39f146be..0f72bf4d81c7 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/lesser_drone/lesser_drone_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/lesser_drone/lesser_drone_powers.dm @@ -1,6 +1,6 @@ /datum/action/xeno_action/onclick/plant_weeds/lesser/use_ability(atom/A) if(!(locate(/obj/effect/alien/weeds/node) in orange(4, owner))) - to_chat(owner, SPAN_XENONOTICE("We can only plant resin nodes near other resin nodes!")) + to_chat(owner, SPAN_XENONOTICE("We can only plant weed nodes near other weed nodes!")) return . = ..() diff --git a/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm b/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm index 793ed45bcb13..9c94be96a65a 100644 --- a/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm +++ b/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm @@ -341,11 +341,11 @@ GLOBAL_VAR_INIT(resin_lz_allowed, FALSE) construction_name = "thick resin membrane" build_path = /obj/structure/alien/movable_wall/membrane/thick -// Remote Resin Nodes for originally coded for Resin Whisperers +// Remote Weed Nodes for originally coded for Resin Whisperers /datum/resin_construction/resin_obj/resin_node - name = "Resin Node" + name = "Weed Node" desc = "Channel energy to spread our influence." - construction_name = "resin node" + construction_name = "weed node" cost = (XENO_RESIN_MEMBRANE_THICK_COST * 2) // 3x the cost of a thick membrane. At the time of coding that is 95*2 = 190 build_path = /obj/effect/alien/weeds/node diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm index a6c493f3ada0..cf1cafde9267 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm @@ -1,6 +1,6 @@ /datum/xeno_strain/resin_whisperer name = HIVELORD_RESIN_WHISPERER - description = "You lose your corrosive acid, your ability to secrete thick resin, your ability to reinforce resin secretions, sacrifice your ability to plant resin nodes outside of weeds, and you sacrifice a fifth of your plasma reserves to enhance your vision and gain a stronger connection to the resin. You can now remotely place resin secretions including resin nodes up to a distance of twelve paces!" + description = "You lose your corrosive acid, your ability to secrete thick resin, your ability to reinforce resin secretions, sacrifice your ability to plant weed nodes outside of weeds, and you sacrifice a fifth of your plasma reserves to enhance your vision and gain a stronger connection to the resin. You can now remotely place resin secretions including weed nodes up to a distance of twelve paces!" flavor_description = "Let the resin guide you. It whispers, so listen closely." icon_state_prefix = "Resin Whisperer" diff --git a/icons/mob/hud/actions_xeno.dmi b/icons/mob/hud/actions_xeno.dmi index 6a48235a4f3b47df8276539a7bf6315afaa8ace2..c829821730c20066ae0397877c10579c7fbf16e2 100644 GIT binary patch delta 753 zcmV#vfAoS<$*{f-`!rJs$n94AiP&KC7~ zfsSLJjxMG_x?}?ty~vG7nA**FlRT+~Gt`6zvA9#KqIia6DU~a{7XyA4Ezu}`iXuTn zPSBM5l{29R%DZsOfBl-gz?CXzsEcLa7e#_#31m?uC`@Xh_lg8wEn@y#Oibx4io3jn z;eUAQU6fXfGs(>}V`eJ1}XcIJV+|YSd2Q&A@X88&Z3VtD78q`p z=bN33n02dBh!KA^46ahr87f+IvyaNP%~;(?weiYdf5cv1AMOGrJiB}M_Ql(ONl7-$ jUZaw)f7vITO{&!u&Z delta 753 zcmV$;vEBLQl{X`)fq0HqQOcFsW=HD;KHU z3}b)8<|CXai#5bw7NQJaMfy2DQ5Hyq{qz-;&*YoUkw}Si{qHY-<;gke}(f0s1m1a%|ocl4Mn{cIfOIC0{3w#d&5 zbR7G9bTLiRB^$WtMQ=pH)NaO`^hqt8p(Zq_#hqIf#WN&Jsa)Z`81S=biAMEP6bTw~ zf~MTBoC!5h-j!SKf7j#%u2eZgT`UW~C=vuqAd4bFVNwgfS0wOiQS;woVoGOG-1Qv{ z|3g&oqO@A1xqJ8O<%?fm{KvIKxDwb}^V$M^V?*yeOMR)s2UTKd($&mW5(*Cl6C7$j3I zOTRvLVPezzY0)Doa9+9cz=>Ob|9{8Ew2v-!pUFQeIRhitKp7%of9*eFjkWTKR{FfG zlugx3m9w+;e=>Rwu5e1&&)4p-6|FQT@{Lz=H@roB*UJ6$=N}J08->}_mvITO{NSknE