mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Merge pull request #41602 from swindly/word_crimes
Fixes more word crimes
This commit is contained in:
committed by
yogstation13-bot
parent
2187b086a7
commit
5a7079df7b
@@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
/obj/item/mushpunch
|
/obj/item/mushpunch
|
||||||
name = "odd mushroom"
|
name = "odd mushroom"
|
||||||
desc = "<I>Sapienza Ophioglossoides</I>:An odd mushroom from the flesh of a mushroom person. it has apparently retained some innate power of it's owner, as it quivers with barely-contained POWER!"
|
desc = "<I>Sapienza Ophioglossoides</I>:An odd mushroom from the flesh of a mushroom person. It has apparently retained some innate power of its owner, as it quivers with barely-contained POWER!"
|
||||||
icon = 'icons/obj/hydroponics/seeds.dmi'
|
icon = 'icons/obj/hydroponics/seeds.dmi'
|
||||||
icon_state = "mycelium-angel"
|
icon_state = "mycelium-angel"
|
||||||
|
|
||||||
|
|||||||
@@ -385,7 +385,7 @@
|
|||||||
/datum/map_template/shuttle/ferry/fancy
|
/datum/map_template/shuttle/ferry/fancy
|
||||||
suffix = "fancy"
|
suffix = "fancy"
|
||||||
name = "fancy transport ferry"
|
name = "fancy transport ferry"
|
||||||
description = "At some point, someone upgraded the ferry to have fancier flooring... and less seats."
|
description = "At some point, someone upgraded the ferry to have fancier flooring... and fewer seats."
|
||||||
|
|
||||||
/datum/map_template/shuttle/whiteship/box
|
/datum/map_template/shuttle/whiteship/box
|
||||||
suffix = "box"
|
suffix = "box"
|
||||||
|
|||||||
@@ -118,9 +118,9 @@
|
|||||||
to_chat(user, "<span class='info'>It can be upgraded with a <b>proximity sensor</b>.</span>")
|
to_chat(user, "<span class='info'>It can be upgraded with a <b>proximity sensor</b>.</span>")
|
||||||
|
|
||||||
if(!status)
|
if(!status)
|
||||||
to_chat(user, "<span class='info'>Its current deactivated.</span>")
|
to_chat(user, "<span class='info'>It's currently deactivated.</span>")
|
||||||
if(!panel_open && powered())
|
if(!panel_open && powered())
|
||||||
to_chat(user, "<span class='notice'>You'll need to open it's maintenance panel with a <b>screwdriver</b> to turn it back on.</span>")
|
to_chat(user, "<span class='notice'>You'll need to open its maintenance panel with a <b>screwdriver</b> to turn it back on.</span>")
|
||||||
if(panel_open)
|
if(panel_open)
|
||||||
to_chat(user, "<span class='info'>Its maintenance panel is currently open.</span>")
|
to_chat(user, "<span class='info'>Its maintenance panel is currently open.</span>")
|
||||||
if(!status && powered())
|
if(!status && powered())
|
||||||
|
|||||||
@@ -711,7 +711,7 @@
|
|||||||
if(!input || !user.canUseTopic(src))
|
if(!input || !user.canUseTopic(src))
|
||||||
return
|
return
|
||||||
SScommunications.make_announcement(user, is_silicon, input)
|
SScommunications.make_announcement(user, is_silicon, input)
|
||||||
deadchat_broadcast("<span class='deadsay'><span class='name'>[user.real_name]</span> made an priority announcement from <span class='name'>[get_area_name(usr, TRUE)]</span>.</span>", user)
|
deadchat_broadcast("<span class='deadsay'><span class='name'>[user.real_name]</span> made a priority announcement from <span class='name'>[get_area_name(usr, TRUE)]</span>.</span>", user)
|
||||||
|
|
||||||
/obj/machinery/computer/communications/proc/post_status(command, data1, data2)
|
/obj/machinery/computer/communications/proc/post_status(command, data1, data2)
|
||||||
|
|
||||||
|
|||||||
@@ -346,7 +346,7 @@
|
|||||||
var/can_add = max(min(REJUVENATORS_MAX - potassiodide_amount, REJUVENATORS_INJECT), 0)
|
var/can_add = max(min(REJUVENATORS_MAX - potassiodide_amount, REJUVENATORS_INJECT), 0)
|
||||||
viable_occupant.reagents.add_reagent("potass_iodide", can_add)
|
viable_occupant.reagents.add_reagent("potass_iodide", can_add)
|
||||||
if("setbufferlabel")
|
if("setbufferlabel")
|
||||||
var/text = sanitize(input(usr, "Input a new label:", "Input an Text", null) as text|null)
|
var/text = sanitize(input(usr, "Input a new label:", "Input a Text", null) as text|null)
|
||||||
if(num && text)
|
if(num && text)
|
||||||
num = CLAMP(num, 1, NUMBER_OF_BUFFERS)
|
num = CLAMP(num, 1, NUMBER_OF_BUFFERS)
|
||||||
var/list/buffer_slot = buffer[num]
|
var/list/buffer_slot = buffer[num]
|
||||||
|
|||||||
@@ -293,7 +293,7 @@
|
|||||||
|
|
||||||
/obj/item/bombcore/training
|
/obj/item/bombcore/training
|
||||||
name = "dummy payload"
|
name = "dummy payload"
|
||||||
desc = "A Nanotrasen replica of a syndicate payload. Its not intended to explode but to announce that it WOULD have exploded, then rewire itself to allow for more training."
|
desc = "A Nanotrasen replica of a syndicate payload. It's not intended to explode but to announce that it WOULD have exploded, then rewire itself to allow for more training."
|
||||||
var/defusals = 0
|
var/defusals = 0
|
||||||
var/attempts = 0
|
var/attempts = 0
|
||||||
|
|
||||||
|
|||||||
@@ -345,7 +345,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
|
|||||||
var/atom/droploc = drop_location()
|
var/atom/droploc = drop_location()
|
||||||
if(use(1))
|
if(use(1))
|
||||||
playsound(I, 'sound/items/bikehorn.ogg', 50, 1, -1)
|
playsound(I, 'sound/items/bikehorn.ogg', 50, 1, -1)
|
||||||
to_chat(user, "<span class='notice'>You stamp the cardboard! Its a clown box! Honk!</span>")
|
to_chat(user, "<span class='notice'>You stamp the cardboard! It's a clown box! Honk!</span>")
|
||||||
if (amount >= 0)
|
if (amount >= 0)
|
||||||
new/obj/item/storage/box/clown(droploc) //bugfix
|
new/obj/item/storage/box/clown(droploc) //bugfix
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -696,7 +696,7 @@
|
|||||||
if(!user.temporarilyRemoveItemFromInventory(I))
|
if(!user.temporarilyRemoveItemFromInventory(I))
|
||||||
return
|
return
|
||||||
qdel(I)
|
qdel(I)
|
||||||
to_chat(user, "<span class='notice'>You add some wheels to the [src]! You've got an honkbot assembly now! Honk!</span>")
|
to_chat(user, "<span class='notice'>You add some wheels to the [src]! You've got a honkbot assembly now! Honk!</span>")
|
||||||
var/obj/item/bot_assembly/honkbot/A = new
|
var/obj/item/bot_assembly/honkbot/A = new
|
||||||
qdel(src)
|
qdel(src)
|
||||||
user.put_in_hands(A)
|
user.put_in_hands(A)
|
||||||
|
|||||||
@@ -64,7 +64,7 @@
|
|||||||
|
|
||||||
/obj/structure/showcase/mecha/ripley
|
/obj/structure/showcase/mecha/ripley
|
||||||
name = "construction mech exhibit"
|
name = "construction mech exhibit"
|
||||||
desc = "A stand with an retired construction mech bolted to it. The clamps are rated at 9300PSI. It seems to be falling apart."
|
desc = "A stand with a retired construction mech bolted to it. The clamps are rated at 9300PSI. It seems to be falling apart."
|
||||||
icon = 'icons/mecha/mecha.dmi'
|
icon = 'icons/mecha/mecha.dmi'
|
||||||
icon_state = "firefighter"
|
icon_state = "firefighter"
|
||||||
|
|
||||||
|
|||||||
@@ -432,7 +432,7 @@
|
|||||||
target.visible_message("<span class='warning'>[L] starts to glow in a halo of light!</span>", \
|
target.visible_message("<span class='warning'>[L] starts to glow in a halo of light!</span>", \
|
||||||
"<span class='userdanger'>A feeling of warmth washes over you, rays of holy light surround your body and protect you from the flash of light!</span>")
|
"<span class='userdanger'>A feeling of warmth washes over you, rays of holy light surround your body and protect you from the flash of light!</span>")
|
||||||
else
|
else
|
||||||
to_chat(user, "<span class='cultitalic'>In an brilliant flash of red, [L] falls to the ground!</span>")
|
to_chat(user, "<span class='cultitalic'>In a brilliant flash of red, [L] falls to the ground!</span>")
|
||||||
L.Paralyze(160)
|
L.Paralyze(160)
|
||||||
L.flash_act(1,1)
|
L.flash_act(1,1)
|
||||||
if(issilicon(target))
|
if(issilicon(target))
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
/obj/item/assembly/flash/suicide_act(mob/living/user)
|
/obj/item/assembly/flash/suicide_act(mob/living/user)
|
||||||
if (crit_fail)
|
if (crit_fail)
|
||||||
user.visible_message("<span class='suicide'>[user] raises \the [src] up to [user.p_their()] eyes and activates it ... but its burnt out!</span>")
|
user.visible_message("<span class='suicide'>[user] raises \the [src] up to [user.p_their()] eyes and activates it ... but it's burnt out!</span>")
|
||||||
return SHAME
|
return SHAME
|
||||||
else if (user.eye_blind)
|
else if (user.eye_blind)
|
||||||
user.visible_message("<span class='suicide'>[user] raises \the [src] up to [user.p_their()] eyes and activates it ... but [user.p_theyre()] blind!</span>")
|
user.visible_message("<span class='suicide'>[user] raises \the [src] up to [user.p_their()] eyes and activates it ... but [user.p_theyre()] blind!</span>")
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
|
|
||||||
/obj/item/paper/fluff/awaymissions/caves/shipment_notice
|
/obj/item/paper/fluff/awaymissions/caves/shipment_notice
|
||||||
name = "shipment notice"
|
name = "shipment notice"
|
||||||
info = "<center>We were suppose to get a shipment of these special laser rifles and a couple 'nades to help combat the wildlife down here, but its been weeks since we last heard from the caravan carrying the shit down here. At this point we can only assume they fell victim to one of the monster nests or the dumbasses managed to trip into the lava. So much for that shipment, I guess.</center>"
|
info = "<center>We were supposed to get a shipment of these special laser rifles and a couple 'nades to help combat the wildlife down here, but it's been weeks since we last heard from the caravan carrying the shit down here. At this point we can only assume they fell victim to one of the monster nests or the dumbasses managed to trip into the lava. So much for that shipment, I guess.</center>"
|
||||||
|
|
||||||
/obj/item/paper/fluff/awaymissions/caves/safety_notice
|
/obj/item/paper/fluff/awaymissions/caves/safety_notice
|
||||||
name = "safety notice"
|
name = "safety notice"
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
|
|
||||||
/obj/item/paper/fluff/awaymissions/wildwest/journal/page7
|
/obj/item/paper/fluff/awaymissions/wildwest/journal/page7
|
||||||
name = "Planer Sauls' Journal: Page 7"
|
name = "Planer Sauls' Journal: Page 7"
|
||||||
info = "The Vault...it just keeps growing and growing. I went on my daily walk through the garden and now its just right outside the mansion... a few days ago it was only barely visible. But whatever is inside...its calling to me."
|
info = "The Vault...it just keeps growing and growing. I went on my daily walk through the garden and now it's just right outside the mansion... a few days ago it was only barely visible. But whatever is inside...it's calling to me."
|
||||||
|
|
||||||
/obj/item/paper/fluff/awaymissions/wildwest/journal/page8
|
/obj/item/paper/fluff/awaymissions/wildwest/journal/page8
|
||||||
name = "Planer Saul's Journal: Page 8"
|
name = "Planer Saul's Journal: Page 8"
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
/obj/item/supplypod_beacon/examine(user)
|
/obj/item/supplypod_beacon/examine(user)
|
||||||
..()
|
..()
|
||||||
if(!express_console)
|
if(!express_console)
|
||||||
to_chat(user, "<span class='notice'>[src] is not currently linked to a Express Supply console.</span>")
|
to_chat(user, "<span class='notice'>[src] is not currently linked to an Express Supply console.</span>")
|
||||||
else
|
else
|
||||||
to_chat(user, "<span class='notice'>Alt-click to unlink it from the Express Supply console.</span>")
|
to_chat(user, "<span class='notice'>Alt-click to unlink it from the Express Supply console.</span>")
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
|
lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
|
||||||
righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi'
|
righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi'
|
||||||
name = "proto-kinetic crusher"
|
name = "proto-kinetic crusher"
|
||||||
desc = "An early design of the proto-kinetic accelerator, it is little more than an combination of various mining tools cobbled together, forming a high-tech club. \
|
desc = "An early design of the proto-kinetic accelerator, it is little more than a combination of various mining tools cobbled together, forming a high-tech club. \
|
||||||
While it is an effective mining tool, it did little to aid any but the most skilled and/or suicidal miners against local fauna."
|
While it is an effective mining tool, it did little to aid any but the most skilled and/or suicidal miners against local fauna."
|
||||||
force = 20 //As much as a bone spear, but this is significantly more annoying to carry around due to requiring the use of both hands at all times
|
force = 20 //As much as a bone spear, but this is significantly more annoying to carry around due to requiring the use of both hands at all times
|
||||||
w_class = WEIGHT_CLASS_BULKY
|
w_class = WEIGHT_CLASS_BULKY
|
||||||
|
|||||||
@@ -144,7 +144,7 @@
|
|||||||
//Rod of Asclepius
|
//Rod of Asclepius
|
||||||
/obj/item/rod_of_asclepius
|
/obj/item/rod_of_asclepius
|
||||||
name = "Rod of Asclepius"
|
name = "Rod of Asclepius"
|
||||||
desc = "A wooden rod about the size of your forearm with a snake carved around it, winding it's way up the sides of the rod. Something about it seems to inspire in you the responsibilty and duty to help others."
|
desc = "A wooden rod about the size of your forearm with a snake carved around it, winding its way up the sides of the rod. Something about it seems to inspire in you the responsibilty and duty to help others."
|
||||||
icon = 'icons/obj/lavaland/artefacts.dmi'
|
icon = 'icons/obj/lavaland/artefacts.dmi'
|
||||||
icon_state = "asclepius_dormant"
|
icon_state = "asclepius_dormant"
|
||||||
var/activated = FALSE
|
var/activated = FALSE
|
||||||
@@ -154,14 +154,14 @@
|
|||||||
if(activated)
|
if(activated)
|
||||||
return
|
return
|
||||||
if(!iscarbon(user))
|
if(!iscarbon(user))
|
||||||
to_chat(user, "<span class='warning'>The snake carving seems to come alive, if only for a moment, before returning to it's dormant state, almost as if it finds you incapable of holding it's oath.</span>")
|
to_chat(user, "<span class='warning'>The snake carving seems to come alive, if only for a moment, before returning to its dormant state, almost as if it finds you incapable of holding its oath.</span>")
|
||||||
return
|
return
|
||||||
var/mob/living/carbon/itemUser = user
|
var/mob/living/carbon/itemUser = user
|
||||||
usedHand = itemUser.get_held_index_of_item(src)
|
usedHand = itemUser.get_held_index_of_item(src)
|
||||||
if(itemUser.has_status_effect(STATUS_EFFECT_HIPPOCRATIC_OATH))
|
if(itemUser.has_status_effect(STATUS_EFFECT_HIPPOCRATIC_OATH))
|
||||||
to_chat(user, "<span class='warning'>You can't possibly handle the responsibility of more than one rod!</span>")
|
to_chat(user, "<span class='warning'>You can't possibly handle the responsibility of more than one rod!</span>")
|
||||||
return
|
return
|
||||||
var/failText = "<span class='warning'>The snake seems unsatisfied with your incomplete oath and returns to it's previous place on the rod, returning to its dormant, wooden state. You must stand still while completing your oath!</span>"
|
var/failText = "<span class='warning'>The snake seems unsatisfied with your incomplete oath and returns to its previous place on the rod, returning to its dormant, wooden state. You must stand still while completing your oath!</span>"
|
||||||
to_chat(itemUser, "<span class='notice'>The wooden snake that was carved into the rod seems to suddenly come alive and begins to slither down your arm! The compulsion to help others grows abnormally strong...</span>")
|
to_chat(itemUser, "<span class='notice'>The wooden snake that was carved into the rod seems to suddenly come alive and begins to slither down your arm! The compulsion to help others grows abnormally strong...</span>")
|
||||||
if(do_after(itemUser, 40, target = itemUser))
|
if(do_after(itemUser, 40, target = itemUser))
|
||||||
itemUser.say("I swear to fulfill, to the best of my ability and judgment, this covenant:", forced = "hippocratic oath")
|
itemUser.say("I swear to fulfill, to the best of my ability and judgment, this covenant:", forced = "hippocratic oath")
|
||||||
|
|||||||
@@ -108,7 +108,7 @@
|
|||||||
to_chat(user, "<span class='warning'>You failed to pour [O] onto [src]!</span>")
|
to_chat(user, "<span class='warning'>You failed to pour [O] onto [src]!</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
user.visible_message("[user] pours the contents of [O] onto [src], causing it to reform it's original shape and turn a slightly brighter shade of pink.", "<span class='notice'>You pour the contents of [O] onto [src], causing it to reform it's original shape and turn a slightly brighter shade of pink.</span>")
|
user.visible_message("[user] pours the contents of [O] onto [src], causing it to reform its original shape and turn a slightly brighter shade of pink.", "<span class='notice'>You pour the contents of [O] onto [src], causing it to reform its original shape and turn a slightly brighter shade of pink.</span>")
|
||||||
damaged_brain = FALSE //heal the superficial damage.
|
damaged_brain = FALSE //heal the superficial damage.
|
||||||
|
|
||||||
O.reagents.clear_reagents()
|
O.reagents.clear_reagents()
|
||||||
|
|||||||
@@ -272,7 +272,7 @@
|
|||||||
if(R && S.reagents.has_reagent(R.id, 5))
|
if(R && S.reagents.has_reagent(R.id, 5))
|
||||||
S.reagents.remove_reagent(R.id,5)
|
S.reagents.remove_reagent(R.id,5)
|
||||||
queen.assign_reagent(R)
|
queen.assign_reagent(R)
|
||||||
user.visible_message("<span class='warning'>[user] injects [src]'s genome with [R.name], mutating it's DNA!</span>","<span class='warning'>You inject [src]'s genome with [R.name], mutating it's DNA!</span>")
|
user.visible_message("<span class='warning'>[user] injects [src]'s genome with [R.name], mutating its DNA!</span>","<span class='warning'>You inject [src]'s genome with [R.name], mutating its DNA!</span>")
|
||||||
name = queen.name
|
name = queen.name
|
||||||
else
|
else
|
||||||
to_chat(user, "<span class='warning'>You don't have enough units of that chemical to modify the bee's DNA!</span>")
|
to_chat(user, "<span class='warning'>You don't have enough units of that chemical to modify the bee's DNA!</span>")
|
||||||
|
|||||||
@@ -72,7 +72,7 @@
|
|||||||
if(going_kaboom)
|
if(going_kaboom)
|
||||||
return
|
return
|
||||||
going_kaboom = TRUE
|
going_kaboom = TRUE
|
||||||
visible_message("<span class='danger'>\The [src] lets out an shower of sparks as it starts to lose stability!</span>",\
|
visible_message("<span class='danger'>\The [src] lets out a shower of sparks as it starts to lose stability!</span>",\
|
||||||
"<span class='italics'>You hear a loud electrical crack!</span>")
|
"<span class='italics'>You hear a loud electrical crack!</span>")
|
||||||
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
|
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
|
||||||
tesla_zap(src, 5, power_gen * 0.05)
|
tesla_zap(src, 5, power_gen * 0.05)
|
||||||
|
|||||||
@@ -771,7 +771,7 @@
|
|||||||
/datum/reagent/carbon
|
/datum/reagent/carbon
|
||||||
name = "Carbon"
|
name = "Carbon"
|
||||||
id = "carbon"
|
id = "carbon"
|
||||||
description = "A crumbly black solid that, while unexciting on an physical level, forms the base of all known life. Kind of a big deal."
|
description = "A crumbly black solid that, while unexciting on a physical level, forms the base of all known life. Kind of a big deal."
|
||||||
reagent_state = SOLID
|
reagent_state = SOLID
|
||||||
color = "#1C1300" // rgb: 30, 20, 0
|
color = "#1C1300" // rgb: 30, 20, 0
|
||||||
taste_description = "sour chalk"
|
taste_description = "sour chalk"
|
||||||
|
|||||||
@@ -130,7 +130,7 @@
|
|||||||
|
|
||||||
/datum/design/board/overlord_module
|
/datum/design/board/overlord_module
|
||||||
name = "Core Module Design (Overlord)"
|
name = "Core Module Design (Overlord)"
|
||||||
desc = "Allows for the construction of a Overlord AI Module."
|
desc = "Allows for the construction of an Overlord AI Module."
|
||||||
id = "overlord_module"
|
id = "overlord_module"
|
||||||
materials = list(MAT_GLASS = 1000, MAT_DIAMOND = 2000)
|
materials = list(MAT_GLASS = 1000, MAT_DIAMOND = 2000)
|
||||||
build_path = /obj/item/aiModule/core/full/overlord
|
build_path = /obj/item/aiModule/core/full/overlord
|
||||||
|
|||||||
@@ -58,7 +58,7 @@
|
|||||||
to_chat(user, "<span class='warning'>The slime is dead!</span>")
|
to_chat(user, "<span class='warning'>The slime is dead!</span>")
|
||||||
return
|
return
|
||||||
if(!M.is_adult)
|
if(!M.is_adult)
|
||||||
to_chat(user, "<span class='warning'>The slime must be an adult to cross it's core!</span>")
|
to_chat(user, "<span class='warning'>The slime must be an adult to cross its core!</span>")
|
||||||
return
|
return
|
||||||
if(M.effectmod && M.effectmod != effectmod)
|
if(M.effectmod && M.effectmod != effectmod)
|
||||||
to_chat(user, "<span class='warning'>The slime is already being crossed with a different extract!</span>")
|
to_chat(user, "<span class='warning'>The slime is already being crossed with a different extract!</span>")
|
||||||
|
|||||||
@@ -447,7 +447,7 @@
|
|||||||
if(power < 10 || target.z != user.z)
|
if(power < 10 || target.z != user.z)
|
||||||
to_chat(user, "<span class='notice'>We are too far away from [target.name] to affect them!</span>")
|
to_chat(user, "<span class='notice'>We are too far away from [target.name] to affect them!</span>")
|
||||||
return
|
return
|
||||||
to_chat(user, "<span class='notice'>We succesfuly distort reality surrounding [target.name]!</span>")
|
to_chat(user, "<span class='notice'>We successfully distort reality surrounding [target.name]!</span>")
|
||||||
switch(hive.hive_size)
|
switch(hive.hive_size)
|
||||||
if(5 to 9)
|
if(5 to 9)
|
||||||
if(10 to 14)
|
if(10 to 14)
|
||||||
|
|||||||
Reference in New Issue
Block a user