Merge pull request #36 from CleverRaven/master

SUS December 26

data/json/furniture_and_terrain/furniture-storage.json

@@ -203,7 +203,17 @@
     "max_volume": "1500 L",
     "deployed_item": "box_large",
     "examine_action": "deployed_furniture",
-    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "EASY_DECONSTRUCT", "BASHABLE", "HIDE_PLACE", "NO_SIGHT" ],
+    "flags": [
+      "TRANSPARENT",
+      "FLAMMABLE_ASH",
+      "PLACE_ITEM",
+      "ORGANIC",
+      "EASY_DECONSTRUCT",
+      "BASHABLE",
+      "HIDE_PLACE",
+      "NO_SIGHT",
+      "CONTAINER"
+    ],
     "bash": {
       "str_min": 2,
       "str_max": 15,

data/json/items/ammo/40x46mm.json

@@ -107,17 +107,6 @@
     "recoil": 1000,
     "casing": "40x46mm_m118_casing"
   },
-  {
-    "id": "40x46mm_sponge",
-    "copy-from": "40x46mm_grenade",
-    "type": "AMMO",
-    "name": "40x46mm sponge",
-    "description": "A 40mm sponge round that delivers strong impact on target, causing pain and disorientation.  May still injure or kill.",
-    "price": 5000,
-    "price_postapoc": 10000,
-    "damage": 5,
-    "extend": { "effects": [ "BEANBAG" ] }
-  },
   {
     "id": "40x46mm_slug_m199",
     "copy-from": "40x46mm_grenade",

data/json/items/corpses/inactive_bots.json

@@ -273,7 +273,7 @@
     "id": "bot_turret_riot",
     "type": "TOOL",
     "name": "inactive riot control turret",
-    "description": "This is an inactive riot control turret.  Using this item involves loading the unit with the factory-loaded beanbag rounds in your inventory (if you wish to divide your ammunition, set aside whatever beanbag rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself.  If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its riot control gun.",
+    "description": "This is an inactive riot control turret.  Using this item involves loading the unit with the 40x46mm M1006 sponge rounds in your inventory (if you wish to divide your ammunition, set aside whatever beanbag rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself.  If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its riot control gun.",
     "weight": "125000 g",
     "volume": "60 L",
     "price": 200500,

data/json/items/fake.json

@@ -17,7 +17,7 @@
     "id": "fake_burrowing",
     "copy-from": "fake_item",
     "type": "TOOL",
-    "name": "teeth and claws",
+    "name": { "str": "teeth and claws", "str_pl": "teeth and claws" },
     "flags": "TRADER_AVOID",
     "use_action": [ "BURROW" ],
     "qualities": [ [ "DIG", 3 ] ]

data/json/items/gun/40x46mm.json

@@ -155,7 +155,7 @@
     "looks_like": "m203",
     "type": "GUN",
     "name": "M203 array",
-    "description": "Six M203 grenade launchers for use on an automated 40mm turret.",
+    "description": "An array of six M203 grenade launchers for use on the TALON UGV platform.",
     "weight": "8200 g",
     "volume": "4 L",
     "price": 250000,
@@ -169,7 +169,7 @@
     "durability": 10,
     "reload": 400,
     "modes": [ [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ] ],
-    "clip_size": 16,
+    "clip_size": 6,
     "flags": [ "MOUNTED_GUN" ]
   }
 ]

data/json/mapgen/hazardous_waste_sarcophagus.json

@@ -155,7 +155,6 @@
         { "monster": "mon_hazmatbot", "x": 26, "y": 37 },
         { "monster": "mon_hazmatbot", "x": 22, "y": 29 }
       ],
