cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Typo fix (#17835)

Browse Source 
* Update swarmer.dm

* Update scripture_scripts.dm

* Update golems.dm

* Update pen.dm

* Update touch_attacks.dm

* Update uplink_items.dm

* Update explosive_fist.dm

* Update garden_warfare.dm

* Update stealth.dm

* Update uplink_item.dm

* Update code/modules/mob/living/carbon/human/species_types/golems.dm

Co-authored-by: ynot01 <ynot000001@gmail.com>

* Update scripture_scripts.dm

---------

Co-authored-by: ynot01 <ynot000001@gmail.com>
This commit is contained in:
Redd
2023-02-10 18:22:32 -05:00
committed by GitHub
parent d0e1c6f1f9
commit 053f8bf856
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/_onclick/hud/swarmer.dm
View File

@@ -21,7 +21,7 @@
/atom/movable/screen/swarmer/barricade
icon_state = "ui_barricade"
name = "Create Barricade (Costs 4 Resources)"
desc = "Creates a destructible barricade that will stop any non-swarmer from passing it. Also allows disabler beams to pass through."
desc = "Creates a destructible barricade that will stop any non-swarmer from passing it while allowing disabler beams to pass through."
/atom/movable/screen/swarmer/barricade/Click()
if(isswarmer(usr))
@@ -31,7 +31,7 @@
/atom/movable/screen/swarmer/replicate
icon_state = "ui_replicate"
name = "Replicate (Costs 20 Resources)"
desc = "Creates an autonomous melee drone that will follow you and attack all non-swamers entities in sight. They can be ordered to move to a target location by a middle-click."
desc = "Creates an autonomous melee drone that will follow you and attack all non-swarmers entities in sight. They can be ordered to move to a target location by a middle-click."
/atom/movable/screen/swarmer/replicate/Click()
if(isswarmer(usr))
@@ -100,4 +100,4 @@
using = new /atom/movable/screen/swarmer/contact_swarmers()
using.screen_loc = ui_inventory
using.hud = src
static_inventory += using
static_inventory += using

2
code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm
View File

@@ -222,7 +222,7 @@
//Call brass bow: Creates or calls a brass bow, which is capable of firing redlight arrows.
/datum/action/innate/call_weapon/brass_bow
name = "Call Brass Bow"
desc = "Calls a brass bowcapable of firing redlight arrows, doing moderate damage but recharges after use. The bow will recharge after 1.5 seconds.."
desc = "Calls a rechargable brass bow capable of firing redlight arrows that do moderate damage. The bow will recharge after 1.5 seconds."
weapon_type = /obj/item/gun/ballistic/bow/energy/clockwork

8
code/modules/mob/living/carbon/human/species_types/golems.dm
View File

@@ -1493,7 +1493,7 @@
inherent_traits = list(TRAIT_NOHARDCRIT,TRAIT_NOSOFTCRIT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOHUNGER,TRAIT_NOGUNS)
changesource_flags = MIRROR_BADMIN
random_eligible = FALSE // Hell no
info_text = "As a <span class='danger'>Supermatter Golem</span>, you dust almost any physical objects that interact with you. However, you take half more brute damage, three more burn damage and explode on death."
info_text = "As a <span class='danger'>Supermatter Golem</span>, you dust almost any physical object that interacts with you, while taking half as much brute damage and three times more burn damage. You also explode on death."
attack_verb = "dusting punch"
attack_sound = 'sound/effects/supermatter.ogg'
fixed_mut_color = "ff0"
@@ -1507,18 +1507,18 @@
..()
H.adjustFireLoss(2)
playsound(get_turf(H), 'sound/effects/supermatter.ogg', 10, TRUE)
H.visible_message(span_danger("[AM] knocks into [H], and then turns into dust in a flash of light!"))
H.visible_message(span_danger("[AM] knocks into [H], and then turns into dust with a flash of light!"))
qdel(AM)
/datum/species/golem/supermatter/spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style)
..()
M.visible_message(span_danger("[M] tries to punch [H], but turns into dust in a brilliant flash of light!"))
M.visible_message(span_danger("[M] tries to punch [H], but turns into dust with a brilliant flash of light!"))
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 10, TRUE)
M.dust()
/datum/species/golem/supermatter/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H)
..()
H.visible_message(span_danger("[user] tries to attack [H] with [I], but in a brilliant flash of light [I] turns into dust!"))
H.visible_message(span_danger("[user] tries to attack [H] with [I], but [I] turns into dust with a brilliant flash of light!"))
playsound(get_turf(H), 'sound/effects/supermatter.ogg', 10, TRUE)
qdel(I)

2
code/modules/paperwork/pen.dm
View File

