Skip to content

Commit

Permalink
Rename Disinfectant to Antiseptic (CleverRaven#33387)
Browse files Browse the repository at this point in the history
* disinfectant to antiseptic in GUIDE_COMESTIBLES

* rename desinfectant to antiseptic

* helps text use antiseptic

* replace disinfectant with antiseptic
  • Loading branch information
Fris0uman authored and misterprimus committed Sep 21, 2019
1 parent b3bad16 commit 3b030b6
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion GUIDE_COMESTIBLES.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
There are a large number of files in `json/items/comestibles`, and this guide will help you decide where to put your new comestible!

## List of special comestibles:
`med.json` -- comestible that has an addiction effect besides alcohol and caffeine, plus bandages and disinfectant type items.
`med.json` -- comestible that has an addiction effect besides alcohol and caffeine, plus bandages and antiseptic type items.

`mre.json` -- items and comestibles related to MREs

Expand Down
2 changes: 1 addition & 1 deletion data/core/tips.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
{
"type": "snippet",
"category": "tip",
"text": [ "Wounds heal over time. Bandages and disinfectant speeds that up." ]
"text": [ "Wounds heal over time. Bandages and antiseptic speeds that up." ]
},
{
"type": "snippet",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/chemicals_and_resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,7 @@
"fun": -20,
"color": "light_cyan",
"container": "bottle_glass",
"description": "This useful stuff is a potent solvent and has a wide range of reactive applications. It can be used to make a huge number of plastics and polymers, it can be a disinfectant, it can strip paint and break down epoxy, and it can burn your skin away like tissue paper under a heat gun. Wear gloves.",
"description": "This useful stuff is a potent solvent and has a wide range of reactive applications. It can be used to make a huge number of plastics and polymers, it can be an antiseptic, it can strip paint and break down epoxy, and it can burn your skin away like tissue paper under a heat gun. Wear gloves.",
"volume": "1 ml",
"phase": "liquid"
},
Expand Down
28 changes: 14 additions & 14 deletions data/json/items/comestibles/med.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
"comestible_type": "MED",
"name": "antiseptic powder",
"name_plural": "antiseptic powder",
"description": "A powdered form of chemical disinfectant, this bismuth formic iodide cleans wounds quickly and painlessly.",
"description": "A powdered form of chemical antiseptic, this bismuth formic iodide cleans wounds quickly and painlessly.",
"weight": 6,
"volume": "250 ml",
"price": 900,
Expand Down Expand Up @@ -254,7 +254,7 @@
"comestible_type": "MED",
"name": "hydrogen peroxide",
"name_plural": "hydrogen peroxide",
"description": "Dilute hydrogen peroxide, for use as a disinfectant and for bleaching hair or textiles. Foams a little when in contact with organic matter, but otherwise harmless.",
"description": "Dilute hydrogen peroxide, for use as an antiseptic and for bleaching hair or textiles. Foams a little when in contact with organic matter, but otherwise harmless.",
"weight": 28,
"volume": "250 ml",
"price": 100,
Expand Down Expand Up @@ -488,8 +488,8 @@
"id": "disinfectant",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": "disinfectant",
"description": "A powerful disinfectant commonly used for contaminated wounds.",
"name": "antispetic",
"description": "A powerful antiseptic commonly used for contaminated wounds.",
"weight": 27,
"volume": "250 ml",
"price": 1500,
Expand All @@ -504,9 +504,9 @@
{
"id": "disinfectant_makeshift",
"type": "COMESTIBLE",
"name": "makeshift disinfectant",
"copy-from": "disinfectant",
"description": "Makeshift disinfectant made from ethanol. Can be used to disinfect a wound.",
"name": "makeshift antiseptic",
"copy-from": "antiseptic",
"description": "Makeshift anitseptic made from ethanol. Can be used to disinfect a wound.",
"flags": [ "NO_INGEST" ],
"use_action": { "type": "heal", "disinfectant_power": 3, "bite": 0.95, "move_cost": 100 }
},
Expand Down Expand Up @@ -1046,7 +1046,7 @@
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": "thyme oil",
"description": "Some essential oil made from thyme, which can act as a mildly irritating disinfectant.",
"description": "Some essential oil made from thyme, which can act as a mildly irritating antiseptic.",
"weight": 40,
"volume": "250 ml",
"price": 0,
Expand Down Expand Up @@ -1311,9 +1311,9 @@
"id": "disinrag",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": "disinfectant soaked rag",
"name_plural": "disinfectant soaked rags",
"description": "A rag soaked in disinfectant. Useful for light wounds, probaby won't help with deep bites.",
"name": "antiseptic soaked rag",
"name_plural": "antiseptic soaked rags",
"description": "A rag soaked in antiseptic. Useful for light wounds, probaby won't help with deep bites.",
"weight": 80,
"//": "Can't copy-from rag, it breaks the stacking for some reason!",
"volume": "250 ml",
Expand All @@ -1334,9 +1334,9 @@
"id": "disincotton_ball",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": "disinfectant soaked cotton balls",
"name_plural": "disinfectant soaked cotton balls",
"description": "Fluffy balls of clean white cotton. Now soaked with disinfectant, they are somewhat useful to disinfect a wound.",
"name": "antiseptic soaked cotton balls",
"name_plural": "antiseptic soaked cotton balls",
"description": "Fluffy balls of clean white cotton. Now soaked with antiseptic, they are somewhat useful to disinfect a wound.",
"weight": 25,
"//": "Can't copy-from cotton_ball, breaks volume",
"volume": "125 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/npcs/TALK_ALLY_TUTORIAL.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@
"and": [
{
"npc_has_trait": "PROF_MED",
"yes": "Hey, I'm a doctor! I know how to treat trauma. You give me some bandages or a bottle of disinfectant, I'm get you fixed when I see you hurting.",
"no": "Yeah, I can perform first aid. You give me some bandages or a bottle of disinfectant, I'll treat your wounds as best I can."
"yes": "Hey, I'm a doctor! I know how to treat trauma. You give me some bandages or a bottle of antiseptic, I'm get you fixed when I see you hurting.",
"no": "Yeah, I can perform first aid. You give me some bandages or a bottle of antiseptic, I'll treat your wounds as best I can."
},
" But remember, I like you, but I like me more - so I'm going to use those items on myself first, then you, then any of your other friends."
]
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/hints.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"It's a good idea to carry around a couple of empty bottles. You can fill them up with water, gasoline, or whatever!",
"First aid 101 for you. Always bandage your wounds, they will heal faster that way. Bandages are plenty and you can make makeshift ones easily, so there is no reason not to.",
"I can bandage you if you are wounded, so give me some spare bandages, if you have any.",
"If you have extra disinfectant, use it to disinfect your wounds, even if they aren't infected. They will recover faster that way.",
"If you have extra antiseptic, use it to disinfect your wounds, even if they aren't infected. They will recover faster that way.",
"Treat your infected wounds as soon as possible. If the infection spreads only antibiotics may help you, but it will take time, and you may still die from it if it's too serious.",
"If you need a bunch of rags for making Molotov cocktails, take a pair of scissors to an old t-shirt or something.",
"Carrying a lighter is something all veterans do. It takes up almost no space, and can easily save your life.",
Expand Down

0 comments on commit 3b030b6

Please sign in to comment.