Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cleans up a lot of old gun stuff, and either adds or tweaks some crat…
…es in preparation for some stuff i want to do later (#689) * sweeps up a bit * oh yeah baby * whoops! * fixes the surplus box * yknow i fucked up * Update modular_nova/modules/modular_weapons/code/cargo_crates/surplus_crates.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/modular_weapons/code/cargo_crates/surplus_crates.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/modular_weapons/code/cargo_crates/surplus_crates.dm Co-authored-by: Bloop <[email protected]> * Update surplus_crates.dm --------- Co-authored-by: Bloop <[email protected]>
- Loading branch information
2 people
authored and
committed
Feb 9, 2024
1 parent
5f916e8
commit 6eb1f0f
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -711,34 +711,6 @@ | |
| for(var/i in 1 to 19) | ||
| new /obj/item/grown/log(.) | ||
|
|
||
| /* | ||
| * VENDING RESTOCKS | ||
| */ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /datum/supply_pack/security/armory/sindano | ||
| name = "Sindano Submachinegun Crate" | ||
| desc = "Three entirely proprietary Sindano kits, chambered in .35 Sol Short. Each kit contains three empty magazines and a box each of incapacitator and lethal rounds." | ||
| cost = CARGO_CRATE_VALUE * 10 | ||
| contains = list( | ||
| /obj/item/storage/toolbox/guncase/nova/carwo_large_case/sindano = 3, | ||
| ) | ||
| <<<<<<< HEAD:modular_nova/modules/sec_haul/code/guns/cargo_stuff.dm | ||
| crate_name = "Carwo 'Sindano' Submachinegun Crate" | ||
| ======= | ||
| crate_name = "Sindano Submachinegun Crate" | ||
|
|
||
| /datum/supply_pack/security/armory/renoster | ||
| name = "Renoster Riot Shotgun Crate" | ||
| desc = "Three Renoster 12ga riot shotguns, with matching bandoliers for each." | ||
| cost = CARGO_CRATE_VALUE * 10 | ||
| contains = list( | ||
| /obj/item/gun/ballistic/shotgun/riot/sol = 3, | ||
| /obj/item/storage/belt/bandolier = 3, | ||
| ) | ||
| crate_name = "Renoster Riot Shotgun Crate" | ||
|
|
||
| /datum/supply_pack/security/armory/kiboko | ||
| name = "Kiboko Grenade Launcher Crate" | ||
| desc = "Contains a single Kiboko grenade launcher for replacing the one found in the armory, alongside the equipment that comes with it." | ||
| cost = CARGO_CRATE_VALUE * 30 | ||
| contains = list( | ||
| /obj/item/storage/toolbox/guncase/nova/carwo_large_case/kiboko_magless = 1, | ||
| /obj/item/ammo_box/c980grenade = 2, | ||
| /obj/item/ammo_box/c980grenade/smoke = 1, | ||
| /obj/item/ammo_box/c980grenade/riot = 1, | ||
| ) | ||
| crate_name = "Kiboko Grenade Launcher Crate" | ||
|
|
||
| /datum/supply_pack/security/armory/short_mod_laser | ||
| name = "Modular Laser Carbine Crate" | ||
| desc = "Five 'Hoshi' modular laser carbines, compact energy weapons that can be rapidly reconfigured into different firing modes." | ||
| cost = CARGO_CRATE_VALUE * 12 | ||
| contains = list( | ||
| /obj/item/gun/energy/modular_laser_rifle/carbine, | ||
| /obj/item/gun/energy/modular_laser_rifle/carbine, | ||
| /obj/item/gun/energy/modular_laser_rifle/carbine, | ||
| /obj/item/gun/energy/modular_laser_rifle/carbine, | ||
| /obj/item/gun/energy/modular_laser_rifle/carbine, | ||
| ) | ||
| crate_name = "\improper Modular Laser Carbine Crate" | ||
|
|
||
| /datum/supply_pack/security/armory/big_mod_laser | ||
| name = "Modular Laser Rifle Crate" | ||
| desc = "Three 'Hyeseong' modular laser rifles, bulky energy weapons that can be rapidly reconfigured into different firing modes." | ||
| cost = CARGO_CRATE_VALUE * 12 | ||
| contains = list( | ||
| /obj/item/gun/energy/modular_laser_rifle, | ||
| /obj/item/gun/energy/modular_laser_rifle, | ||
| /obj/item/gun/energy/modular_laser_rifle, | ||
| ) | ||
| crate_name = "\improper Modular Laser Rifle Crate" | ||
| >>>>>>> e1b64e887 (Cleans up a lot of old gun stuff, and either adds or tweaks some crates in preparation for some stuff i want to do later (#689)):modular_nova/modules/modular_weapons/code/cargo_crates/armory_guns.dm |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| #define ITEM_WEIGHT_CLOTHING 3 | ||
| #define ITEM_WEIGHT_ARMOR 2 | ||
| #define ITEM_WEIGHT_MISC 3 | ||
| #define ITEM_WEIGHT_MISC_BUT_RARER 2 | ||
| #define ITEM_WEIGHT_AMMO_SINGLE 3 | ||
| #define ITEM_WEIGHT_AMMO_BULK 2 | ||
| #define ITEM_WEIGHT_GUN_COMMON 2 | ||
| #define ITEM_WEIGHT_GUN_RARE 1 | ||
|
|
||
|
|
||
| // used in budget calculation | ||
| #define CRATE_ITEM_WEIGHT_MAX 3 | ||
|
|
||
| #define CRATE_BUDGET_MINIMUM 20 | ||
| #define CRATE_BUDGET_MAXIMUM 35 | ||
|
|
||
| // Special basically locks it out of appearing literally ever unless an admin VV's the cargo subsystem | ||
| /datum/supply_pack/imports/russian | ||
| special = TRUE | ||
|
|
||
| /datum/supply_pack/imports/cin_surplus | ||
| name = "CIN Surplus Equipment Crate" | ||
| desc = "A collection of surplus equipment sourced from the Coalition of Independent Nations' military stockpiles. Likely to contain old and outdated equipment, as is the nature of surplus." | ||
| contraband = TRUE | ||
| cost = CARGO_CRATE_VALUE * 20 | ||
| contains = list( | ||
| // Clothing | ||
| /obj/item/clothing/under/syndicate/rus_army/cin_surplus/random_color = ITEM_WEIGHT_CLOTHING, | ||
| /obj/item/storage/belt/military/cin_surplus/random_color = ITEM_WEIGHT_CLOTHING, | ||
| /obj/item/storage/backpack/industrial/cin_surplus/random_color = ITEM_WEIGHT_CLOTHING, | ||
| /obj/item/clothing/under/colonial/nri_police = ITEM_WEIGHT_CLOTHING, | ||
| /obj/item/clothing/neck/cloak/colonial/nri_police = ITEM_WEIGHT_CLOTHING, | ||
| /obj/item/clothing/head/hats/colonial/nri_police = ITEM_WEIGHT_CLOTHING, | ||
| /obj/item/clothing/mask/gas/nri_police = ITEM_WEIGHT_CLOTHING, | ||
| /obj/item/clothing/mask/balaclavaadjust = ITEM_WEIGHT_CLOTHING, | ||
| /obj/item/clothing/gloves/tackler/combat = ITEM_WEIGHT_CLOTHING, | ||
| /obj/item/clothing/shoes/jackboots = ITEM_WEIGHT_CLOTHING, | ||
| // Armors | ||
| /obj/item/clothing/head/helmet/cin_surplus_helmet/random_color = ITEM_WEIGHT_ARMOR, | ||
| /obj/item/clothing/suit/armor/vest/cin_surplus_vest = ITEM_WEIGHT_ARMOR, | ||
| /obj/item/clothing/head/helmet/nri_police = ITEM_WEIGHT_ARMOR, | ||
| /obj/item/clothing/suit/armor/vest/nri_police = ITEM_WEIGHT_ARMOR, | ||
| // Weapons | ||
| /obj/item/gun/ballistic/revolver/shotgun_revolver = ITEM_WEIGHT_GUN_COMMON, | ||
| /obj/item/gun/ballistic/automatic/pistol/plasma_thrower = ITEM_WEIGHT_GUN_COMMON, | ||
| /obj/item/gun/ballistic/automatic/pistol/plasma_marksman = ITEM_WEIGHT_GUN_COMMON, | ||
| /obj/item/storage/toolbox/guncase/soviet/sakhno = ITEM_WEIGHT_GUN_COMMON, | ||
| /obj/item/gun/ballistic/automatic/miecz = ITEM_WEIGHT_GUN_RARE, | ||
| /obj/item/gun/ballistic/automatic/lanca = ITEM_WEIGHT_GUN_RARE, | ||
| /obj/item/gun/ballistic/automatic/wylom = ITEM_WEIGHT_GUN_RARE, | ||
| // Ammo | ||
| /obj/item/storage/toolbox/ammobox/strilka310 = ITEM_WEIGHT_AMMO_BULK, | ||
| /obj/item/storage/toolbox/ammobox/strilka310/surplus = ITEM_WEIGHT_AMMO_BULK, | ||
| /obj/item/ammo_box/c27_54cesarzowa = ITEM_WEIGHT_AMMO_BULK, | ||
| /obj/item/ammo_box/c27_54cesarzowa/rubber = ITEM_WEIGHT_AMMO_BULK, | ||
| /obj/item/ammo_box/c310_cargo_box = ITEM_WEIGHT_AMMO_BULK, | ||
| /obj/item/ammo_box/c310_cargo_box/rubber = ITEM_WEIGHT_AMMO_BULK, | ||
| /obj/item/ammo_box/c310_cargo_box/piercing = ITEM_WEIGHT_AMMO_BULK, | ||
| /obj/item/ammo_box/magazine/recharge/plasma_battery = ITEM_WEIGHT_AMMO_SINGLE, | ||
| /obj/item/ammo_box/magazine/miecz/spawns_empty = ITEM_WEIGHT_AMMO_SINGLE, | ||
| /obj/item/ammo_box/strilka310 = ITEM_WEIGHT_AMMO_SINGLE, | ||
| /obj/item/ammo_box/magazine/lanca/spawns_empty = ITEM_WEIGHT_AMMO_SINGLE, | ||
| /obj/item/ammo_box/magazine/wylom = ITEM_WEIGHT_AMMO_SINGLE, | ||
| // Other items | ||
| /obj/item/sign/flag/nri = ITEM_WEIGHT_MISC, | ||
| /obj/item/trench_tool = ITEM_WEIGHT_MISC, | ||
| /obj/item/binoculars = ITEM_WEIGHT_MISC, | ||
| /obj/item/storage/box/nri_flares = ITEM_WEIGHT_MISC, | ||
| /obj/item/pen/screwdriver = ITEM_WEIGHT_MISC_BUT_RARER, | ||
| /obj/item/storage/box/colonial_rations = ITEM_WEIGHT_MISC_BUT_RARER, | ||
| /obj/item/storage/toolbox/maint_kit = ITEM_WEIGHT_MISC_BUT_RARER, | ||
| ) | ||
|
|
||
| /datum/supply_pack/imports/cin_surplus/fill(obj/structure/closet/crate/we_are_filling_this_crate) | ||
| var/item_budget = rand(CRATE_BUDGET_MINIMUM, CRATE_BUDGET_MAXIMUM) | ||
| for(var/iterator in 1 to 20) // 20 items max, but we have a budget too | ||
| var/new_thing = pick_weight(contains) | ||
| // We don't want to go too far over budget | ||
| if(item_budget <= 0) | ||
| return | ||
| new new_thing(we_are_filling_this_crate) | ||
| // Basically inverts the weight before subtracting it from the budget | ||
| item_budget -= ((CRATE_ITEM_WEIGHT_MAX + 1) - contains[new_thing]) | ||
|
|
||
| #undef ITEM_WEIGHT_CLOTHING | ||
| #undef ITEM_WEIGHT_ARMOR | ||
| #undef ITEM_WEIGHT_MISC | ||
| #undef ITEM_WEIGHT_MISC_BUT_RARER | ||
| #undef ITEM_WEIGHT_AMMO_SINGLE | ||
| #undef ITEM_WEIGHT_AMMO_BULK | ||
| #undef ITEM_WEIGHT_GUN_COMMON | ||
| #undef ITEM_WEIGHT_GUN_RARE | ||
|
|
||
| #undef CRATE_ITEM_WEIGHT_MAX | ||
|
|
||
| #undef CRATE_BUDGET_MINIMUM | ||
| #undef CRATE_BUDGET_MAXIMUM |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -107,63 +107,3 @@ | |
| /obj/projectile/bullet/a223/ap | ||
| name = ".277 armor-piercing bullet" | ||
| armour_penetration = 60 | ||
Oops, something went wrong.