Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some conflicting profession clothes, add MD trait where appropriate #44622

Merged
merged 4 commits into from
Oct 7, 2020
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions data/json/professions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4166,6 +4166,7 @@
{ "level": 1, "name": "electronics" },
{ "level": 3, "name": "firstaid" }
],
"traits": [ "PROF_MED" ],
"vehicle": "ambulance",
"items": {
"both": {
Expand All @@ -4183,6 +4184,7 @@
"description": "You were separated from your partner while out on a call. You managed to hang onto some medical supplies, but it's looking like the only life that needs saving now is yours.",
"points": 3,
"skills": [ { "level": 2, "name": "driving" }, { "level": 1, "name": "mechanics" }, { "level": 5, "name": "firstaid" } ],
"traits": [ "PROF_MED" ],
"items": {
"both": {
"items": [
Expand Down Expand Up @@ -4221,6 +4223,7 @@
{ "level": 1, "name": "dodge" },
{ "level": 4, "name": "firstaid" }
],
"traits": [ "PROF_MED" ],
"items": {
"both": {
"items": [
Expand Down Expand Up @@ -4314,16 +4317,11 @@
"socks",
"motorbike_boots",
"gloves_leather",
"wristwatch",
"motorbike_armor"
"wristwatch"
],
"entries": [ { "group": "charged_smart_phone" } ]
},
"male": [ "boxer_shorts" ],
"female": [ "sports_bra", "boy_shorts" ]
}
},
{
}
},
ZhilkinSerg marked this conversation as resolved.
Show resolved Hide resolved
"type": "profession",
"id": "mili_burner",
"name": "Military Corpse Disposal",
Expand Down