@@ -163,7 +163,7 @@
if(!reagents.total_volume || !M.reagents)
return
to_chat(user, span_warning("You begin to injecting [src]'s contents into [M]"))
to_chat(user, span_warning("You begin to inject [src]'s contents into [M]"))
if(!do_after(user, 0.5 SECONDS, M))
return
reagents.reaction(M, INJECT, reagents.total_volume)

2
code/modules/spells/spell_types/touch_attacks.dm
View File

@@ -92,7 +92,7 @@
/obj/effect/proc_holder/spell/targeted/touch/pacify
name = "Pacify"
desc = "This spell charges your hand with pure pacifism, alows to pacify your targets and turn them into gondolas. Also temporary mutes them."
desc = "This spell charges your hand with pure pacifism, allowing you to temporarily mute and pacify your targets, as well as turn them into gondolas."
hand_path = /obj/item/melee/touch_attack/pacifism
school = "evocation"

4
code/modules/uplink/uplink_items.dm
View File

@@ -1753,8 +1753,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/device_tools/roburger_recipe
name = "Roburger crafting recipe"
desc = "This book contains legendary knowledge about how to make roburgers. \
Roburgers turn people into cyborgs after a short while when eaten. \
This book doesn't dissaper after use, so consider hiding it somewhere."
Roburgers turn people into cyborgs when eaten after a short while. \
This book doesn't disappear after use, so consider hiding it somewhere."
item = /obj/item/book/granter/crafting_recipe/roburgers
cost = 14
include_objectives = list(/datum/objective/hijack, /datum/objective/martyr, /datum/objective/nuclear) //yogs: give sole_survivors the roburger

4
yogstation/code/datums/martial/explosive_fist.dm
View File

@@ -360,9 +360,9 @@
to_chat(usr, span_notice("<b>Harm Intent</b> Will deal 10 burn and 10 brute damage to people who you hit."))
to_chat(usr, "[span_notice("Explosive disarm")]: Disarm Disarm. Finishing this combo will deal 10 damage to you and 18 to your target, aswell as throwing your target away and knocking down for three seconds.")
to_chat(usr, "[span_notice("Explosive disarm")]: Disarm Disarm. Finishing this combo will deal 10 damage to you and 18 to your target, as well as throwing your target away and knocking down for three seconds.")
to_chat(usr, "[span_notice("Detonate")]: Harm Harm Disarm Harm. Second strike will deal 12/12 brute/burn and apply 2 fire stacks to the target. Third strike will apply 4 fire stacks and deal some stamina damage if the target has less then 50 stamina damage. The final strike will ignite the target, make a light explosion and deal 15 damage to you.")
to_chat(usr, "[span_notice("Life force trade")]: Disarm Grab Disarm Grab. Second strike will deal 20 damage to the target and 5 damage to you. Third strike will deall 20 stamina and 5 burn damage to the target, and will make it unable to use ranged weapons for 2 second as well as a more long shove slowdown. Finishing the combo with a headwear on will just deal 25/25 brute/burn damage to the target, and if you don't wear a helmet, you will instantly grab the target by a neck, aswell as start to drain life from them.")
to_chat(usr, "[span_notice("Life force trade")]: Disarm Grab Disarm Grab. Second strike will deal 20 damage to the target and 5 damage to you. Third strike will deal 20 stamina and 5 burn damage to the target, and will make it unable to use ranged weapons for 2 second as well as a more long shove slowdown. Finishing the combo with a headwear on will just deal 25/25 brute/burn damage to the target, and if you don't wear a helmet, you will instantly grab the target by a neck, as well as start to drain life from them.")
to_chat(usr, "[span_notice("Immolate")]: Disarm Harm Disarm Grab. Second strike will deal 25 burn damage to the target and 5 burn damage to you. Third strike will apply 5 fire stacks to EVERYONE in the range of 2 tiles. Finishing the combo will, if you don't wear any headwear, will deal 30 burn damage to anyone except you in the range of 2 tiles, or ignite them if they are close enough to you. You target will get additional 10 burn damage and get blurry vision.")
/datum/martial_art/explosive_fist/teach(mob/living/carbon/human/H, make_temporary=0)

8
yogstation/code/datums/martial/garden_warfare.dm
View File