-      "//": "There is 4th security reminder with name 'Security Reminder [1058]' and action 'sr4_mess'. Add it when our computer UI will support more than 9 options.",
       "computers": {
         "5": {
           "name": "SRCF Security Terminal",
@@ -164,6 +163,7 @@
             { "name": "Security Reminder [1055]", "action": "sr1_mess" },
             { "name": "Security Reminder [1056]", "action": "sr2_mess" },
             { "name": "Security Reminder [1057]", "action": "sr3_mess" },
+            { "name": "Security Reminder [1058]", "action": "sr4_mess" },
             { "name": "EPA: Report All Potential Containment Breaches [3873643]", "action": "srcf_1_mess" },
             { "name": "SRCF: Internal Memo, EPA [2918024]", "action": "srcf_2_mess" },
             { "name": "CDC: Internal Memo, Standby [2918115]", "action": "srcf_3_mess" },

data/json/monsters/turrets.json

@@ -230,7 +230,7 @@
     "id": "mon_turret_riot",
     "type": "MONSTER",
     "name": "riot control platform",
-    "description": "These six-wheeled riot control platforms were widely publicized a few years before the cataclysm as a new semi-autonomous device that could fire less-lethal rounds with far more accuracy than a human, ensuring safer hits against a target's limbs.  They were quickly adopted by prisons and inner city police forces, where they demonstrated that 'less lethal' is not the same as 'non-lethal'.  In the days before the cataclysm, massive stockrooms of the things were put into circulation.  On the bright side, although it shoots autonomously, it requires a human operator to relocate, so it's not so mobile anymore.",
+    "description": "These TALON-derived riot control platforms were widely publicized a few years before the cataclysm as a new semi-autonomous device that could fire less-lethal rounds with far more accuracy than a human, ensuring safer hits against a target's limbs.  They were quickly adopted by prisons and inner city police forces, where they demonstrated that 'less lethal' is not the same as 'non-lethal'.  In the days before the cataclysm, massive stockrooms of the things were put into circulation.  On the bright side, although it shoots autonomously, it requires a human operator to relocate, so it's not so mobile anymore.",
     "default_faction": "cop_bot",
     "looks_like": "mon_turret",
     "species": [ "ROBOT" ],
@@ -250,15 +250,15 @@
     "vision_day": 50,
     "vision_night": 3,
     "revert_to_itype": "bot_turret_riot",
-    "starting_ammo": { "40x46mm_sponge": 100 },
+    "starting_ammo": { "40x46mm_m1006": 6 },
     "special_attacks": [
       {
         "//": "For later: needs the ability to preferentially target legs and arms",
         "type": "gun",
         "cooldown": 1,
         "move_cost": 150,
         "gun_type": "pseudo_m203",
-        "ammo_type": "40x46mm_sponge",
+        "ammo_type": "40x46mm_m1006",
         "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ],
         "fake_dex": 12,
         "ranges": [ [ 0, 30, "DEFAULT" ] ],

data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json

@@ -16,7 +16,7 @@
     "type": "npc_class",
     "id": "NC_ISHERWOOD_LUKE",
     "name": "Luke Isherwood",
-    "job_description": "I'm a Eddie's son, part of the Isherwood family",
+    "job_description": "I'm Eddie's son, part of the Isherwood family",
     "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
     "common": false,
     "bonus_per": { "one_in": 4 },

data/json/npcs/missiondef.json

@@ -106,7 +106,7 @@
     "followup": "MISSION_GET_BLACK_BOX_TRANSCRIPT",
     "dialogue": {
       "describe": "We've got the flag, now we need to locate US forces.",
-      "offer": "We have the flag but now we need to locate US troops to see what we can do to help.  I haven't seen any but I'm figure'n one of those choppers that were fly'n round during th outbreak would have a good idea.  If you can get me a black box from one of the wrecks I'll look into where we might open'er at.",
+      "offer": "We have the flag but now we need to locate US troops to see what we can do to help.  I haven't seen any but I'm figure'n one of those choppers that were fly'n round during th' outbreak would have a good idea.  If you can get me a black box from one of the wrecks I'll look into where we might open'er at.",
       "accepted": "Fuck ya, America!",
       "rejected": "Do you have any better ideas?",
       "advice": "Survivors were talking about them crashing but I don't know where.  If I were a pilot I'd avoid crash landing in a city or forest though.",

data/json/professions.json

@@ -3036,7 +3036,7 @@
           "shortbow",
           "shelter_kit",
           "leather_funnel",
-          "rock_pot",
+          "clay_pot",
           "waterskin",
           "needle_bone",
           "fur_rollmat",

data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json

@@ -337,7 +337,7 @@
   {
     "type": "recipe",
     "result": "faction_base_modular_shelter_1_beds_standard_S1",
-    "description": "Let's furnish the southern bedroom with a regular beds.",
+    "description": "Let's furnish the southern bedroom with regular beds.",
     "category": "CC_BUILDING",
     "subcategory": "CSC_BUILDING_BASES",
     "autolearn": false,
@@ -352,7 +352,7 @@
   {
     "type": "recipe",
     "result": "faction_base_modular_shelter_1_beds_straw_S1",
-    "description": "Let's furnish the southern bedroom with a straw beds.",
+    "description": "Let's furnish the southern bedroom with straw beds.",
     "category": "CC_BUILDING",
     "subcategory": "CSC_BUILDING_BASES",
     "autolearn": false,
@@ -367,7 +367,7 @@
   {
     "type": "recipe",
     "result": "faction_base_modular_shelter_1_beds_makeshift_S1",
-    "description": "Let's furnish the southern bedroom with a makeshift beds.",
+    "description": "Let's furnish the southern bedroom with makeshift beds.",
     "category": "CC_BUILDING",
     "subcategory": "CSC_BUILDING_BASES",
     "autolearn": false,

data/json/recipes/recipe_deconstruction.json

@@ -825,7 +825,7 @@
       [ [ "targeting_module", 1 ] ],
       [ [ "identification_module", 1 ] ],
       [ [ "sensor_module", 1 ] ],
-      [ [ "m203", 16 ] ],
+      [ [ "m203", 6 ] ],
       [ [ "small_storage_battery", 1 ] ],
       [ [ "power_supply", 3 ] ],
       [ [ "antenna", 1 ] ],

data/mods/Aftershock/items/afs_armor.json

@@ -276,5 +276,23 @@
       "flags": [ "MAG_COMPACT" ]
     },
     "flags": [ "STURDY", "OUTER" ]
+  },
+  {
+    "id": "afs_sentinel_cloak",
+    "type": "ARMOR",
+    "copy-from": "jedi_cloak",
+    "name": "sentinel-lx cloak",
+    "description": "The vantablack cloak of sentinel-lx hangs around ones shoulders as a solid, unnatural shadow.  Made from woven graphene, its lightweight and resistant, but cannot be repaired",
+    "price": 1500000,
+    "material": [ "graphene_weave" ],
+    "symbol": "[",
+    "color": "dark_gray",
+    "covers": [ "TORSO", "HEAD", "ARMS", "LEGS" ],
+    "coverage": 85,
+    "encumbrance": 4,
+    "warmth": 30,
+    "material_thickness": 3,
+    "flags": [ "OVERSIZE", "HOOD", "OUTER", "NO_REPAIR", "SUPER_FANCY", "STURDY" ],
+    "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "BONUS_DODGE", "add": 1 } ] } ] }
   }
 ]

data/mods/Aftershock/items/afs_inactiverobot.json

@@ -20,5 +20,20 @@
       "skill1": "cooking",
       "skill2": "computer"
     }
+  },
+  {
+    "id": "bot_sentinel_lx",
+    "type": "TOOL",
+    "name": "inactive sentinel-lx",
+    "description": "Crouched and dead still, this armored luxurious robot resembles an ancient knight immersed in deep prayer.  If reprogrammed and rewired successfully the robot will identify you as a friendly, and will protect you from nearby foes.",
+    "weight": "40750 g",
+    "volume": "30 L",
+    "price": 600000,
+    "to_hit": -3,
+    "bashing": 8,
+    "material": "alien_resin",
+    "symbol": ";",
+    "color": "green",
+    "use_action": { "type": "place_monster", "monster_id": "afs_mon_sentinel_lx", "difficulty": 4, "moves": 100, "skill2": "computer" }
   }
 ]

data/mods/Aftershock/items/afs_materials.json

@@ -14,5 +14,23 @@
     "dmg_adj": [ "marked", "dented", "smashed", "shattered" ],
     "bash_dmg_verb": "dented",
     "cut_dmg_verb": "scratched"
+  },
+  {
+    "type": "material",
+    "ident": "graphene_weave",
+    "name": "Graphene Weave",
+    "density": 10,
+    "specific_heat_liquid": 0.82,
+    "specific_heat_solid": 0.45,
+    "latent_heat": 273,
+    "bash_resist": 3,
+    "cut_resist": 3,
+    "acid_resist": 5,
+    "fire_resist": 5,
+    "elec_resist": 0,
+    "chip_resist": 10,
+    "dmg_adj": [ "marked", "dented", "scarred", "broken" ],
+    "bash_dmg_verb": "ripped",
+    "cut_dmg_verb": "cut"
   }
 ]

