KathrinBaileyandGitHub
ff51c9d2db
* Improvised Weapons Part 1: Shotgun & Rifle Adds new sprites for ammo, the improvised rifle, the improvised shotgun. Adds a hand saw. Adds things to the crafting menu. Adds things to the autolathe menu. * PR not yet ready - just cleaning issues. Just trying to remark some of the issues resolved so I can see where I'm at a bit easier. * Reverting changes to shotgun ammo names in the autolathe. No point calling it 12G when there's no 20G anymore. * Weapon weight + sprite improvements. Makes sprites for gun parts bulkier with a low alpha pixel outline to make them easier to click on. They also look a bit closer to what their final product will be. * oops forgot the " * Revert "Merge branch 'master' into Improvised-Part-1" This reverts commit 1e43d228d1bc35b0582244ed0bd91934573b3cdd, reversing changes made to 207e9fccd4e8cffbe9ed26401a6f516fc44245dd. * Revert "Revert "Merge branch 'master' into Improvised-Part-1"" This reverts commit 22d421d010c4a4c5c5e26f49fe6bffcf6198df42. * My Github or environment isn't flipping out. no more. Derp. Also projectile damage modifier fixed. I can actually compile without hundreds of errors. * Made small weapon parts have w_class small. I was testing it out and seeing the trigger assembly take so much space in my inventory seemed really odd. * Duplicate definition refused. Hurrdurr I suck. Glad I gave this a quick look-voer. Shotgun description edited to reflect the 0.8x damage modifier. * Resolved tools.dmi merge conflict. Just took the dmi from master and put the new sprites on at the end. * DNM - Trying to see why usptream tools.dmi with my stuff added on the end is conflicting. * Please don't conflict
121 lines
4.7 KiB
Plaintext
121 lines
4.7 KiB
Plaintext
//How to balance this table
|
|
//-------------------------
|
|
//The total added weight of all the entries should be (roughly) equal to the total number of lootdrops
|
|
//(take in account those that spawn more than one object!)
|
|
//
|
|
//While this is random, probabilities tells us that item distribution will have a tendency to look like
|
|
//the content of the weighted table that created them.
|
|
//The less lootdrops, the less even the distribution.
|
|
//
|
|
//If you want to give items a weight <1 you can multiply all the weights by 10
|
|
//
|
|
//the "" entry will spawn nothing, if you increase this value,
|
|
//ensure that you balance it with more spawn points
|
|
|
|
//table data:
|
|
//-----------
|
|
//aft maintenance: 24 items, 18 spots 2 extra (28/08/2014)
|
|
//asmaint: 16 items, 11 spots 0 extra (08/08/2014)
|
|
//asmaint2: 36 items, 26 spots 2 extra (28/08/2014)
|
|
//fpmaint: 5 items, 4 spots 0 extra (08/08/2014)
|
|
//fpmaint2: 12 items, 11 spots 2 extra (28/08/2014)
|
|
//fsmaint: 0 items, 0 spots 0 extra (08/08/2014)
|
|
//fsmaint2: 40 items, 27 spots 5 extra (28/08/2014)
|
|
//maintcentral: 2 items, 2 spots 0 extra (08/08/2014)
|
|
//port: 5 items, 5 spots 0 extra (08/08/2014)
|
|
|
|
GLOBAL_LIST_INIT(maintenance_loot, list(
|
|
/obj/item/bodybag = 1,
|
|
/obj/item/clothing/glasses/meson = 2,
|
|
/obj/item/clothing/glasses/sunglasses = 1,
|
|
/obj/item/clothing/gloves/color/fyellow = 1,
|
|
/obj/item/clothing/head/hardhat = 1,
|
|
/obj/item/clothing/head/hardhat/red = 1,
|
|
/obj/item/clothing/head/that = 1,
|
|
/obj/item/clothing/head/ushanka = 1,
|
|
/obj/item/clothing/head/welding = 1,
|
|
/obj/effect/spawner/lootdrop/breathing_masks = 15,
|
|
/obj/item/clothing/suit/hazardvest = 1,
|
|
/obj/item/clothing/under/misc/vice_officer = 1,
|
|
/obj/item/clothing/suit/hooded/flashsuit = 2,
|
|
/obj/item/clothing/accessory/medal/greytide = 1,
|
|
/obj/item/assembly/prox_sensor = 4,
|
|
/obj/item/assembly/timer = 3,
|
|
/obj/item/flashlight = 4,
|
|
/obj/item/flashlight/pen = 1,
|
|
/obj/effect/spawner/lootdrop/glowstick = 4,
|
|
/obj/effect/spawner/lootdrop/mre = 3,
|
|
/obj/item/multitool = 2,
|
|
/obj/item/radio/off = 2,
|
|
/obj/item/t_scanner = 5,
|
|
/obj/item/airlock_painter = 1,
|
|
/obj/item/stack/cable_coil/random = 4,
|
|
/obj/item/stack/cable_coil/random/five = 6,
|
|
/obj/item/stack/medical/bruise_pack = 1,
|
|
/obj/item/stack/rods/ten = 9,
|
|
/obj/item/stack/rods/twentyfive = 1,
|
|
/obj/item/stack/rods/fifty = 1,
|
|
/obj/item/stack/sheet/cardboard = 2,
|
|
/obj/item/stack/sheet/metal/twenty = 1,
|
|
/obj/item/stack/sheet/mineral/plasma = 1,
|
|
/obj/item/stack/sheet/rglass = 1,
|
|
/obj/item/book/manual/wiki/engineering_construction = 1,
|
|
/obj/item/book/manual/wiki/engineering_hacking = 1,
|
|
/obj/item/clothing/head/cone = 1,
|
|
/obj/item/coin/silver = 1,
|
|
/obj/item/coin/twoheaded = 1,
|
|
/obj/item/poster/random_contraband = 1,
|
|
/obj/item/poster/random_official = 1,
|
|
/obj/item/crowbar = 1,
|
|
/obj/item/crowbar/red = 1,
|
|
/obj/item/extinguisher = 11,
|
|
/obj/item/hand_labeler = 1,
|
|
/obj/item/paper/crumpled = 1,
|
|
/obj/item/pen = 1,
|
|
/obj/item/reagent_containers/spray/pestspray = 1,
|
|
/obj/item/reagent_containers/rag = 3,
|
|
/obj/item/stock_parts/cell = 3,
|
|
/obj/item/storage/belt/utility = 2,
|
|
/obj/item/storage/box = 2,
|
|
/obj/item/storage/box/cups = 1,
|
|
/obj/item/storage/box/donkpockets = 1,
|
|
/obj/item/storage/box/lights/mixed = 3,
|
|
/obj/item/storage/box/hug/medical = 1,
|
|
/obj/item/storage/fancy/cigarettes/dromedaryco = 1,
|
|
/obj/item/storage/toolbox/mechanical = 1,
|
|
/obj/item/screwdriver = 3,
|
|
/obj/item/tank/internals/emergency_oxygen = 2,
|
|
/obj/item/vending_refill/cola = 1,
|
|
/obj/effect/spawner/lootdrop/welder_tools = 3,
|
|
/obj/effect/spawner/lootdrop/low_tools = 5,
|
|
/obj/item/relic = 3,
|
|
/obj/item/weaponcrafting/improvised_parts/shotgun_receiver = 2,
|
|
/obj/item/clothing/head/cone = 2,
|
|
/obj/item/grenade/smokebomb = 2,
|
|
/obj/item/geiger_counter = 3,
|
|
/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1,
|
|
/obj/item/radio/headset = 1,
|
|
/obj/item/assembly/infra = 1,
|
|
/obj/item/assembly/igniter = 2,
|
|
/obj/item/assembly/signaler = 2,
|
|
/obj/item/assembly/mousetrap = 2,
|
|
/obj/item/reagent_containers/syringe = 2,
|
|
/obj/effect/spawner/lootdrop/gloves = 8,
|
|
/obj/item/clothing/shoes/laceup = 1,
|
|
/obj/item/storage/secure/briefcase = 3,
|
|
/obj/item/storage/toolbox/artistic = 2,
|
|
/obj/item/toy/eightball = 1,
|
|
/obj/item/reagent_containers/pill/floorpill = 1,
|
|
/obj/item/reagent_containers/food/snacks/cannedpeaches/maint = 2,
|
|
/obj/item/storage/daki = 3, //VERY IMPORTANT CIT CHANGE - adds bodypillows to maint
|
|
/obj/item/storage/pill_bottle/penis_enlargement = 2,
|
|
/obj/item/storage/pill_bottle/breast_enlargement = 2,
|
|
/obj/item/clothing/shoes/wheelys = 1,
|
|
/obj/item/clothing/shoes/kindleKicks = 1,
|
|
/obj/item/autosurgeon/penis = 1,
|
|
/obj/item/autosurgeon/testicles = 1,
|
|
/obj/item/storage/box/marshmallow = 2,
|
|
/obj/item/clothing/gloves/tackler/offbrand = 1,
|
|
"" = 3
|
|
))
|