Skip to content

Commit

Permalink
Fix a few typos pre 0.E (CleverRaven#37359)
Browse files Browse the repository at this point in the history
Fix a few typos pre 0.E
  • Loading branch information
Cyrano7 authored and I-am-Erk committed Jan 24, 2020
1 parent e258c46 commit 8fd783c
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ The source can either be downloaded as [an archive](https://github.com/CleverRav

### Arch Linux

Ncurses and tiles version avaliable in [Community repo](https://www.archlinux.org/packages/?q=cataclysm-dda)
Ncurses and tiles version available in [Community repo](https://www.archlinux.org/packages/?q=cataclysm-dda)

`sudo pacman -S cataclysm-dda`

### Fedora

Ncurses and tiles version avaliable in [official repos](https://src.fedoraproject.org/rpms/cataclysm-dda)
Ncurses and tiles version available in [official repos](https://src.fedoraproject.org/rpms/cataclysm-dda)

`sudo dnf install cataclysm-dda`

Expand Down
4 changes: 2 additions & 2 deletions data/json/items/containers.json
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,7 @@
"type": "CONTAINER",
"category": "container",
"name": "large tin can",
"description": "A large tin can, like what beans come in. Holds a substantial amount of food.",
"description": "A large tin can, like what beans come in. Holds a substantial amount of food.",
"weight": "350 g",
"volume": "3L",
"price": 0,
Expand All @@ -1191,7 +1191,7 @@
"copy-from": "can_food_big",
"type": "CONTAINER",
"name": "opened large tin can",
"description": "A large tin can, like what beans come in. This one is opened and can't be easily sealed.",
"description": "A large tin can, like what beans come in. This one is opened and can't be easily sealed.",
"symbol": ")",
"color": "blue",
"preserves": false,
Expand Down
8 changes: 4 additions & 4 deletions data/json/mapgen/private_resort.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
],
"palettes": [ "p_resort_palette_main_floor" ],
"place_signs": [
{ "signage": "Private property. No trepassing!", "x": 4, "y": 0 },
{ "signage": "Private property. No trepassing!", "x": 18, "y": 0 }
{ "signage": "Private property. No trespassing!", "x": 4, "y": 0 },
{ "signage": "Private property. No trespassing!", "x": 18, "y": 0 }
],
"place_items": [
{ "chance": 40, "item": "alcohol", "x": 7, "y": 13, "repeat": [ 2, 8 ] },
Expand Down Expand Up @@ -446,8 +446,8 @@
],
"palettes": [ "p_resort_palette_main_floor" ],
"place_signs": [
{ "signage": "Private property. No trepassing!", "x": 8, "y": 24 },
{ "signage": "Private property. No trepassing!", "x": 17, "y": 24 }
{ "signage": "Private property. No trespassing!", "x": 8, "y": 24 },
{ "signage": "Private property. No trespassing!", "x": 17, "y": 24 }
],
"place_vehicles": [ { "vehicle": "limousine", "x": 11, "y": 18, "chance": 75, "rotation": 90, "status": -1 } ],
"place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 2 ], "density": 0.75 } ]
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsters/fungus.json
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@
"type": "MONSTER",
"name": "fungal juggernaut",
"looks_like": "mon_skeleton_hulk",
"description": "Fungi bloom from the crevices in the ossified plates of this ponderous bone titan, and it seems even it's eyes are lost to it. A dust of spores lands on the ground with every sluggish stomp of it's heavy legs.",
"description": "Fungi bloom from the crevices in the ossified plates of this ponderous bone titan, and it seems even it's eyes are lost to it. A dust of spores lands on the ground with every sluggish stomp of it's heavy legs.",
"default_faction": "fungus",
"bodytype": "human",
"species": [ "FUNGUS" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/mutations/mutations.json
Original file line number Diff line number Diff line change
Expand Up @@ -6525,7 +6525,7 @@
"id": "WAYFARER",
"name": "Wayfarer",
"points": -8,
"description": "Whether from personal choice or childhood trauma, travelling with vehicles is off-limits to you, even if your life depended on it.",
"description": "Whether from personal choice or childhood trauma, traveling with vehicles is off-limits to you, even if your life depended on it.",
"starting_trait": true,
"valid": false
}
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/factions.json
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,6 @@
"hells_raiders": { "kill on sight": true },
"marloss": { "kill on sight": true }
},
"description": "A small group of churchgoers that formed a community in the woods. They welcome anyone in their faction, but hate the unnatural."
"description": "A small group of churchgoers that formed a community in the woods. They welcome anyone in their faction, but hate the unnatural."
}
]
2 changes: 1 addition & 1 deletion data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
{
"type": "talk_topic",
"id": "TALK_CHRIS_THEORIES",
"dynamic_line": "In one of my longer trips looking for Barry, I saw something out in a field. I didn't get close but I swear unbelievable monsters were coming out of it. It kinda shimmered, almost like it wasn't quite there. I've been tracking those monsters for a while…",
"dynamic_line": "In one of my longer trips looking for Barry, I saw something out in a field. I didn't get close but I swear unbelievable monsters were coming out of it. It kinda shimmered, almost like it wasn't quite there. I've been tracking those monsters for a while…",
"responses": [
{ "text": "What did you find?", "topic": "TALK_ISHERWOOD_CHRIS_MIGO_BASE" },
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CHRIS_TOPICS" },
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
{
"type": "talk_topic",
"id": "TALK_EDDIE_LUKE",
"dynamic_line": "Luke was going to start college this year, now everything is upside down. He is adaptable though, had an idea to begin manufacturing our own jars and pottery. He's out in the old outbuilding right now, cleaning up the place.",
"dynamic_line": "Luke was going to start college this year, now everything is upside down. He is adaptable though, had an idea to begin manufacturing our own jars and pottery. He's out in the old outbuilding right now, cleaning up the place.",
"speaker_effect": { "effect": { "u_add_var": "u_heard_about_luke", "type": "general", "context": "meeting", "value": "yes" } },
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_EDDIE_TOPICS" },
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
{
"type": "talk_topic",
"id": "TALK_JACK_DAUGHTER",
"dynamic_line": "Jesse and her family live up at the horse farm. Her husband, Carlos, may have some jobs for you.",
"dynamic_line": "Jesse and her family live up at the horse farm. Her husband, Carlos, may have some jobs for you.",
"speaker_effect": { "effect": { "u_add_var": "u_learned_about_jesse", "type": "general", "context": "meeting", "value": "yes" } },
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_JACK_TOPICS" },
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
{
"type": "talk_topic",
"id": "TALK_ISHERWOOD_LUKE2",
"dynamic_line": "I've been cleaning up this old building to make it into a workshop. I want to put up a pottery kiln and forge. My dad doesn't want me leaving the farm to find some things, says it is too dangerous.",
"dynamic_line": "I've been cleaning up this old building to make it into a workshop. I want to put up a pottery kiln and forge. My dad doesn't want me leaving the farm to find some things, says it is too dangerous.",
"responses": [
{ "text": "What do you need?", "topic": "TALK_MISSION_LIST" },
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" },
Expand Down
4 changes: 2 additions & 2 deletions data/json/snippets/fliers.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
},
{
"id": "flier_13",
"text": "This is a government-issued, air-dropped alert. \"EVACUATION ALERT. Please make your way to the nearest FEMA evacuation shelter. Avoid crowds. Looters and rioters may turn violent against unarmed civilians. Seek protection from police and military forces if travelling in groups.\""
"text": "This is a government-issued, air-dropped alert. \"EVACUATION ALERT. Please make your way to the nearest FEMA evacuation shelter. Avoid crowds. Looters and rioters may turn violent against unarmed civilians. Seek protection from police and military forces if traveling in groups.\""
},
{
"id": "flier_14",
"text": "This is a government-issued, air-dropped alert. \"EVACUATION ALERT. Please make your way to the nearest FEMA evacuation shelter. Travel in groups and avoid crowds. This is believed to be a biological agent that causes violent behaviour: do not attempt to engage looters or rioters.\""
"text": "This is a government-issued, air-dropped alert. \"EVACUATION ALERT. Please make your way to the nearest FEMA evacuation shelter. Travel in groups and avoid crowds. This is believed to be a biological agent that causes violent behavior: do not attempt to engage looters or rioters.\""
},
{
"id": "flier_15",
Expand Down
4 changes: 2 additions & 2 deletions data/json/snippets/newspapers.json
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
},
{
"id": "months_old_news_3",
"text": "SPIKE IN MENTAL HEALTH CONCERNS HAS EPIDEMIOLOGISTS WORRIED. \"There's no doubt about it,\" said a spokesperson from Mount Sinai Hospital. \"Hospitals over the US are overwhelmed with an increase in psychiatrically-related violent behaviour such as explosivity and aggressive paranoia. The most likely cause is a new street drug; we have yet to identify any commonality between the affected people.\"\n\nDr. Andrew Morton, a Harvard epidemiologist, has a different opinion. \"These people aren't drug users. They're coming from all walks of life. Sure, there's a predilection for people who already have some mental illness, but we're seeing perfectly normal people suddenly presenting with violent explosive behaviour. I think the most likely cause is infectious: no other pattern would fit this widespread an outbreak.\""
"text": "SPIKE IN MENTAL HEALTH CONCERNS HAS EPIDEMIOLOGISTS WORRIED. \"There's no doubt about it,\" said a spokesperson from Mount Sinai Hospital. \"Hospitals over the US are overwhelmed with an increase in psychiatrically-related violent behavior such as explosivity and aggressive paranoia. The most likely cause is a new street drug; we have yet to identify any commonality between the affected people.\"\n\nDr. Andrew Morton, a Harvard epidemiologist, has a different opinion. \"These people aren't drug users. They're coming from all walks of life. Sure, there's a predilection for people who already have some mental illness, but we're seeing perfectly normal people suddenly presenting with violent explosive behavior. I think the most likely cause is infectious: no other pattern would fit this widespread an outbreak.\""
},
{
"id": "months_old_news_4",
Expand Down Expand Up @@ -399,7 +399,7 @@
},
{
"id": "newest_news_11",
"text": "THEY'RE NOT RIOTS! According to head officials at the Centers for Disease Control, functional MRI studies of rioters have fit autopsy data that suggests these people are under the influence of some sort of mind-altering agent causing erratic, violent behaviour. A source inside the CDC, who did not wish to be named, informed our reporter \"It's not just the rioters. They're the heaviest affected, but we scanned our own brains when we found out. It's everyone. It's in me, and you. It's in the government. The military. God help us all.\""
"text": "THEY'RE NOT RIOTS! According to head officials at the Centers for Disease Control, functional MRI studies of rioters have fit autopsy data that suggests these people are under the influence of some sort of mind-altering agent causing erratic, violent behavior. A source inside the CDC, who did not wish to be named, informed our reporter \"It's not just the rioters. They're the heaviest affected, but we scanned our own brains when we found out. It's everyone. It's in me, and you. It's in the government. The military. God help us all.\""
},
{
"id": "newest_news_12",
Expand Down
2 changes: 1 addition & 1 deletion data/json/snippets/radio.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"kssht. Dark Horse, this is Blue Jay, what's your status, over. kssht. Blue Jay, this is Black Horse, still holding, but not for long. kssht. Dark Horse, you've got to hold position for 3 hours. We're almost black on ammo, but resupply is on the way, over. kssht. Not possible Blue Jay, too many dead. 30 minutes max, and if you don't order us to retreat we're gone, over. kssht.",
"kssht. Blue Jay, this is Black Rose, got your resupply, going in on vector 36, what's the status of the LZ? kssht. Black Rose, this is Blue Jay, what took you so long? LZ hot and unsecured, ammo black, bayonets in action, land on your own discretion, over. kssht. Roger that, hold on, Black Rose out. kssht.",
"To whomever is listening, this may be our last broadcast. Wish you luck. Can't stay in the studio any longer, station is being rewired to military frequencies for automatic broadcast. Stay safe, and bless you, people.",
"You're listening to KDDA from Boston, I'm Jenny Sanders with a special emergency news update. Road closures by military and police forces have been reported on interstates 90, 91, 93, and 95. Alternative routes have not been suggested. Due to dangers on non-interstate roads, it is strongly recommended that you avoid major thoroughfares and population centers when travelling by car.",
"You're listening to KDDA from Boston, I'm Jenny Sanders with a special emergency news update. Road closures by military and police forces have been reported on interstates 90, 91, 93, and 95. Alternative routes have not been suggested. Due to dangers on non-interstate roads, it is strongly recommended that you avoid major thoroughfares and population centers when traveling by car.",
"Those evacuating cities are advised to head to the nearest designated evacuation shelter and await pickup by a FEMA transport. Do not engage with rioters. Due to the danger of being mistaken for a rioter, do not approach military or police blockades, even for assistance. I repeat, do not approach military or police blockades, even for assistance.",
"If you are not in an evacuation zone, officials highly recommend you pack gear for evacuation. Make sure to include clean clothes, a blanket, and enough food and water to last a few days.",
"In other news, the federal government has confirmed that Rhode Island's declaration of secession is official, although the US government does not acknowledge its validity. Our sources haven't been able to determine the extent of hostilities in the area, but there are rumors of border violence initiated by the Rhode Island militia.",
Expand Down
4 changes: 2 additions & 2 deletions data/json/vehicleparts/wheel.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"broken_color": "light_gray",
"damage_modifier": 80,
"durability": 120,
"description": "Connection where wheels can be connected on. This particular one is fit for normal car wheels.",
"description": "Connection where wheels can be connected on. This particular one is fit for normal car wheels.",
"item": "wheel_mount_medium",
"requirements": {
"install": { "skills": [ [ "mechanics", 4 ] ], "time": "45 m", "using": [ [ "welding_standard", 10 ], [ "vehicle_bolt", 1 ] ] },
Expand Down Expand Up @@ -69,7 +69,7 @@
"broken_color": "light_gray",
"damage_modifier": 80,
"durability": 120,
"description": "Connection where wheels can be connected on. This particular one is fit for large car wheels.",
"description": "Connection where wheels can be connected on. This particular one is fit for large car wheels.",
"item": "wheel_mount_heavy",
"requirements": {
"install": { "skills": [ [ "mechanics", 5 ] ], "time": "60 m", "using": [ [ "welding_standard", 15 ], [ "vehicle_bolt", 1 ] ] },
Expand Down

0 comments on commit 8fd783c

Please sign in to comment.