Skip to content

Commit 5744141

Browse files
Tektolnesgithub-actions[bot]
Tektolnes
and
github-actions[bot]
authored
Military ponchos & woobies (#84534)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent f02b4fc commit 5744141

File tree

7 files changed

+216
-4
lines changed

7 files changed

+216
-4
lines changed

‎data/json/itemgroups/Locations_MapExtras/locations.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2652,6 +2652,9 @@
26522652
{ "item": "gloves_tactical", "prob": 10 },
26532653
{ "group": "military_ballistic_vest", "prob": 10 },
26542654
{ "group": "clothing_tactical_leg", "prob": 5 },
2655+
{ "item": "military_poncho", "prob": 40 },
2656+
{ "item": "military_poncho_heavy", "prob": 40 },
2657+
{ "item": "military_poncho_liner", "prob": 40 },
26552658
{
26562659
"distribution": [
26572660
{ "collection": [ { "item": "sports_bra" }, { "item": "boy_shorts" } ] },

‎data/json/itemgroups/Locations_MapExtras/robofac_trade.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
{ "item": "robofac_head_rig" },
2020
{ "item": "robofac_head_rig_nv" },
2121
{ "item": "hm12" },
22+
{ "item": "robofac_poncho_liner" },
2223
{ "item": "template_armor" },
2324
{ "item": "template_photonics" }
2425
]
@@ -96,7 +97,8 @@
9697
[ "robofac_rubber_helmet", 25 ],
9798
[ "robofac_nomex_helmet", 25 ],
9899
[ "robofac_kevlar_helmet", 25 ],
99-
[ "robofac_head_rig", 25 ]
100+
[ "robofac_head_rig", 25 ],
101+
[ "robofac_poncho_liner", 25 ]
100102
]
101103
},
102104
{

‎data/json/itemgroups/military.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,9 @@
461461
"subtype": "collection",
462462
"entries": [
463463
{ "item": "e_tool", "prob": 60 },
464+
{ "item": "military_poncho", "prob": 40 },
465+
{ "item": "military_poncho_heavy", "prob": 40 },
466+
{ "item": "military_poncho_liner", "prob": 40 },
464467
{ "group": "gasmask_bag_full", "prob": 20 },
465468
{ "group": "military_papr_kit", "prob": 5 },
466469
{ "item": "two_way_radio", "prob": 60, "charges": [ 0, 100 ] },
@@ -474,6 +477,9 @@
474477
"subtype": "collection",
475478
"entries": [
476479
{ "item": "e_tool", "prob": 60 },
480+
{ "item": "military_poncho", "prob": 40 },
481+
{ "item": "military_poncho_heavy", "prob": 40 },
482+
{ "item": "military_poncho_liner", "prob": 40 },
477483
{ "group": "gasmask_bag_full", "prob": 20 },
478484
{ "group": "military_papr_kit", "prob": 5 },
479485
{ "item": "two_way_radio", "prob": 60, "charges": [ 0, 100 ] },
@@ -581,6 +587,9 @@
581587
"subtype": "distribution",
582588
"entries": [
583589
{ "item": "jumpsuit", "variant": "green", "prob": 40 },
590+
{ "item": "military_poncho", "prob": 40 },
591+
{ "item": "military_poncho_heavy", "prob": 40 },
592+
{ "item": "military_poncho_liner", "prob": 40 },
584593
{ "item": "officer_uniform", "prob": 20 },
585594
{ "item": "flight_helmet", "prob": 5, "charges": [ 0, 100 ] },
586595
{ "item": "mil_flight_suit", "prob": 30 },
@@ -642,6 +651,7 @@
642651
"subtype": "distribution",
643652
"entries": [
644653
{ "item": "blanket", "prob": 70 },
654+
{ "item": "military_poncho_liner", "prob": 20 },
645655
{ "item": "pillow", "prob": 70 },
646656
{ "item": "sheet", "prob": 70 },
647657
{ "item": "mag_porn", "prob": 40 },
@@ -745,6 +755,9 @@
745755
{ "item": "boots_combat", "prob": 10 },
746756
{ "item": "gloves_tactical", "prob": 10 },
747757
{ "item": "jumpsuit", "variant": "green", "prob": 20 },
758+
{ "item": "military_poncho", "prob": 20 },
759+
{ "item": "military_poncho_heavy", "prob": 20 },
760+
{ "item": "military_poncho_liner", "prob": 20 },
748761
{ "item": "kevlar", "prob": 10 },
749762
{ "item": "officer_uniform", "prob": 5 },
750763
{ "item": "combo_cover", "prob": 5 },

‎data/json/items/armor/cloaks.json‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2087,6 +2087,133 @@
20872087
{ "covers": [ "arm_l", "arm_r" ], "specifically_covers": [ "arm_lower_l", "arm_lower_r" ], "coverage": 90 }
20882088
]
20892089
},
2090+
{
2091+
"id": "military_poncho",
2092+
"type": "ITEM",
2093+
"subtypes": [ "ARMOR" ],
2094+
"category": "clothing",
2095+
"looks_like": "cloak",
2096+
"symbol": "[",
2097+
"color": "dark_gray",
2098+
"name": { "str": "military poncho" },
2099+
"description": "A standard issue, lightweight nylon poncho with a hood. It has a cinch cord around the hood and grommets to attach a liner, or to use it as a standard tarp.",
2100+
"price": "50 USD",
2101+
"price_postapoc": "50 cent",
2102+
"material": [ "nylon" ],
2103+
"weight": "450 g",
2104+
"volume": "2300 ml",
2105+
"flags": [ "RAINPROOF", "HOOD", "OVERSIZE", "OUTER" ],
2106+
"environmental_protection": 2,
2107+
"material_thickness": 0.2,
2108+
"pocket_data": [
2109+
{
2110+
"pocket_type": "CONTAINER",
2111+
"ablative": true,
2112+
"volume_encumber_modifier": 0,
2113+
"max_contains_volume": "4000 ml",
2114+
"max_contains_weight": "900 g",
2115+
"moves": 200,
2116+
"description": "Grommets for a poncho liner.",
2117+
"item_restriction": [ "military_poncho_liner", "robofac_poncho_liner" ]
2118+
}
2119+
],
2120+
"armor": [
2121+
{ "encumbrance": 2, "covers": [ "torso" ], "specifically_covers": [ "torso_upper", "torso_lower" ], "coverage": 100 },
2122+
{
2123+
"encumbrance": 2,
2124+
"covers": [ "arm_l", "arm_r" ],
2125+
"specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_r", "arm_upper_l", "arm_elbow_r", "arm_elbow_l" ],
2126+
"coverage": 100
2127+
},
2128+
{ "covers": [ "arm_l", "arm_r" ], "specifically_covers": [ "arm_lower_l", "arm_lower_r" ], "coverage": 90 },
2129+
{
2130+
"coverage": 100,
2131+
"covers": [ "leg_l", "leg_r" ],
2132+
"specifically_covers": [ "leg_hip_l", "leg_hip_r", "leg_upper_r", "leg_upper_l" ]
2133+
}
2134+
]
2135+
},
2136+
{
2137+
"id": "military_poncho_heavy",
2138+
"type": "ITEM",
2139+
"subtypes": [ "ARMOR" ],
2140+
"category": "clothing",
2141+
"looks_like": "cloak",
2142+
"symbol": "[",
2143+
"color": "dark_gray",
2144+
"name": { "str": "heavy military poncho" },
2145+
"description": "A standard issue, heavy nylon poncho with a hood. It has a cinch cord around the hood and grommets to attach a liner, or to use it as a standard tarp.",
2146+
"price": "50 USD",
2147+
"price_postapoc": "50 cent",
2148+
"material": [ "nylon" ],
2149+
"weight": "1100 g",
2150+
"volume": "3800 ml",
2151+
"flags": [ "RAINPROOF", "HOOD", "OVERSIZE", "OUTER", "STURDY" ],
2152+
"environmental_protection": 4,
2153+
"warmth": 5,
2154+
"material_thickness": 0.4,
2155+
"pocket_data": [
2156+
{
2157+
"pocket_type": "CONTAINER",
2158+
"ablative": true,
2159+
"volume_encumber_modifier": 0,
2160+
"max_contains_volume": "4000 ml",
2161+
"max_contains_weight": "900 g",
2162+
"moves": 200,
2163+
"description": "Grommets for a poncho liner.",
2164+
"item_restriction": [ "military_poncho_liner", "robofac_poncho_liner" ]
2165+
}
2166+
],
2167+
"armor": [
2168+
{ "encumbrance": 4, "covers": [ "torso" ], "specifically_covers": [ "torso_upper", "torso_lower" ], "coverage": 100 },
2169+
{
2170+
"encumbrance": 4,
2171+
"covers": [ "arm_l", "arm_r" ],
2172+
"specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_r", "arm_upper_l", "arm_elbow_r", "arm_elbow_l" ],
2173+
"coverage": 100
2174+
},
2175+
{ "covers": [ "arm_l", "arm_r" ], "specifically_covers": [ "arm_lower_l", "arm_lower_r" ], "coverage": 90 },
2176+
{
2177+
"coverage": 100,
2178+
"covers": [ "leg_l", "leg_r" ],
2179+
"specifically_covers": [ "leg_hip_l", "leg_hip_r", "leg_upper_r", "leg_upper_l" ]
2180+
}
2181+
]
2182+
},
2183+
{
2184+
"id": "military_poncho_liner",
2185+
"type": "ITEM",
2186+
"subtypes": [ "ARMOR" ],
2187+
"category": "clothing",
2188+
"symbol": "[",
2189+
"color": "dark_gray",
2190+
"name": { "str": "military poncho liner" },
2191+
"description": "Often called a \"woobie\" by soldiers, this sleeping bag-like poncho liner can be attached under a poncho or used as a blanket. The synthetic stuffing makes it quite warm.",
2192+
"price": "50 USD",
2193+
"price_postapoc": "50 cent",
2194+
"material": [ "nylon" ],
2195+
"weight": "900 g",
2196+
"volume": "4000 ml",
2197+
"warmth": 50,
2198+
"flags": [ "OVERSIZE", "OUTER", "SOFT" ],
2199+
"environmental_protection": 4,
2200+
"material_thickness": 0.4,
2201+
"armor": [
2202+
{ "encumbrance": 15, "covers": [ "torso" ], "specifically_covers": [ "torso_upper", "torso_lower" ], "coverage": 100 },
2203+
{
2204+
"encumbrance": 15,
2205+
"covers": [ "arm_l", "arm_r" ],
2206+
"specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_r", "arm_upper_l", "arm_elbow_r", "arm_elbow_l" ],
2207+
"coverage": 100
2208+
},
2209+
{ "covers": [ "arm_l", "arm_r" ], "specifically_covers": [ "arm_lower_l", "arm_lower_r" ], "coverage": 90 },
2210+
{
2211+
"coverage": 100,
2212+
"covers": [ "leg_l", "leg_r" ],
2213+
"specifically_covers": [ "leg_hip_l", "leg_hip_r", "leg_upper_r", "leg_upper_l" ]
2214+
}
2215+
]
2216+
},
20902217
{
20912218
"id": "coat_straw",
20922219
"type": "ITEM",

‎data/json/items/armor/robofac_armor.json‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,16 @@
9393
"robofac_gun_exodii",
9494
"robofac_gun_57"
9595
]
96+
},
97+
{
98+
"pocket_type": "CONTAINER",
99+
"ablative": true,
100+
"volume_encumber_modifier": 0,
101+
"max_contains_volume": "4000 ml",
102+
"max_contains_weight": "900 g",
103+
"moves": 200,
104+
"description": "Grommets for a poncho liner.",
105+
"item_restriction": [ "military_poncho_liner", "robofac_poncho_liner" ]
96106
}
97107
],
98108
"armor": [
@@ -203,6 +213,16 @@
203213
"rigid": true,
204214
"flag_restriction": [ "BATTERY_MEDIUM" ],
205215
"default_magazine": "medium_battery_cell"
216+
},
217+
{
218+
"pocket_type": "CONTAINER",
219+
"ablative": true,
220+
"volume_encumber_modifier": 0,
221+
"max_contains_volume": "4000 ml",
222+
"max_contains_weight": "900 g",
223+
"moves": 200,
224+
"description": "Grommets for a poncho liner.",
225+
"item_restriction": [ "military_poncho_liner", "robofac_poncho_liner" ]
206226
}
207227
],
208228
"use_action": {
@@ -1032,5 +1052,40 @@
10321052
"armor": [
10331053
{ "encumbrance": [ 10, 30 ], "coverage": 95, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] }
10341054
]
1055+
},
1056+
{
1057+
"id": "robofac_poncho_liner",
1058+
"//": "made of metallized polyethylene terephthalate, or MPET, so basically an emergency blanket",
1059+
"type": "ITEM",
1060+
"subtypes": [ "ARMOR" ],
1061+
"category": "clothing",
1062+
"symbol": "[",
1063+
"color": "dark_gray",
1064+
"name": { "str": "Hub 01 MPET poncho liner" },
1065+
"description": "Often called a \"woobie\" by soldiers, this sleeping bag-like poncho liner can be attached under a poncho or used as a blanket. This one is made of space-age metallized polyethylene terephthalate, or MPET, the same reflective material used on spacecraft, spacesuits, emergency blankets, and mundane food packaging. The Hub 01 logo is stamped on one corner. It folds into a very compact form when not in use.",
1066+
"price": "50 USD",
1067+
"price_postapoc": "50 cent",
1068+
"material": [ "plastic", "aluminum" ],
1069+
"weight": "50 g",
1070+
"volume": "200 ml",
1071+
"warmth": 10,
1072+
"flags": [ "OVERSIZE", "BELTED" ],
1073+
"environmental_protection": 4,
1074+
"material_thickness": 0.01,
1075+
"armor": [
1076+
{ "encumbrance": 3, "covers": [ "torso" ], "specifically_covers": [ "torso_upper", "torso_lower" ], "coverage": 100 },
1077+
{
1078+
"encumbrance": 3,
1079+
"covers": [ "arm_l", "arm_r" ],
1080+
"specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_r", "arm_upper_l", "arm_elbow_r", "arm_elbow_l" ],
1081+
"coverage": 100
1082+
},
1083+
{ "covers": [ "arm_l", "arm_r" ], "specifically_covers": [ "arm_lower_l", "arm_lower_r" ], "coverage": 90 },
1084+
{
1085+
"coverage": 100,
1086+
"covers": [ "leg_l", "leg_r" ],
1087+
"specifically_covers": [ "leg_hip_l", "leg_hip_r", "leg_upper_r", "leg_upper_l" ]
1088+
}
1089+
]
10351090
}
10361091
]

