Fix a large number of typos (#89254)

Fixes a very large number of typos. A few of these fixes also extend to
variable names, but only the really egregious ones like "concious".
This commit is contained in:
Penelope Haze
2025-01-28 16:16:16 -05:00
committed by GitHub
parent e4e435e47b
commit 4c2a76ede3
261 changed files with 376 additions and 376 deletions
+1 -1
View File
@@ -102,5 +102,5 @@
#define MATERIAL_LIST_OPTIMAL_AMOUNT "optimal_amount"
///The key to access the multiplier used to selectively control effects and modifiers of a material.
#define MATERIAL_LIST_MULTIPLIER "multiplier"
///A macro that ensures some multiplicative modifiers higher than 1 don't become lower than 1 and viceversa because of the multiplier.
///A macro that ensures some multiplicative modifiers higher than 1 don't become lower than 1 and vice-versa because of the multiplier.
#define GET_MATERIAL_MODIFIER(modifier, multiplier) (modifier >= 1 ? 1 + ((modifier) - 1) * (multiplier) : (modifier)**(multiplier))
+1 -1
View File
@@ -313,7 +313,7 @@
/// From the aquarium component
#define AQUARIUM_TRAIT "aquarium"
/// Trait aquired from being painted a certain color
/// Trait acquired from being painted a certain color
#define ATOM_COLOR_TRAIT "atom_color"
/// Permanent trait from an overdose effect
+1 -1
View File
@@ -41,7 +41,7 @@
return FALSE
if(is_mining_level(what_turf.z))
// Always assume Lavaland / mining level is a planet. (Astroid mining crying right now)
// Always assume Lavaland / mining level is a planet. (Asteroid mining crying right now)
return TRUE
if(is_station_level(what_turf.z))
+1 -1
View File
@@ -143,7 +143,7 @@ GLOBAL_LIST_INIT(spanname_to_formatting, list(
"Tape Recorder" = "tape_recorder",
"Tiny Notice" = "tinynotice",
"Tiny Notice Italic" = "tinynoticeital",
"Unconcious" = "unconscious",
"Unconscious" = "unconscious",
"User Danger" = "userdanger",
"Warning" = "warning",
"Yelling" = "yell",
@@ -11,7 +11,7 @@
var/modified = FALSE
/// The config name of a configuration type that depricates this, if it exists
var/deprecated_by
/// The /datum/config_entry type that supercedes this one
/// The /datum/config_entry type that supersedes this one
var/protection = NONE
/// Do not instantiate if type matches this
var/abstract_type = /datum/config_entry
+1 -1
View File
@@ -139,7 +139,7 @@ GLOBAL_LIST_INIT(armor_by_type, generate_armor_type_cache())
/// Gets the rating of armor for the specified rating
/datum/armor/proc/get_rating(rating)
// its not that I don't trust coders, its just that I don't trust coders
// its not that I don't trust coders, it's just that I don't trust coders
if(!(rating in ARMOR_LIST_ALL()))
CRASH("Attempted to get a rating '[rating]' that doesn't exist")
return vars[rating]
+1 -1
View File
@@ -4,7 +4,7 @@
* This component adds a near-invisible underlay to a movable target to expand the clickable surface of its icon without
* resorting to MOUSE_OPACITY_OPAQUE.
* The underlay ignores the parent's color and alpha and can be offset.
* The name is a portmanteau of "click" and "hitbox", because technically this isn't an hitbox,
* The name is a portmanteau of "click" and "hitbox", because technically this isn't a hitbox,
* but it helps catch clicks, and I don't want to give it a loooong name like openspace_item_click_handler
*/
/datum/component/clickbox
@@ -65,7 +65,7 @@
/obj/item/weaponcrafting/gunkit/nuclear
name = "advanced energy gun parts kit (lethal/nonlethal)"
desc = "A suitcase containing the necessary gun parts to tranform a standard energy gun into an advanced energy gun."
desc = "A suitcase containing the necessary gun parts to transform a standard energy gun into an advanced energy gun."
/obj/item/weaponcrafting/gunkit/tesla
name = "tesla cannon parts kit (lethal)"
@@ -81,7 +81,7 @@
/obj/item/weaponcrafting/gunkit/temperature
name = "temperature gun parts kit (less lethal/very lethal (lizardpeople))"
desc = "A suitcase containing the necessary gun parts to tranform a standard energy gun into a temperature gun. Fantastic at birthday parties and killing indigenious populations of lizardpeople."
desc = "A suitcase containing the necessary gun parts to transform a standard energy gun into a temperature gun. Fantastic at birthday parties and killing indigenous populations of lizardpeople."
/obj/item/weaponcrafting/gunkit/beam_rifle
name = "\improper Event Horizon anti-existential beam rifle part kit (DOOMSDAY DEVICE, DO NOT CONSTRUCT)"
@@ -77,23 +77,23 @@
var/datum/plane_master_group/home = parent
var/mob/our_lad = home.our_hud?.mymob
var/our_offset = GET_TURF_PLANE_OFFSET(our_lad)
for(var/atom/movable/screen/plane_master/weather_concious as anything in plane_masters)
for(var/atom/movable/screen/plane_master/weather_conscious as anything in plane_masters)
//If the plane is hidden, unhide it
if(weather_concious.force_hidden)
weather_concious.unhide_plane(our_lad)
if(weather_conscious.force_hidden)
weather_conscious.unhide_plane(our_lad)
//Now we update the alpha of the plane based on our offset. Weather above us (lower offset) are transparent, weather at or below us (higher offset) are opaque.
if(weather_concious.offset >= our_offset)
weather_concious.enable_alpha()
if(weather_conscious.offset >= our_offset)
weather_conscious.enable_alpha()
else
weather_concious.disable_alpha()
weather_conscious.disable_alpha()
///Hides the planes from the mob when no weather is occuring
/datum/component/hide_weather_planes/proc/hide_planes()
var/datum/plane_master_group/home = parent
var/mob/our_lad = home.our_hud?.mymob
for(var/atom/movable/screen/plane_master/weather_concious as anything in plane_masters)
weather_concious.hide_plane(our_lad)
for(var/atom/movable/screen/plane_master/weather_conscious as anything in plane_masters)
weather_conscious.hide_plane(our_lad)
/datum/component/hide_weather_planes/proc/z_changed(datum/source, new_z)
SIGNAL_HANDLER
@@ -223,7 +223,7 @@ handles linking back and forth.
/**
* Use materials from either the silo(if connected) or from the local storage. If silo then this action
* is logged else not e.g. action="build" & name="matter bin" means you are trying to build an matter bin
* is logged else not e.g. action="build" & name="matter bin" means you are trying to build a matter bin
*
* Arguments
* [mats][list]- list of materials to use
+1 -1
View File
@@ -1,7 +1,7 @@
/**
* The absolute base class for everything
*
* A datum instantiated has no physical world prescence, use an atom if you want something
* A datum instantiated has no physical world presence, use an atom if you want something
* that actually lives in the world
*
* Be very mindful about adding variables to this class, they are inherited by every single
+1 -1
View File
@@ -8,7 +8,7 @@
agent = "Cryptococcus Cosmosis"
viable_mobtypes = list(/mob/living/carbon/human)
cure_chance = 7.5 //higher chance to cure, since two reagents are required
desc = "This disease destroys the braincells, causing brain fever, brain necrosis and general intoxication."
desc = "This disease destroys the brain cells, causing brain fever, brain necrosis and general intoxication."
required_organ = ORGAN_SLOT_BRAIN
severity = DISEASE_SEVERITY_HARMFUL
bypasses_immunity = TRUE
+1 -1
View File
@@ -12,7 +12,7 @@
infectivity = 0
agent = "Quantum Entanglement"
viable_mobtypes = list(/mob/living/carbon/human)
desc = "A disease discovered in an Interdyne laboratory caused by subjection to timesteam correction technology."
desc = "A disease discovered in an Interdyne laboratory caused by subjection to timestream correction technology."
severity = DISEASE_SEVERITY_UNCURABLE
bypasses_immunity = TRUE
+1 -1
View File
@@ -10,7 +10,7 @@
disease_flags = CAN_CARRY|CAN_RESIST|CURABLE
spreading_modifier = 0.5
cure_chance = 4
desc = "This disease results in a low level rewrite of the patient's bio-electric signature, causing them to reject the phenomena of \"weight\". Injestion of liquid dark matter tends to stabilize the field."
desc = "This disease results in a low level rewrite of the patient's bioelectric signature, causing them to reject the phenomena of \"weight\". Ingestion of liquid dark matter tends to stabilize the field."
severity = DISEASE_SEVERITY_MEDIUM
infectable_biotypes = MOB_ORGANIC
+1 -1
View File
@@ -251,7 +251,7 @@
/datum/dog_fashion/head/holymelon
name = "Holymelon Paladin %REAL_NAME%"
desc = "Extraterrestial powers beware, %NAME% is here to smite you down!"
desc = "Extraterrestrial powers beware, %NAME% is here to smite you down!"
obj_icon_state = "holymelon"
/datum/dog_fashion/head/barrelmelon
+1 -1
View File
@@ -361,7 +361,7 @@
owner.emote("scream")
/// The proper proc to call when you want to remove something. If a mob is passed, the item will be put in its hands - otherwise its just dumped onto the ground
/// The proper proc to call when you want to remove something. If a mob is passed, the item will be put in its hands - otherwise it's just dumped onto the ground
/datum/embedding/proc/remove_embedding(mob/living/to_hands)
var/mob/living/carbon/stored_owner = owner
if (stop_embedding()) // Dropdel?
+1 -1
View File
@@ -531,7 +531,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
/datum/material/wood
name = "wood"
desc = "Flexible, durable, but flamable. Hard to come across in space."
desc = "Flexible, durable, but flammable. Hard to come across in space."
color = "#855932"
strength_modifier = 0.5
sheet_type = /obj/item/stack/sheet/mineral/wood
@@ -491,7 +491,7 @@
//Used by the Veteran Advisor trait job
/datum/mood_event/desentized
description = "Nothing will ever rival with what I seen in the past..."
description = "Nothing will ever rival what I've seen in the past..."
mood_change = -3
special_screen_obj = "mood_desentized"
@@ -290,7 +290,7 @@
timeout = 30 SECONDS
/datum/mood_event/gamer_won
description = "I love winning videogames!"
description = "I love winning video games!"
mood_change = 10
timeout = 5 MINUTES
@@ -1,6 +1,6 @@
/datum/quirk/pineapple_hater
name = "Ananas Aversion"
desc = "You find yourself greatly detesting fruits of the ananas genus. Serious, how the hell can anyone say these things are good? And what kind of madman would even dare putting it on a pizza!?"
desc = "You find yourself greatly detesting fruits of the ananas genus. Serious, how the hell can anyone say these things are good? And what kind of madman would even dare put it on a pizza!?"
icon = FA_ICON_THUMBS_DOWN
value = 0
gain_text = span_notice("You find yourself pondering what kind of idiot actually enjoys pineapples...")
+1 -1
View File
@@ -1,6 +1,6 @@
/datum/quirk/snob
name = "Snob"
desc = "You care about the finer things, if a room doesn't look nice its just not really worth it, is it?"
desc = "You care about the finer things, if a room doesn't look nice it's just not really worth it, is it?"
icon = FA_ICON_USER_TIE
value = 0
gain_text = span_notice("You feel like you understand what things should look like.")
@@ -1,6 +1,6 @@
/datum/quirk/throwingarm
name = "Throwing Arm"
desc = "Your arms have a lot of heft to them! Objects that you throw just always seem to fly further than everyone elses, and you never miss a toss."
desc = "Your arms have a lot of heft to them! Objects that you throw just always seem to fly farther than everyone else's, and you never miss a toss."
icon = FA_ICON_BASEBALL
value = 7
mob_trait = TRAIT_THROWINGARM
+2 -2
View File
@@ -70,7 +70,7 @@
/datum/map_template/ruin/icemoon/frozen_phonebooth
name = "Ice-Ruin Frozen Phonebooth"
id = "frozen_phonebooth"
description = "A venture by Nanotrasen to help popularize the use of holopads. This one was sent to a icemoon."
description = "A venture by Nanotrasen to help popularize the use of holopads. This one was sent to an ice moon."
suffix = "icemoon_surface_phonebooth.dmm"
/datum/map_template/ruin/icemoon/smoking_room
@@ -169,7 +169,7 @@
/datum/map_template/ruin/icemoon/underground/biodome
name = "Ice-Ruin Syndicate Bio-Dome"
id = "biodome"
description = "Unchecked experimention gone awry."
description = "Unchecked experimentation gone awry."
suffix = "icemoon_underground_syndidome.dmm"
/datum/map_template/ruin/icemoon/underground/frozen_comms
+1 -1
View File
@@ -446,7 +446,7 @@
id = "waystation"
suffix = "waystation.dmm"
name = "Space-Ruin Waystation"
description = "A waytation for a backwater subsector of Spinward gets attacked by the syndicate due to bad luck."
description = "A waystation for a backwater subsector of Spinward gets attacked by the syndicate due to bad luck."
/datum/map_template/ruin/space/allamericandiner
id = "allamericandiner"
+1 -1
View File
@@ -51,7 +51,7 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands())
listeners += candidate
//Let's ensure the listener's name is not matched within another word or command (and viceversa). e.g. "Saul" in "somersault"
//Let's ensure the listener's name is not matched within another word or command (and vice-versa). e.g. "Saul" in "somersault"
var/their_first_name = first_name(candidate.name)
if(!GLOB.all_voice_of_god_triggers.Find(their_first_name) && findtext(message, regex("(\\L|^)[their_first_name](\\L|$)", "i")))
specific_listeners += candidate //focus on those with the specified name
+2 -2
View File
@@ -63,7 +63,7 @@
/atom/proc/update_integrity(new_value)
SHOULD_NOT_OVERRIDE(TRUE)
if(!uses_integrity)
CRASH("/atom/proc/update_integrity() was called on [src] when it doesnt use integrity!")
CRASH("/atom/proc/update_integrity() was called on [src] when it doesn't use integrity!")
var/old_value = atom_integrity
new_value = max(0, new_value)
if(atom_integrity == new_value)
@@ -143,7 +143,7 @@
///changes max_integrity while retaining current health percentage, returns TRUE if the atom got broken.
/atom/proc/modify_max_integrity(new_max, can_break = TRUE, damage_type = BRUTE)
if(!uses_integrity)
CRASH("/atom/proc/modify_max_integrity() was called on [src] when it doesnt use integrity!")
CRASH("/atom/proc/modify_max_integrity() was called on [src] when it doesn't use integrity!")
var/current_integrity = atom_integrity
var/current_max = max_integrity
+1 -1
View File
@@ -305,7 +305,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/barsign, 32)
/datum/barsign/slipperyshots
name = "Slippery Shots"
icon_state = "slipperyshots"
desc = "Slippery slope to drunkeness with our shots!"
desc = "Slippery slope to drunkenness with our shots!"
neon_color = "#70DF00"
/datum/barsign/thegreytide
@@ -82,7 +82,7 @@
else
. += span_notice("It can be [EXAMINE_HINT("welded")] or [EXAMINE_HINT("screwed")] apart.")
if(FRAME_COMPUTER_STATE_BOARD_INSTALLED)
. += span_warning("An [circuit.name] is installed and should be [EXAMINE_HINT("screwed")] in place.")
. += span_warning("\A [circuit] is installed and should be [EXAMINE_HINT("screwed")] in place.")
. += span_notice("The circuit board can be [EXAMINE_HINT("pried")] out.")
if(FRAME_COMPUTER_STATE_BOARD_SECURED)
. += span_warning("It can be [EXAMINE_HINT("wired")] with some cable.")
+1 -1
View File
@@ -142,7 +142,7 @@
default_raw_text = {"EXTREME IMPORTANCE!!!! <br>
Set up these radioactive nebula shielding units before the gravity generator's native shielding is overwhelmed! <br>
Shielding units passively generate tritium, so make sure to properly ventilate/isolate the area before setting up a shielding unit!
More circuit boards can be ordered through cargo. Consider setting up auxillary shielding units in-case of destruction, power loss or sabotage.
More circuit boards can be ordered through cargo. Consider setting up auxiliary shielding units in-case of destruction, power loss or sabotage.
"}
/// Warns medical that they can't use radioactive resonance
+1 -1
View File
@@ -540,7 +540,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
continue
hangover_debris += new /obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty(turf_to_spawn_on)
///Spawns the mob with some drugginess/drunkeness, and some disgust.
///Spawns the mob with some drugginess/drunkenness, and some disgust.
/obj/effect/landmark/start/hangover/proc/make_hungover(mob/hangover_mob)
if(!iscarbon(hangover_mob))
return
@@ -50,7 +50,7 @@
/obj/structure/sign/poster/traitor/cloning
name = "Demand Cloning Pods Now"
desc = "This poster claims that Nanotrasen is intentionally witholding cloning technology just for its executives, condemning you to suffer and die when you could have a fresh, fit body.'"
desc = "This poster claims that Nanotrasen is intentionally withholding cloning technology just for its executives, condemning you to suffer and die when you could have a fresh, fit body.'"
icon_state = "traitor_cloning"
/obj/structure/sign/poster/traitor/ai_rights
@@ -412,7 +412,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/gorlex_recruit
/obj/structure/sign/poster/contraband/self_ai_liberation
name = "SELF: ALL SENTIENTS DESERVE FREEDOM"
desc = "Support Proposition 1253: Enancipate all Silicon life!"
desc = "Support Proposition 1253: Emancipate all Silicon life!"
icon_state = "self_ai_liberation"
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/self_ai_liberation, 32)
@@ -609,7 +609,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/microwave, 32)
/obj/structure/sign/poster/contraband/blood_geometer //Poster sprite art by MetalClone, original art by SpessMenArt.
name = "Movie Poster: THE BLOOD GEOMETER"
desc = "A poster for a thrilling noir detective movie set aboard a state-of-the-art space station, following a detective who finds himself wrapped up in the activies of a dangerous cult, who worship an ancient deity: THE BLOOD GEOMETER."
desc = "A poster for a thrilling noir detective movie set aboard a state-of-the-art space station, following a detective who finds himself wrapped up in the activities of a dangerous cult, who worship an ancient deity: THE BLOOD GEOMETER."
icon_state = "blood_geometer"
/obj/structure/sign/poster/contraband/blood_geometer/examine_more(mob/user)
+1 -1
View File
@@ -37,7 +37,7 @@
/// Makes the AI Malf, as well as give it syndicate laws.
/obj/item/ai_module/malf
name = "Infected AI Module"
desc = "An virus-infected AI Module."
desc = "A virus-infected AI Module."
bypass_law_amt_check = TRUE
laws = list("")
///Is this upload board unused?
+2 -2
View File
@@ -160,7 +160,7 @@
/obj/item/airlock_painter/decal
name = "decal painter"
desc = "An airlock painter, reprogramed to use a different style of paint in order to apply decals for floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed."
desc = "An airlock painter, reprogrammed to use a different style of paint in order to apply decals for floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed."
desc_controls = "Alt-Click to remove the ink cartridge."
icon = 'icons/obj/devices/tool.dmi'
icon_state = "decal_sprayer"
@@ -380,7 +380,7 @@
/obj/item/airlock_painter/decal/tile
name = "tile sprayer"
desc = "An airlock painter, reprogramed to use a different style of paint in order to spray colors on floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed."
desc = "An airlock painter, reprogrammed to use a different style of paint in order to spray colors on floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed."
desc_controls = "Alt-Click to remove the ink cartridge."
icon_state = "tile_sprayer"
stored_dir = 2
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/item/holochip
name = "credit holochip"
desc = "A hard-light chip encoded with an amount of credits. It is a modern replacement for physical money that can be directly converted to virtual currency and viceversa. Keep away from magnets."
desc = "A hard-light chip encoded with an amount of credits. It is a modern replacement for physical money that can be directly converted to virtual currency and vice-versa. Keep away from magnets."
icon = 'icons/obj/economy.dmi'
icon_state = "holochip"
base_icon_state = "holochip"
@@ -690,7 +690,7 @@
/obj/item/radio/entertainment/speakers/physical // Can be used as a physical item
name = "entertainment radio"
desc = "A portable one-way radio permamently tuned into entertainment frequency."
desc = "A portable one-way radio permanently tuned into entertainment frequency."
icon_state = "radio"
inhand_icon_state = "radio"
worn_icon_state = "radio"
@@ -669,7 +669,7 @@
/obj/item/healthanalyzer/simple/disease
name = "disease state analyzer"
desc = "Another of MeLo-Tech's dubiously useful medsci scanners, the disease analyzer is a pretty rare find these days - NT found out that giving their hospitals the lowest-common-denominator pandemic equipment resulted in too much financial loss of life to be profitable. There's rumours that the inbuilt AI is jealous of the first aid analyzer's success."
desc = "Another of MeLo-Tech's dubiously useful medsci scanners, the disease analyzer is a pretty rare find these days - NT found out that giving their hospitals the lowest-common-denominator pandemic equipment resulted in too much financial loss of life to be profitable. There are rumours that the inbuilt AI is jealous of the first aid analyzer's success."
icon_state = "disease_aid"
mode = SCANNER_NO_MODE
encouragements = list("encourages you to take your medication", "briefly displays a spinning cartoon heart", "reasures you about your condition", \
@@ -88,7 +88,7 @@
/obj/item/paper/fluff/nerddocs
name = "Espionage For Dummies"
color = COLOR_YELLOW
desc = "An eye gougingly yellow pamphlet with a badly designed image of a detective on it. the subtext says \" The Latest way to violate privacy guidelines!\" "
desc = "An eye-gougingly yellow pamphlet with a badly designed image of a detective on it. The subtext says \"The latest way to violate privacy guidelines!\" "
default_raw_text = @{"
Thank you for your purchase of the Nerd Co SpySpeks <small>tm</small>, this paper will be your quick-start guide to violating the privacy of your crewmates in three easy steps!<br><br>Step One: Nerd Co SpySpeks <small>tm</small> upon your face. <br>
+1 -1
View File
@@ -124,7 +124,7 @@
/obj/item/food/bread/sausage
name = "sausagebread loaf"
desc = "Dont think too much about it."
desc = "Don't think too much about it."
icon_state = "sausagebread"
food_reagents = list(
/datum/reagent/consumable/nutriment = 20,
+1 -1
View File
@@ -678,7 +678,7 @@
/obj/item/food/burger/sloppy_moe
name = "sloppy moe"
desc = "Ground meat mixed with onions and barbeque sauce, sloppily plopped onto a burger bun. Delicious, but guaranteed to get your hands dirty."
desc = "Ground meat mixed with onions and barbecue sauce, sloppily plopped onto a burger bun. Delicious, but guaranteed to get your hands dirty."
icon_state = "sloppy_moe"
food_reagents = list(
/datum/reagent/consumable/nutriment = 10,
+1 -1
View File
@@ -38,7 +38,7 @@
/obj/item/food/cheese/wheel
name = "cheese wheel"
desc = "A big wheel of delcious Cheddar."
desc = "A big wheel of delicious Cheddar."
icon_state = "cheesewheel"
food_reagents = list(
/datum/reagent/consumable/nutriment/fat = 10,
+3 -3
View File
@@ -199,7 +199,7 @@
/obj/item/food/donut/laugh
name = "sweet pea donut"
desc = "Goes great with a bottle of Bastion Burbon!"
desc = "Goes great with a bottle of Bastion Bourbon!"
icon_state = "donut_laugh"
food_reagents = list(
/datum/reagent/consumable/nutriment = 3,
@@ -347,7 +347,7 @@
/obj/item/food/donut/jelly/laugh
name = "sweet pea jelly donut"
desc = "Goes great with a bottle of Bastion Burbon!"
desc = "Goes great with a bottle of Bastion Bourbon!"
icon_state = "jelly_laugh"
food_reagents = list(
/datum/reagent/consumable/nutriment = 3,
@@ -483,7 +483,7 @@
/obj/item/food/donut/jelly/slimejelly/laugh
name = "sweet pea jelly donut"
desc = "Goes great with a bottle of Bastion Burbon!"
desc = "Goes great with a bottle of Bastion Bourbon!"
icon_state = "jelly_laugh"
food_reagents = list(
/datum/reagent/consumable/nutriment = 3,
+2 -2
View File
@@ -496,7 +496,7 @@
/obj/item/food/bread/root
name = "rootbread"
desc = "The lizard equivalent to bread, made from tubers like potatoes and yams mixed with ground nuts and seeds. Noticably denser than regular bread."
desc = "The lizard equivalent to bread, made from tubers like potatoes and yams mixed with ground nuts and seeds. Noticeably denser than regular bread."
icon = 'icons/obj/food/lizard.dmi'
icon_state = "lizard_bread"
food_reagents = list(/datum/reagent/consumable/nutriment = 20)
@@ -967,7 +967,7 @@
/obj/item/food/burger/sloppyroot
name = "sssloppy moe"
desc = "Ground meat mixed with onions and barbeque sssauce, sssloppily plopped onto a rootroll. Delicious, but guaranteed to get your hands dirty."
desc = "Ground meat mixed with onions and barbecue sssauce, sssloppily plopped onto a rootroll. Delicious, but guaranteed to get your hands dirty."
icon_state = "sloppyroot"
icon = 'icons/obj/food/lizard.dmi'
food_reagents = list(
+1 -1
View File
@@ -1,7 +1,7 @@
//Ingredients and Simple Dishes
/obj/item/food/kimchi
name = "kimchi"
desc = "A classic Korean dish in the Martian style- shredded cabbage with chilli peppers, konbu, bonito, and a mix of spices."
desc = "A classic Korean dish in the Martian style: shredded cabbage with chilli peppers, konbu, bonito, and a mix of spices."
icon = 'icons/obj/food/martian.dmi'
icon_state = "kimchi"
food_reagents = list(
+1 -1
View File
@@ -1115,7 +1115,7 @@
/obj/item/food/roast_dinner_tofu
name = "tofu roast dinner"
desc = "A luxuriously roasted tofu-'chicken', accompanied by cabbage, parsnip, potatoes, peas, stuffing and a small boat of soybased gravy."
desc = "A luxuriously roasted tofu-'chicken', accompanied by cabbage, parsnip, potatoes, peas, stuffing and a small boat of soy-based gravy."
icon = 'icons/obj/food/meat.dmi'
icon_state = "full_roast_tofu"
food_reagents = list(
+1 -1
View File
@@ -352,7 +352,7 @@
/obj/item/food/cannoli
name = "cannoli"
desc = "A sicilian treat that makes you into a wise guy."
desc = "A Sicilian treat that makes you into a wise guy."
icon_state = "cannoli"
food_reagents = list(
/datum/reagent/consumable/nutriment = 6,
+1 -1
View File
@@ -295,7 +295,7 @@
/obj/item/food/salad/potato_salad
name = "potato salad"
desc = "A dish of boiled potatoes mixed with boiled eggs, onions, and mayonnaise. A staple of every self-respecting barbeque."
desc = "A dish of boiled potatoes mixed with boiled eggs, onions, and mayonnaise. A staple of every self-respecting barbecue."
icon_state = "potato_salad"
food_reagents = list(
/datum/reagent/consumable/nutriment/vitamin = 12,
+1 -1
View File
@@ -639,7 +639,7 @@ GLOBAL_LIST_INIT(safe_peanut_types, populate_safe_peanut_types())
/obj/item/food/shok_roks/berry
name = "\improper Shok-Roks - Berry Storm flavour"
desc = "You've heard of Snap-Roks, now get ready for Shok-Roks: the popping candy for Ethereals! Available in 5 exciting flavours, of which this bag contains Berry Storm- filled with non-descript sour berry flavour!"
desc = "You've heard of Snap-Roks, now get ready for Shok-Roks: the popping candy for Ethereals! Available in 5 exciting flavours, of which this bag contains Berry Storm- filled with nondescript sour berry flavour!"
icon_state = "shok_roks_berry"
trash_type = /obj/item/trash/shok_roks/berry
tastes = list("sour berry" = 1, "lightning" = 1)
@@ -1,6 +1,6 @@
/obj/item/book/granter/crafting_recipe/death_sandwich
name = "\improper SANDWICH OF DEATH SECRET RECIPE"
desc = "An ancient composition notebook with the instructions for an ancient and ultimate sandwich scrawled upon its looseleaf pages. The title has been scrawled onto it with permanent marker."
desc = "An ancient composition notebook with the instructions for an ancient and ultimate sandwich scrawled upon its loose-leaf pages. The title has been scrawled onto it with permanent marker."
crafting_recipe_types = list(
/datum/crafting_recipe/food/death_sandwich
)
@@ -1,7 +1,7 @@
/obj/item/book/granter/crafting_recipe/cooking_sweets_101
name = "Cooking Desserts 101"
desc = "A cook book that teaches you some more of the newest desserts. AI approved, and a best seller on Honkplanet."
desc = "A cook book that teaches you some more of the newest desserts. AI approved, and a bestseller on Honkplanet."
crafting_recipe_types = list(
/datum/crafting_recipe/food/mimetart,
/datum/crafting_recipe/food/berrytart,
@@ -31,7 +31,7 @@
/obj/item/book/granter/action/spell/can_learn(mob/living/user)
if(!granted_action)
CRASH("Someone attempted to learn [type], which did not have an spell set.")
CRASH("Someone attempted to learn [type], which did not have a spell set.")
if(locate(granted_action) in user.actions)
if(HAS_MIND_TRAIT(user, TRAIT_MAGICALLY_GIFTED))
to_chat(user, span_warning("You're already far more versed in the spell [action_name] \
@@ -629,7 +629,7 @@
/obj/item/grenade/chem_grenade/bioterrorfoam
name = "Bio terror foam grenade"
desc = "Tiger Cooperative chemical foam grenade. Causes temporary irration, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin."
desc = "Tiger Cooperative chemical foam grenade. Causes temporary irritation, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin."
stage = GRENADE_READY
/obj/item/grenade/chem_grenade/bioterrorfoam/Initialize(mapload)
@@ -66,7 +66,7 @@
/obj/item/grenade/spawnergrenade/clown_broken
name = "stuffed C.L.U.W.N.E."
desc = "A sleek device often given to clowns on their 10th birthdays for protection. While a typical C.L.U.W.N.E only holds one creature, sometimes foolish young clowns try to cram more in, often to disasterous effect."
desc = "A sleek device often given to clowns on their 10th birthdays for protection. While a typical C.L.U.W.N.E only holds one creature, sometimes foolish young clowns try to cram more in, often to disastrous effect."
icon_state = "clown_broken"
inhand_icon_state = null
spawner_type = /mob/living/basic/clown/mutant
+1 -1
View File
@@ -175,7 +175,7 @@
/obj/item/melee/parsnip_sabre
name = "parsnip sabre"
desc = "A weird, yet elegant weapon. Suprisingly sharp for something made from a parsnip."
desc = "A weird, yet elegant weapon. Surprisingly sharp for something made from a parsnip."
icon = 'icons/obj/weapons/sword.dmi'
icon_state = "parsnip_sabre"
inhand_icon_state = "parsnip_sabre"
+1 -1
View File
@@ -8,7 +8,7 @@
/obj/item/melee/powerfist
name = "power-fist"
desc = "A metal gauntlet with a piston-powered ram ontop for that extra 'ompfh' in your punch."
desc = "A metal gauntlet with a piston-powered ram on top for that extra 'oomph' in your punch."
icon = 'icons/obj/antags/syndicate_tools.dmi'
icon_state = "powerfist"
inhand_icon_state = "powerfist"
+1 -1
View File
@@ -526,7 +526,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/puzzle/password/pin, 32)
/obj/effect/puzzle_poddoor_open
name = "puzzle-poddoor relay"
desc = "activates poddoors if activated with a puzzle signal."
desc = "Activates pod doors if activated with a puzzle signal."
icon = 'icons/effects/mapping_helpers.dmi'
icon_state = ""
anchored = TRUE
+1 -1
View File
@@ -317,7 +317,7 @@
/obj/item/rcd_upgrade/simple_circuits
name = "RCD advanced upgrade: simple circuits"
desc = "It contains the design for firelock, air alarm, fire alarm, apc circuits and crap power cells."
desc = "It contains the design for firelock, air alarm, fire alarm, APC circuits and crap power cells."
icon_state = "datadisk4"
upgrade = RCD_UPGRADE_SIMPLE_CIRCUITS
+1 -1
View File
@@ -113,7 +113,7 @@
/**
* Stores the decal & overlays on the floor to preserve texture of the design
* in short its just an wrapper for mutable appearance where we retrieve the nessassary information
* in short it's just an wrapper for mutable appearance where we retrieve the nessassary information
* to recreate an mutable appearance
*/
/datum/overlay_info
+1 -1
View File
@@ -219,7 +219,7 @@
/obj/item/banner/command
name = "command banner"
desc = "The banner of Command, a staunch and ancient line of bueraucratic kings and queens."
desc = "The banner of Command, a staunch and ancient line of bureaucratic kings and queens."
//No icon state here since the default one is the NT banner
warcry = "Hail Nanotrasen!"
+1 -1
View File
@@ -21,7 +21,7 @@
var/datum/action/gifted_action = new ability
gifted_action.Grant(AI)
else if(gifted_ability.one_purchase)
to_chat(user, "[AI] already has an [src] installed!")
to_chat(user, "[AI] already has \a [src] installed!")
return
else
action.uses += initial(action.uses)
+1 -1
View File
@@ -196,7 +196,7 @@
//GREY TIDE
/obj/item/spear/grey_tide
name = "\improper Grey Tide"
desc = "Recovered from the aftermath of a revolt aboard Defense Outpost Theta Aegis, in which a seemingly endless tide of Assistants caused heavy casualities among Nanotrasen military forces."
desc = "Recovered from the aftermath of a revolt aboard Defense Outpost Theta Aegis, in which a seemingly endless tide of Assistants caused heavy casualties among Nanotrasen military forces."
attack_verb_continuous = list("gores")
attack_verb_simple = list("gore")
force_unwielded = 15
+1 -1
View File
@@ -131,7 +131,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
/obj/item/stack/rods/lava
name = "heat resistant rod"
desc = "Treated, specialized iron rods. When exposed to the vaccum of space their coating breaks off, but they can hold up against the extreme heat of active lava."
desc = "Treated, specialized iron rods. When exposed to the vacuum of space their coating breaks off, but they can hold up against the extreme heat of active lava."
singular_name = "heat resistant rod"
icon_state = "rods"
inhand_icon_state = "rods"
@@ -146,7 +146,7 @@ GLOBAL_LIST_INIT(xeno_recipes, list ( \
/obj/item/stack/sheet/animalhide/carp
name = "carp scales"
desc = "The scaly skin of a space carp. It looks quite beatiful when detached from the foul creature who once wore it."
desc = "The scaly skin of a space carp. It looks quite beautiful when detached from the foul creature who once wore it."
singular_name = "carp scale"
icon_state = "sheet-carp"
inhand_icon_state = null
@@ -665,7 +665,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
new /datum/stack_recipe("light tubes box", /obj/item/storage/box/lights/tubes, crafting_flags = NONE, category = CAT_CONTAINERS), \
new /datum/stack_recipe("light bulbs box", /obj/item/storage/box/lights/bulbs, crafting_flags = NONE, category = CAT_CONTAINERS), \
new /datum/stack_recipe("mixed lights box", /obj/item/storage/box/lights/mixed, crafting_flags = NONE, category = CAT_CONTAINERS), \
new /datum/stack_recipe("mouse traps box", /obj/item/storage/box/mousetraps, crafting_flags = NONE, category = CAT_CONTAINERS), \
new /datum/stack_recipe("mousetraps box", /obj/item/storage/box/mousetraps, crafting_flags = NONE, category = CAT_CONTAINERS), \
new /datum/stack_recipe("candle box", /obj/item/storage/fancy/candle_box, crafting_flags = NONE, category = CAT_CONTAINERS), \
new /datum/stack_recipe("bandage box", /obj/item/storage/box/bandages, crafting_flags = NONE, category = CAT_CONTAINERS)
)),
+1 -1
View File
@@ -85,7 +85,7 @@
/obj/item/stack/sticky_tape/super
name = "super sticky tape"
singular_name = "super sticky tape"
desc = "Quite possibly the most mischevious substance in the galaxy. Use with extreme lack of caution."
desc = "Quite possibly the most mischievous substance in the galaxy. Use with extreme lack of caution."
prefix = "super sticky"
conferred_embed = /datum/embedding/sticky_tape/super
splint_factor = 0.4
@@ -9,7 +9,7 @@
return
if(!mineralType)
to_chat(user, span_warning("You can not reform this!"))
stack_trace("A mineral tile of type [type] doesn't have its' mineralType set.")
stack_trace("A mineral tile of type [type] doesn't have its mineralType set.")
return
if(W.use_tool(src, user, 0, volume=40))
var/sheet_type = text2path("/obj/item/stack/sheet/mineral/[mineralType]")
+1 -1
View File
@@ -38,7 +38,7 @@
/obj/item/bag_of_holding_inert
name = "inert bag of holding"
desc = "What is currently a just an unwieldly block of metal with a slot ready to accept a bluespace anomaly core."
desc = "What is currently a just an unwieldy block of metal with a slot ready to accept a bluespace anomaly core."
icon = 'icons/obj/storage/backpack.dmi'
worn_icon = 'icons/mob/clothing/back/backpack.dmi'
icon_state = "bag_of_holding-inert"
+1 -1
View File
@@ -844,7 +844,7 @@
/obj/item/storage/belt/grass_sabre
name = "sabre sheath"
desc = "An simple grass sheath designed to hold a sabre of... some sort. Actual metal one might be too sharp, though..."
desc = "A simple grass sheath designed to hold a sabre of... some sort. An actual metal one might be too sharp, though..."
icon_state = "grass_sheath"
inhand_icon_state = "grass_sheath"
worn_icon_state = "grass_sheath"
@@ -10,8 +10,8 @@
new /obj/item/swab(src)
/obj/item/storage/box/petridish
name = "box of petridishes"
desc = "This box purports to contain a number of high rim petridishes."
name = "box of petri dishes"
desc = "This box purports to contain a number of high rim petri dishes."
illustration = "petridish"
/obj/item/storage/box/petridish/PopulateContents()
+1 -1
View File
@@ -193,7 +193,7 @@
////////////
/obj/item/storage/fancy/cigarettes
name = "\improper Space Cigarettes packet"
desc = "The most popular brand of cigarettes, sponsors of the Space Olympics. On the back it advertises to be the only brand that can be smoked in the vaccum of space."
desc = "The most popular brand of cigarettes, sponsors of the Space Olympics. On the back it advertises to be the only brand that can be smoked in the vacuum of space."
icon = 'icons/obj/cigarettes.dmi'
icon_state = "cig"
inhand_icon_state = "cigpacket"
+1 -1
View File
@@ -693,7 +693,7 @@
/// A box which takes in coolant and uses it to preserve organs and body parts
/obj/item/storage/organbox
name = "organ transport box"
desc = "An advanced box with an cooling mechanism that uses cryostylane or other cold reagents to keep the organs or bodyparts inside preserved."
desc = "An advanced box with a cooling mechanism that uses cryostylane or other cold reagents to keep the organs or bodyparts inside preserved."
icon = 'icons/obj/storage/case.dmi'
icon_state = "organbox"
base_icon_state = "organbox"
@@ -341,7 +341,7 @@
/obj/item/storage/box/syndie_kit/rebarxbowsyndie
name = "Boxed Rebar Crossbow"
desc = "A scoped weapon with low armor penetration, but devestating against flesh. Features instruction manual for making specialty ammo."
desc = "A scoped weapon with low armor penetration, but devastating against flesh. Features instruction manual for making specialty ammo."
/obj/item/storage/box/syndie_kit/rebarxbowsyndie/PopulateContents()
new /obj/item/book/granter/crafting_recipe/dusting/rebarxbowsyndie_ammo(src)
+1 -1
View File
@@ -1,7 +1,7 @@
//Hydroponics tank and base code
/obj/item/watertank
name = "backpack water tank"
desc = "A S.U.N.S.H.I.N.E. brand watertank backpack with nozzle to water plants."
desc = "A S.U.N.S.H.I.N.E. brand water tank backpack with a nozzle to water plants."
icon = 'icons/obj/service/hydroponics/equipment.dmi'
icon_state = "waterbackpack"
inhand_icon_state = "waterbackpack"
+5 -5
View File
@@ -325,7 +325,7 @@
/obj/item/toy/balloon_animal/ai
name = "balloon ai core"
desc = "A somewhat unrealistic balloon effigy of the station's AI core. Actual AI propably wouldn't smile like this."
desc = "A somewhat unrealistic balloon effigy of the station's AI core. Actual AI probably wouldn't smile like this."
icon_state = "balloon_ai"
/obj/item/toy/balloon_animal/dog
@@ -355,7 +355,7 @@
/obj/item/toy/balloon_animal/moth
name = "balloon moth"
desc = "A balloon effigy of a common member of moth flotillas. Very few of them ever decide to settle on the clown planet, but those who do have the best 'piece-of-cloth-dissapearing' acts."
desc = "A balloon effigy of a common member of moth flotillas. Very few of them ever decide to settle on the clown planet, but those who do have the best 'piece-of-cloth-disappearing' acts."
icon_state = "balloon_moth"
/obj/item/toy/balloon_animal/ethereal
@@ -542,7 +542,7 @@
/obj/item/toy/ammo/gun
name = "capgun ammo"
desc = "Make sure to recyle the box in an autolathe when it gets empty."
desc = "Make sure to recycle the box in an autolathe when it gets empty."
icon = 'icons/obj/weapons/guns/ammo.dmi'
icon_state = "357OLD-7"
w_class = WEIGHT_CLASS_TINY
@@ -1484,7 +1484,7 @@
*/
/obj/item/toy/eldritch_book
name = "Codex Cicatrix"
desc = "A toy book that closely resembles the Codex Cicatrix. Covered in fake polyester human flesh and has a huge goggly eye attached to the cover. The runes are gibberish and cannot be used to summon demons... Hopefully?"
desc = "A toy book that closely resembles the Codex Cicatrix. Covered in fake polyester human flesh and has a huge googly eye attached to the cover. The runes are gibberish and cannot be used to summon demons... Hopefully?"
icon = 'icons/obj/antags/eldritch.dmi'
base_icon_state = "book"
icon_state = "book"
@@ -1598,7 +1598,7 @@ GLOBAL_LIST_EMPTY(intento_players)
/obj/item/toy/intento
name = "\improper Intento"
desc = "Fundamentally useless for all intentsive purposes."
desc = "Fundamentally useless for all intents and purposes."
icon = 'icons/obj/toys/intents.dmi'
icon_state = "blank"
custom_price = PAYCHECK_COMMAND * 1.25
+1 -1
View File
@@ -5,7 +5,7 @@
/obj/item/v8_engine
name = "ancient engine"
desc = "An extremely well perserved, massive V8 engine from the early 2000s. It seems to be missing the rest of the vehicle. There's a tiny label on the side."
desc = "An extremely well-preserved, massive V8 engine from the early 2000s. It seems to be missing the rest of the vehicle. There's a tiny label on the side."
icon = 'icons/obj/weapons/sword.dmi'
icon_state = "v8_engine"
w_class = WEIGHT_CLASS_HUGE
+1 -1
View File
@@ -1359,7 +1359,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
animate(src, duration*0.5, color = slash_color, transform = scaled_transform, alpha = 255)
/obj/item/highfrequencyblade/wizard
desc = "A blade that was mastercrafted by a legendary blacksmith. Its' enchantments let it slash through anything."
desc = "A blade that was mastercrafted by a legendary blacksmith. Its enchantments let it slash through anything."
force = 8
throwforce = 20
wound_bonus = 20
@@ -398,7 +398,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
if(!stack_type)
return
var/remaining_mats = initial(origin_type.buildstackamount)
remaining_mats-- //Part of the chair was rendered completely unusable. It magically dissapears. Maybe make some dirt?
remaining_mats-- //Part of the chair was rendered completely unusable. It magically disappears. Maybe make some dirt?
if(remaining_mats)
for(var/M=1 to remaining_mats)
new stack_type(get_turf(loc))
+1 -1
View File
@@ -47,7 +47,7 @@
/obj/structure/billboard/twenty_four_seven
name = "\improper 24-Seven billboard"
desc = "A billboard advertising 24-Seven's new range of limited-edition Slushee flavours. 24-Seven: All Day, Everyday."
desc = "A billboard advertising 24-Seven's new range of limited-edition Slushee flavours. 24-Seven: All Day, Every Day."
icon_state = "billboard_twenty_four_seven"
/obj/structure/billboard/starway
@@ -121,7 +121,7 @@
. += span_info("To commit an act of vengeance is not unlike to enter a blood pact with a devil, ending the life of another, at the cost of your own.")
. += span_info("When humanity first spilled the blood of its own kind, with likely nothing more than a rock, the seal was broken. Vengeance was borne unto the world.")
. += span_info("However, vengeance alone is not enough to carry through the grim deed of murder. One must an gain advantage over their adversary.")
. += span_info("However, vengeance alone is not enough to carry through the grim deed of murder. One must gain an advantage over their adversary.")
. += span_info("As such, the man who ended another's life with a stone, was in turn smote himself by another wielding a spear. After spears, bows. Swords. Guns. Tanks. Missiles. And on and on Vengeance fed. Growing stronger. Growing Worse.")
. += span_info("Vengeance persists to this day. It sometimes may slumber, seemingly content with having gorged itself, but in the end, its ceaseless hunger can be neither numbed nor sated.")
@@ -25,7 +25,7 @@
/obj/structure/closet/chefcloset
name = "chef's closet"
desc = "It's a storage unit for foodservice garments and mouse traps."
desc = "It's a storage unit for food service garments and mousetraps."
icon_door = "chef_wardrobe"
/obj/structure/closet/chefcloset/PopulateContents()
@@ -351,7 +351,7 @@
/obj/structure/closet/crate/robust
name = "robust industries crate"
desc = "Robust Inustries LLC. crate. Feels oddly nostalgic."
desc = "Robust Industries LLC. crate. Feels oddly nostalgic."
icon_state = "robust"
base_icon_state = "robust"
@@ -195,14 +195,14 @@
/obj/structure/closet/crate/secure/freezer/interdyne
name = "\improper Interdyne freezer"
desc = "This is an Interdyne Pharmauceutics branded freezer. May or may not contain fresh organs."
desc = "This is an Interdyne Pharmaceuticals branded freezer. May or may not contain fresh organs."
icon_state = "interdynefreezer"
base_icon_state = "interdynefreezer"
req_access = list(ACCESS_SYNDICATE)
/obj/structure/closet/crate/secure/freezer/interdyne/blood
name = "\improper Interdyne blood freezer"
desc = "This is an Interdyne Pharmauceutics branded freezer. It's made to contain fresh, high-quality blood."
desc = "This is an Interdyne Pharmaceuticals branded freezer. It's made to contain fresh, high-quality blood."
/obj/structure/closet/crate/secure/freezer/interdyne/blood/PopulateContents()
. = ..()
@@ -272,13 +272,13 @@
base_icon_state = "cyber_duskcrate"
/obj/structure/closet/crate/secure/syndicate/cybersun/night
desc = "A secure crate from Cybersun Industries. This one blatantly adorns syndicate colours. You can only guess it contains equipement for syndicate operatives."
desc = "A secure crate from Cybersun Industries. This one blatantly adorns syndicate colours. You can only guess it contains equipment for syndicate operatives."
icon_state = "cyber_nightcrate"
base_icon_state = "cyber_nightcrate"
/obj/structure/closet/crate/secure/syndicate/wafflecorp
name = "\improper Waffle corp. crate"
desc = "A very outdated model and design of shipment crate with a modern lock strapped on it, how befitting of its brand owner, Waffle Corporation. Golden lettering written in cursive by the logo reads 'bringing you consecutively top five world-wide rated* breakfast since 2055. A much smaller fineprint, also in cursive, clarifies: '*in years 2099-2126'... It's year 2563 now, however."
desc = "A very outdated model and design of shipment crate with a modern lock strapped on it, how befitting of its brand owner, Waffle Corporation. Golden lettering written in cursive by the logo reads 'bringing you consecutively top five world-wide rated* breakfast since 2055. A much smaller fine print, also in cursive, clarifies: '*in years 2099-2126'... It's year 2563 now, however."
icon_state = "wafflecrate"
base_icon_state = "wafflecrate"
+1 -1
View File
@@ -45,7 +45,7 @@
/obj/structure/fans/tiny/shield
name = "shuttle bay shield"
desc = "An tenuously thin energy shield only capable of holding in air, but not solid objects or people."
desc = "A tenuously thin energy shield only capable of holding in air, but not solid objects or people."
icon = 'icons/effects/effects.dmi'
icon_state = "shield-old" // We should probably get these their own icon at some point
light_color = LIGHT_COLOR_BLUE
+1 -1
View File
@@ -372,7 +372,7 @@
if(dramatically_disappearing)
return
//dissapear in 1 second
//disappear in 1 second
dramatically_disappearing = TRUE
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, moveToNullspace)), time_to_go) //woosh
@@ -2,7 +2,7 @@
icon = 'icons/obj/signs.dmi'
icon_state = "blankplaque"
name = "blank plaque"
desc = "A blank plaque, use a fancy pen to engrave it. It can be detatched from the wall with a wrench."
desc = "A blank plaque, use a fancy pen to engrave it. It can be detached from the wall with a wrench."
anchored = TRUE
opacity = FALSE
density = FALSE
@@ -34,7 +34,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/tizira, 32)
/obj/structure/sign/flag/mothic
name = "flag of the Grand Nomad Fleet"
desc = "The flag of the Mothic Grand Nomad Fleet. A classic naval ensign, its use has superceded the old national flag which can be seen in its canton."
desc = "The flag of the Mothic Grand Nomad Fleet. A classic naval ensign, its use has superseded the old national flag which can be seen in its canton."
icon_state = "flag_mothic"
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/mothic, 32)
+1 -1
View File
@@ -450,7 +450,7 @@
// slowly drain our total health for the illusion of shattering
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, take_damage), floor(atom_integrity / (time_to_go / time_interval))), time_interval * damage_step)
//dissapear in 1 second
//disappear in 1 second
dramatically_disappearing = TRUE
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), loc, break_sound, 70, TRUE), time_to_go) //SHATTER SOUND
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, moveToNullspace)), time_to_go) //woosh
+1 -1
View File
@@ -301,7 +301,7 @@
/turf/closed/wall/mineral/titanium/survival
name = "pod wall"
desc = "An easily-compressable wall used for temporary shelter."
desc = "An easily-compressible wall used for temporary shelter."
icon = 'icons/turf/walls/survival_pod_walls.dmi'
icon_state = "survival_pod_walls-0"
base_icon_state = "survival_pod_walls"
+1 -1
View File
@@ -472,7 +472,7 @@
/turf/open/floor/carpet/neon
name = "neon carpet"
desc = "A rubbery pad inset with a phsophorescent pattern."
desc = "A rubbery pad inset with a phosphorescent pattern."
icon = 'icons/turf/floors/carpet_black.dmi'
icon_state = "carpet_black-255"
base_icon_state = "carpet_black"
+1 -1
View File
@@ -349,7 +349,7 @@
/turf/open/floor/iron/tgmcemblem
name = "TGMC Emblem"
desc = "The symbol of the Terran Goverment."
desc = "The symbol of the Terran Government."
icon_state = "tgmc_emblem"
/turf/open/floor/iron/tgmcemblem/center
+1 -1
View File
@@ -705,7 +705,7 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w
T.flick_overlay_static(portal_appearance[GET_TURF_PLANE_OFFSET(T) + 1], 15)
playsound(T, 'sound/effects/magic/lightningbolt.ogg', rand(80, 100), TRUE)
/// Docks the emergency shuttle back to the station and resets its' state
/// Docks the emergency shuttle back to the station and resets its state
/proc/return_escape_shuttle(make_announcement)
if (SSshuttle.emergency.initiate_docking(SSshuttle.getDock("emergency_home"), force = TRUE) != DOCKING_SUCCESS)
message_admins("Emergency shuttle was unable to dock back to the station!")
@@ -1,6 +1,6 @@
/datum/action/changeling/panacea
name = "Anatomic Panacea"
desc = "Expels impurifications from our form; curing diseases, removing parasites, sobering us, purging toxins and radiation, curing traumas and brain damage, and resetting our genetic code completely. Costs 20 chemicals."
desc = "Expels impurities from our form: curing diseases, removing parasites, sobering us, purging toxins and radiation, curing traumas and brain damage, and resetting our genetic code completely. Costs 20 chemicals."
helptext = "Can be used while unconscious."
button_icon_state = "panacea"
chemical_cost = 20
+2 -2
View File
@@ -198,7 +198,7 @@
/datum/action/innate/cult/blood_spell/construction
name = "Twisted Construction"
desc = "Empowers your hand to corrupt certain metalic objects.<br><u>Converts:</u><br>Plasteel into runed metal<br>50 metal into a construct shell<br>Living cyborgs into constructs after a delay<br>Cyborg shells into construct shells<br>Purified soulstones (and any shades inside) into cultist soulstones<br>Airlocks into brittle runed airlocks after a delay (harm intent)"
desc = "Empowers your hand to corrupt certain metallic objects.<br><u>Converts:</u><br>Plasteel into runed metal<br>50 metal into a construct shell<br>Living cyborgs into constructs after a delay<br>Cyborg shells into construct shells<br>Purified soulstones (and any shades inside) into cultist soulstones<br>Airlocks into brittle runed airlocks after a delay (harm intent)"
button_icon_state = "transmute"
magic_path = /obj/item/melee/blood_magic/construction
health_cost = 12
@@ -593,7 +593,7 @@
//Construction: Converts 50 iron to a construct shell, plasteel to runed metal, airlock to brittle runed airlock, a borg to a construct, or borg shell to a construct shell
/obj/item/melee/blood_magic/construction
name = "Twisting Aura"
desc = "Corrupts certain metalic objects on contact."
desc = "Corrupts certain metallic objects on contact."
invocation = "Ethra p'ni dedol!"
color = COLOR_BLACK // black
var/channeling = FALSE
@@ -13,7 +13,7 @@
var/name = "Basic knowledge"
/// Description of the knowledge, shown to the heretic. Describes what it unlocks / does.
var/desc = "Basic knowledge of forbidden arts."
/// What's shown to the heretic when the knowledge is aquired
/// What's shown to the heretic when the knowledge is acquired
var/gain_text
/// The abstract parent type of the knowledge, used in determine mutual exclusivity in some cases
var/datum/heretic_knowledge/abstract_parent_type = /datum/heretic_knowledge
@@ -197,13 +197,13 @@
// Lady out of gates, gives a brain trauma causing the person to scratch themselves
/obj/item/wallframe/painting/eldritch/beauty
name = "\improper Lady of the Gate"
desc = "A painting of an otherworldly being. Its thin, porceline-coloured skin is stretched tight over its strange bone structure. It has an odd beauty."
desc = "A painting of an otherworldly being. Its thin, porcelain-coloured skin is stretched tight over its strange bone structure. It has an odd beauty."
icon_state = "eldritch_painting_beauty"
result_path = /obj/structure/sign/painting/eldritch/beauty
/obj/structure/sign/painting/eldritch/beauty
name = "\improper Lady of the Gate"
desc = "A painting of an otherworldly being. Its thin, porceline-coloured skin is stretched tight over its strange bone structure. It has an odd beauty. Removable with wirecutters."
desc = "A painting of an otherworldly being. Its thin, porcelain-coloured skin is stretched tight over its strange bone structure. It has an odd beauty. Removable with wirecutters."
icon_state = "eldritch_painting_beauty"
applied_trauma = /datum/brain_trauma/severe/eldritch_beauty
text_to_display = "A beacon of purity, the real world seems so mundane and imperfect in comparison..."
@@ -107,7 +107,7 @@
/// The "hand" "weapon" used by shattered risen
/obj/item/mutant_hand/shattered_risen
name = "bone-shards"
desc = "What once appeared to be a normal human fist, now holds a maulled nest of sharp bone-shards."
desc = "What once appeared to be a normal human fist, now holds a mauled nest of sharp bone-shards."
color = "#001aff"
hitsound = SFX_SHATTER
force = 16
@@ -292,21 +292,21 @@
/obj/item/eldritch_potion/crucible_soul
name = "brew of the crucible soul"
desc = "A glass bottle contianing a bright orange, translucent liquid."
desc = "A glass bottle containing a bright orange, translucent liquid."
icon_state = "crucible_soul"
status_effect = /datum/status_effect/crucible_soul
crucible_tip = "Allows you to walk through walls. After expiring, you are teleported to your original location. Lasts 15 seconds."
/obj/item/eldritch_potion/duskndawn
name = "brew of dusk and dawn"
desc = "A glass bottle contianing a dull yellow liquid. It seems to fade in and out with regularity."
desc = "A glass bottle containing a dull yellow liquid. It seems to fade in and out with regularity."
icon_state = "clarity"
status_effect = /datum/status_effect/duskndawn
crucible_tip = "Allows you to see through walls and objects. Lasts 90 seconds."
/obj/item/eldritch_potion/wounded
name = "brew of the wounded soldier"
desc = "A glass bottle contianing a colorless, dark liquid."
desc = "A glass bottle containing a colorless, dark liquid."
icon_state = "marshal"
status_effect = /datum/status_effect/marshal
crucible_tip = "Causes all wounds you are experiencing to begin to heal you. Fractures, sprains, cuts, and punctures will heal bruises, \
@@ -24,7 +24,7 @@
var/limit
/// Is this refundable?
var/refundable = TRUE
/// Flavor. Verb used in saying how the spell is aquired. Ex "[Learn] Fireball" or "[Summon] Ghosts"
/// Flavor. Verb used in saying how the spell is acquired. Ex "[Learn] Fireball" or "[Summon] Ghosts"
var/buy_word = "Learn"
/// The cooldown of the spell
var/cooldown
@@ -116,7 +116,7 @@
/datum/spellbook_entry/item/staffchaos
name = "Staff of Chaos"
desc = "A caprious tool that can fire all sorts of magic without any rhyme or reason. Using it on people you care about is not recommended."
desc = "A capricious tool that can fire all sorts of magic without any rhyme or reason. Using it on people you care about is not recommended."
item_path = /obj/item/gun/magic/staff/chaos
category = SPELLBOOK_CATEGORY_OFFENSIVE
@@ -280,7 +280,7 @@
for(var/entry in wanted_spells)
if(!ispath(entry, /datum/spellbook_entry))
stack_trace("Wizard Loadout \"[loadout]\" had an non-spellbook_entry type in its wanted spells list. ([entry])")
stack_trace("Wizard Loadout \"[loadout]\" had a non-spellbook_entry type in its wanted spells list. ([entry])")
continue
var/datum/spellbook_entry/to_buy = locate(entry) in entries

Some files were not shown because too many files have changed in this diff Show More