data/mods/Aftershock/items/afs_tools.json

@@ -39,6 +39,40 @@
     "//": "since we cost no battery, no reason not to keep these",
     "flags": [ "WATCH", "ALARMCLOCK", "LIGHT_25" ]
   },
+  {
+    "id": "afs_wraitheon_smartphone",
+    "type": "TOOL",
+    "name": "Wraitheon executive's smartphone",
+    "copy-from": "afs_atomic_smartphone",
+    "description": "Your custom crafted atomic smartphone.  Most notably a confidential executive-level override program allows you to  remotely control most robots.",
+    "price": 20000000,
+    "price_postapoc": 250000,
+    "material": [ "superalloy", "aluminum" ],
+    "use_action": [
+      {
+        "target": "afs_atomic_wraitheon_flashlight",
+        "msg": "You activate the flashlight app.",
+        "active": true,
+        "type": "transform"
+      },
+      { "revert_to": "afs_atomic_smartphone", "type": "CAMERA" },
+      { "type": "ROBOTCONTROL" }
+    ]
+  },
+  {
+    "id": "afs_atomic_wraitheon_flashlight",
+    "copy-from": "afs_atomic_smartphone_flashlight",
+    "type": "TOOL",
+    "name": "Executive's smartphone - Flashlight",
+    "name_plural": "Executive's smartphones - Flashlight",
+    "revert_to": "afs_atomic_smartphone",
+    "use_action": {
+      "target": "afs_wraitheon_smartphone",
+      "msg": "You deactivate the flashlight app.",
+      "menu_text": "Turn off flashlight",
+      "type": "transform"
+    }
+  },
   {
     "id": "afs_atompot",
     "type": "TOOL",

data/mods/Aftershock/items/corpses.json

@@ -0,0 +1,23 @@
+{
+  "type": "GENERIC",
+  "id": "broken_afs_mon_sentinel_lx",
+  "symbol": ",",
+  "color": "green",
+  "name": "broken sentinel-lx",
+  "category": "other",
+  "description": "The irreparably broken remains of a Sentinel-lx.  Could be gutted for valuable parts.",
+  "price": 30000,
+  "price_postapoc": 1000,
+  "material": [
+    "steel",
+    "plastic"
+  ],
+  "weight": "140000 g",
+  "volume": "62500 ml",
+  "bashing": 6,
+  "cutting": 6,
+  "to_hit": -3,
+  "flags": [
+    "TRADER_AVOID"
+  ]
+}

data/mods/Aftershock/items/gun/laser.json

@@ -0,0 +1,36 @@
+[
+  {
+    "id": "afs_sentinel_stunner",
+    "type": "GUN",
+    "copy-from": "v29",
+    "name": "wrist-stunner",
+    "description": "A severed robotic hand from a Wraitheon Sentinel.  The powerful electro-laser stun gun embed on its wrist is still functional, and can be used when connected to an UPS.",
+    "price": 720000,
+    "to_hit": -2,
+    "bashing": 10,
+    "material": [ "superalloy", "plastic" ],
+    "color": "cyan",
+    "range": 10,
+    "ranged_damage": 5,
+    "pierce": 15,
+    "dispersion": 500,
+    "ups_charges": 25,
+    "ammo_effects": [ "LASER", "BEANBAG" ],
+    "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ]
+  },
+  {
+    "id": "afs_sentinel_laser",
+    "type": "GUN",
+    "copy-from": "afs_sentinel_stunner",
+    "name": "wrist-trilaser",
+    "description": "A powerful tri-barreled laser weapon, still mounted to the robotic hand of the wraitheon drone it originally belonged too.  Can still be fired when connected to an UPS.",
+    "color": "red",
+    "range": 10,
+    "ranged_damage": 25,
+    "pierce": 15,
+    "ups_charges": 50,
+    "modes": [ [ "MULTI", "trilaser", 3 ] ],
+    "ammo_effects": [ "LASER" ],
+    "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ]
+  }
+]

data/mods/Aftershock/items/monster_drops.json

@@ -0,0 +1,8 @@
+{
+  "type": "item_group",
+  "subtype": "collection",
+  "id": "mon_afs_sentinel_lx_drops",
+  "entries": [
+    { "item": "afs_sentinel_cloak" }
+  ]
+}