‎data/json/mapgen_palettes/mil_surplus.json‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,10 @@
141141
{ "item": "elbow_pads", "prob": 1 },
142142
{ "item": "legpouch_large", "prob": 1 },
143143
{ "item": "gloves_tactical", "prob": 1 },
144-
{ "item": "molle_pack", "prob": 1 }
144+
{ "item": "molle_pack", "prob": 1 },
145+
{ "item": "military_poncho", "prob": 1 },
146+
{ "item": "military_poncho_heavy", "prob": 1 },
147+
{ "item": "military_poncho_liner", "prob": 1 }
145148
]
146149
},
147150
"repeat": [ 1, 3 ],
@@ -237,7 +240,10 @@
237240
{ "item": "legpouch_large", "prob": 1 },
238241
{ "item": "gloves_tactical", "prob": 1 },
239242
{ "group": "molle_backpacks_and_accessories", "prob": 1 },
240-
{ "group": "loaded_lbv", "prob": 1 }
243+
{ "group": "loaded_lbv", "prob": 1 },
244+
{ "item": "military_poncho", "prob": 1 },
245+
{ "item": "military_poncho_heavy", "prob": 1 },
246+
{ "item": "military_poncho_liner", "prob": 1 }
241247
]
242248
},
243249
"repeat": [ 1, 3 ],
@@ -334,7 +340,10 @@
334340
{ "item": "elbow_pads", "prob": 1 },
335341
{ "item": "legpouch_large", "prob": 1 },
336342
{ "item": "gloves_tactical", "prob": 1 },
337-
{ "item": "molle_pack", "prob": 1 }
343+
{ "item": "molle_pack", "prob": 1 },
344+
{ "item": "military_poncho", "prob": 1 },
345+
{ "item": "military_poncho_heavy", "prob": 1 },
346+
{ "item": "military_poncho_liner", "prob": 1 }
338347
]
339348
},
340349
"repeat": [ 1, 3 ],

‎tools/spell_checker/dictionary.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3852,6 +3852,7 @@ Mesopotamian
38523852
meta
38533853
metalcutting
38543854
metallics
3855+
metallized
38553856
metalsmithing
38563857
metamagic
38573858
metamaterial
@@ -4088,6 +4089,7 @@ Moyer
40884089
Mozart
40894090
Mozilla
40904091
MP
4092+
MPET
40914093
mph
40924094
MR
40934095
Mr
@@ -6980,6 +6982,7 @@ Woburn
69806982
Wolfi
69816983
wolfmen
69826984
wolfshead
6985+
woobie
69836986
woodbow
69846987
woodbows
69856988
woodchip

0 commit comments

Comments
 (0)