@@ -77,7 +77,7 @@
return TRUE
/datum/martial_art/gardern_warfare/proc/vine_mark(mob/living/carbon/human/A, mob/living/carbon/human/D)
to_chat(A, span_notice("You mark [D] with a vine mark. Using vine snatch now will pull an item from their active hands to you, or knokdown them and pull them to you."))
to_chat(A, span_notice("You mark [D] with a vine mark. Using vine snatch now will pull an item from their active hands to you, or knockdown them and pull them to you."))
to_chat(D, span_danger("[A] marks you!"))
vine_snatch.marked_dude = D
vine_snatch.last_time_marked = world.time
@@ -167,7 +167,7 @@
return TRUE
/datum/action/vine_snatch
name = "Vine Snatch - using it while having a target, recently marked with a vine mark in the range of 2 tiles will pull an item in their active hands to you, or pull and knockdown them.."
name = "Vine Snatch - using it while having a target, recently marked with a vine mark in the range of 2 tiles will pull an item in their active hands to you, or pull and knockdown them."
icon_icon = 'icons/obj/changeling.dmi'
button_icon_state = "tentacle"
var/mob/living/carbon/human/marked_dude = null
@@ -202,7 +202,7 @@
else
marked_dude.throw_at(get_step_towards(owner, marked_dude), 7, 2)
marked_dude.visible_message(span_warning("[owner] grabs [marked_dude] with a vine, knocking them down and pulling them closer!"), \
span_userdanger("[owner] grabs you with a vine, pulling you to themselfs!"))
span_userdanger("[owner] grabs you with a vine, pulling you closer!"))
marked_dude.Knockdown(3 SECONDS)
marked_dude = null
@@ -249,7 +249,7 @@
to_chat(usr, "<b><i>You try to remember some basic actions from the garden warfare art.</i></b>")
to_chat(usr, "[span_notice("Vine snatch")]: Disarm Disarm. Finishing this combo will mark the victim with a vine mark, allowing you to drag them or an item in their active hand by using ["Vine Snatch"] ability. The mark lasts only 5 seconds.")
to_chat(usr, "[span_notice("Strangle")]: Grab Grab Grab. The second grab will deal 10 oxyloss damage to the target, and finishing the combo will upgrade your grab, making it mute the target and deal 10 oxyloss damage per second.")
to_chat(usr, "[span_notice("Strangle")]: Grab Grab Grab. The second grab will deal 10 oxygen damage to the target, and finishing the combo will upgrade your grab, making it mute the target and deal 10 oxygen damage per second.")
to_chat(usr, "[span_notice("Splinter stab")]: Harm harm Harm. The second attack will deal increased damage with 30 armor penetration, and finishing the combo will deal 20 damage with 30 armor penetration, while also embedding a splinter into the targets limb.")
to_chat(usr, span_notice("Additionally, if you have throw mode on you have a 75% block chance (35% if strangling someone) and can counter-attack, dealing 10 damage and embedding a splinter into the attacker."))

8
yogstation/code/datums/martial/stealth.dm
View File

@@ -87,7 +87,7 @@
var/obj/item/gun/ballistic/automatic/pistol/martial/gun = new /obj/item/gun/ballistic/automatic/pistol/martial (A) ///I don't check does the user have an item in a hand, because it is a martial art action, and to use it... you need to have a empty hand
gun.gun_owner = A
A.put_in_hands(gun)
to_chat(A, span_notice("You extract a hiden gun from your hand."))
to_chat(A, span_notice("You extract a hidden gun from your hand."))
D.Paralyze((A.get_punchdamagehigh() / 10) SECONDS) //1 second
streak = ""
@@ -137,12 +137,12 @@
set category = "Combat Modules"
to_chat(usr, "<b><i>You try to remember some basic actions from your upgraded combat modules.</i></b>")
to_chat(usr, "[span_notice("Hidden Blade")]: Harm Harm Grab. The second strike will deal 20 stamina and 5 brute damage, and finishing the combo will make you stab the victim with a hiden blade, dealing 30 brute damage.")
to_chat(usr, "[span_notice("Hidden Blade")]: Harm Harm Grab. The second strike will deal 20 stamina and 5 brute damage, and finishing the combo will make you stab the victim with a hidden blade, dealing 30 brute damage.")
to_chat(usr, "[span_notice("Injection")]: Disarm Harm Disarm. The second and third attack will stealthy inject respectively 5 units of cyanide and 8 unites of sodium thiopental.")
to_chat(usr, "[span_notice("Finger gun")]: Harm Disarm Disarm. Finishing the combo will paralyze your target and place a stealthy version of a stechkin in your hand.")
to_chat(usr, "[span_notice("Finger gun")]: Harm Disarm Disarm. Finishing the combo will paralyse your target and place a stealthy version of a stechkin in your hand.")
#undef PRE_DAGGER_COMBO
#undef DAGGER_COMBO
#undef PRE_INJECTION_COMBO
#undef INJECTION_COMBO
#undef FINGERGUN_COMBO
#undef FINGERGUN_COMBO

2
yogstation/code/modules/uplink/uplink_item.dm
View File

@@ -175,7 +175,7 @@
/datum/uplink_item/stealthy_weapons/camera_flash
name = "Camera Flash"
desc = "A camera with an upgraded flashbulb. Can be used much like a handheld flash except with a longer cooldown between uses, allowing the bulb to cool down; avoid burning out altogether."
desc = "A camera with an upgraded flashbulb. Can be used much like a handheld flash except with a longer cooldown between uses, allowing the bulb to cool down — avoiding burning out altogether."
item = /obj/item/camera/tator
cost = 4
surplus = 15