diff --git a/code/__DEFINES/blob_defines.dm b/code/__DEFINES/blob_defines.dm index 52f4c078e1f..cb546d419f6 100644 --- a/code/__DEFINES/blob_defines.dm +++ b/code/__DEFINES/blob_defines.dm @@ -52,7 +52,7 @@ #define BLOB_RESOURCE_MIN_DISTANCE 4 // Minimum distance between resource blobs #define BLOB_RESOURCE_GATHER_DELAY (4 SECONDS) // Gather points when pulsed outside this interval #define BLOB_RESOURCE_GATHER_ADDED_DELAY (0.25 SECONDS) // Every additional resource blob adds this amount to the gather delay -#define BLOB_RESOURCE_GATHER_AMOUNT 1.5 // The amount of points added to the overmind // FLUFFY FRONTIER EDIT - ORIGINAL: #define BLOB_RESOURCE_GATHER_AMOUNT 1 +#define BLOB_RESOURCE_GATHER_AMOUNT 1 // The amount of points added to the overmind #define BLOB_REGULAR_MAX_HP 25 #define BLOB_REGULAR_HP_INIT 21 // The starting HP of a normal blob tile @@ -95,7 +95,7 @@ #define BLOBMOB_SPORE_DMG_LOWER 4 #define BLOBMOB_SPORE_DMG_UPPER 8 #define BLOBMOB_BLOBBERNAUT_RESOURCE_COST 40 // Purchase price for making a blobbernaut -#define BLOBMOB_BLOBBERNAUT_HEALTH 350 // Base blobbernaut health // FLUFFY FRONTIER EDIT - ORIGINAL: #define BLOBMOB_BLOBBERNAUT_HEALTH 200 +#define BLOBMOB_BLOBBERNAUT_HEALTH 200 // Base blobbernaut health #define BLOBMOB_BLOBBERNAUT_DMG_SOLO_LOWER 20 // Damage without active overmind (core dead or xenobio mob) #define BLOBMOB_BLOBBERNAUT_DMG_SOLO_UPPER 20 #define BLOBMOB_BLOBBERNAUT_DMG_LOWER 4 // Damage dealt with active overmind (most damage comes from strain chems) diff --git a/code/__DEFINES/~nova_defines/mobs.dm b/code/__DEFINES/~nova_defines/mobs.dm index 9e9dc7d74be..b95f25144be 100644 --- a/code/__DEFINES/~nova_defines/mobs.dm +++ b/code/__DEFINES/~nova_defines/mobs.dm @@ -2,7 +2,7 @@ #define PULL_OVERSIZED_SLOWDOWN 2 -#define HUMAN_HEALTH_MODIFIER 1.35 +#define HUMAN_HEALTH_MODIFIER 1 // TFF CHANGES - ORIGINAL: #define HUMAN_HEALTH_MODIFIER 1.35 #define HUMAN_MAXHEALTH MAX_LIVING_HEALTH * HUMAN_HEALTH_MODIFIER diff --git a/code/modules/antagonists/heretic/magic/blood_siphon.dm b/code/modules/antagonists/heretic/magic/blood_siphon.dm index 88bb4f61436..3ef5a7920f8 100644 --- a/code/modules/antagonists/heretic/magic/blood_siphon.dm +++ b/code/modules/antagonists/heretic/magic/blood_siphon.dm @@ -40,8 +40,8 @@ ) var/mob/living/living_owner = owner - cast_on.adjust_brute_loss(25) // FLUFFY FRONTIER EDIT: ANTAG BUFF #5159; original: 20 - living_owner.adjust_brute_loss(-25) // FLUFFY FRONTIER EDIT: ANTAG BUFF #5159; original: -20 + cast_on.adjust_brute_loss(20) + living_owner.adjust_brute_loss(-20) cast_on.transfer_blood_to(living_owner, 20, ignore_low_blood = TRUE, ignore_incompatibility = TRUE, transfer_viruses = FALSE) diff --git a/code/modules/antagonists/nightmare/nightmare_equipment.dm b/code/modules/antagonists/nightmare/nightmare_equipment.dm index ee05870b279..2f5d0c19383 100644 --- a/code/modules/antagonists/nightmare/nightmare_equipment.dm +++ b/code/modules/antagonists/nightmare/nightmare_equipment.dm @@ -7,7 +7,7 @@ icon_state = "light_eater" inhand_icon_state = "light_eater" icon_angle = 180 - force = 30 // FLUFFY FRONTIER EDIT: ANTAG BUFF #5159; original: 25 + force = 25 armour_penetration = 35 lefthand_file = 'icons/mob/inhands/antag/nightmare_lefthand.dmi' righthand_file = 'icons/mob/inhands/antag/nightmare_righthand.dmi' diff --git a/code/modules/mob/living/basic/guardian/guardian_verbs.dm b/code/modules/mob/living/basic/guardian/guardian_verbs.dm index b67270cec91..c63dffd4316 100644 --- a/code/modules/mob/living/basic/guardian/guardian_verbs.dm +++ b/code/modules/mob/living/basic/guardian/guardian_verbs.dm @@ -149,7 +149,7 @@ shared_cooldown = NONE /datum/action/cooldown/mob_cooldown/replace_guardian/Activate(atom/target) - StartCooldown(1 MINUTES) // THE FLUFFY FRONTIER CHANGES, ORIGINAL: 5 MINUTES + StartCooldown(5 MINUTES) var/mob/living/living_owner = owner var/list/guardians = living_owner.get_all_linked_holoparasites() diff --git a/code/modules/mob/living/basic/space_fauna/demon/demon_subtypes.dm b/code/modules/mob/living/basic/space_fauna/demon/demon_subtypes.dm index 0707e8d453e..1cfcf160b2c 100644 --- a/code/modules/mob/living/basic/space_fauna/demon/demon_subtypes.dm +++ b/code/modules/mob/living/basic/space_fauna/demon/demon_subtypes.dm @@ -14,8 +14,8 @@ // their wound bonuses grow and grow higher. this is how they're able to efficiently kill and slaughter their victims. // consider this before you balance them. obj_damage = 50 - melee_damage_lower = 20 // FLUFFY FRONTIER CHANGES - ORIGINAL: 15 - melee_damage_upper = 20 // FLUFFY FRONTIER CHANGES - ORIGINAL: 15 + melee_damage_lower = 15 + melee_damage_upper = 15 wound_bonus = -10 exposed_wound_bonus = 0 sharpness = SHARP_EDGED diff --git a/code/modules/mob/living/basic/space_fauna/space_dragon/space_dragon.dm b/code/modules/mob/living/basic/space_fauna/space_dragon/space_dragon.dm index 8165a1adfb3..e8ebb18a47a 100644 --- a/code/modules/mob/living/basic/space_fauna/space_dragon/space_dragon.dm +++ b/code/modules/mob/living/basic/space_fauna/space_dragon/space_dragon.dm @@ -26,7 +26,7 @@ unsuitable_cold_damage = 0 unsuitable_heat_damage = 0 unsuitable_atmos_damage = 0 - damage_coeff = list(BRUTE = 0.7, BURN = 0.6, TOX = 1, STAMINA = 0.5, OXY = 1) // FLUFFY FRONTIER CHANGES - ORIGINAL: damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, STAMINA = 0.5, OXY = 1) + damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, STAMINA = 0.5, OXY = 1) combat_mode = TRUE speed = 0 attack_verb_continuous = "chomps" diff --git a/code/modules/projectiles/projectile/bullets/_incendiary.dm b/code/modules/projectiles/projectile/bullets/_incendiary.dm index 0e3b0250b4a..613b674ef00 100644 --- a/code/modules/projectiles/projectile/bullets/_incendiary.dm +++ b/code/modules/projectiles/projectile/bullets/_incendiary.dm @@ -20,7 +20,7 @@ var/turf/location = get_turf(src) if(location) new /obj/effect/hotspot(location) - location.hotspot_expose(700, 50, 1) + location.hotspot_expose(350, 25, 1) // TFF EDIT - ORIGINAL: location.hotspot_expose(700, 50, 1) /// Incendiary bullet that more closely resembles a real flamethrower sorta deal, no visible bullet, just flames. /obj/projectile/bullet/incendiary/fire diff --git a/code/modules/uplink/uplink_items/contractor.dm b/code/modules/uplink/uplink_items/contractor.dm index 1b816202827..5ed0c6199a8 100644 --- a/code/modules/uplink/uplink_items/contractor.dm +++ b/code/modules/uplink/uplink_items/contractor.dm @@ -88,3 +88,4 @@ item = /obj/item/antag_spawner/loadout/contractor limited_stock = 1 cost = 2 +// TFF REMOVAL START - RETURN COSTS TO TG - START: diff --git a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_status_effects.dm b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_status_effects.dm index fac5fa1e846..40354681b77 100644 --- a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_status_effects.dm +++ b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_status_effects.dm @@ -11,7 +11,7 @@ /// The amount in units of blood that gets consumed per point of damage healed (by hemokinetic regen and master of the house) #define HEMOKINETIC_REGEN_BLOOD_CONSUMPTION 0.25 /// How much damage per second is healed by hemokinetic regen -#define HEMOKINETIC_REGEN_HEALING 1.8 +#define HEMOKINETIC_REGEN_HEALING 1.2 // TFF EDIT - ORIGINAL: HEMOKINETIC_REGEN_HEALING 1.8 /datum/status_effect/blood_thirst_satiated id = "blood_thirst_satiated" diff --git a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/archon_combat_systems/shotgun.dm b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/archon_combat_systems/shotgun.dm index a4d0f64a5b5..9bb26a84367 100644 --- a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/archon_combat_systems/shotgun.dm +++ b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/archon_combat_systems/shotgun.dm @@ -56,6 +56,7 @@ /obj/item/gun/ballistic/shotgun/riot/sol/super/Initialize(mapload) . = ..() + /* // TFF EDIT START - ORIGINAL: AddComponent(\ /datum/component/gun_booster, \ booster_action = /datum/action/item_action/booster/sol_super, \ @@ -66,6 +67,17 @@ amped_speed_mult = 1.25, \ amped_fire_delay = 1 SECONDS, \ ) + */ + AddComponent(\ + /datum/component/gun_booster, \ + booster_action = /datum/action/item_action/booster/sol_super, \ + base_damage_mult = 1, \ + base_speed_mult = 1, \ + base_fire_delay = 0.75 SECONDS, \ + amped_damage_mult = 1.05, \ + amped_speed_mult = 1.25, \ + amped_fire_delay = 1 SECONDS, \ + ) RegisterSignal(src, COMSIG_GUN_BOOSTER_TOGGLED, PROC_REF(on_booster_toggle)) /obj/item/gun/ballistic/shotgun/riot/sol/super/Destroy(force) @@ -238,6 +250,7 @@ /obj/item/gun/ballistic/shotgun/doublebarrel/super/Initialize(mapload) . = ..() + /* // TFF EDIT START - ORIGINAL:. AddComponent(\ /datum/component/gun_booster, \ booster_action = /datum/action/item_action/booster/doublebarrel_super, \ @@ -248,6 +261,18 @@ amped_speed_mult = 1.5, \ amped_fire_delay = 0.6 SECONDS, \ ) + */ + AddComponent(\ + /datum/component/gun_booster, \ + booster_action = /datum/action/item_action/booster/doublebarrel_super, \ + base_damage_mult = 1, \ + base_speed_mult = 1.1, \ + base_fire_delay = 1 SECONDS, \ + amped_damage_mult = 1.1, \ + amped_speed_mult = 1.25, \ + amped_fire_delay = 1.2 SECONDS, \ + ) + // TFF EDIT END AddComponent(/datum/component/scope, range_modifier = 2) RegisterSignal(src, COMSIG_GUN_BOOSTER_TOGGLED, PROC_REF(on_booster_toggle)) diff --git a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/rifle.dm b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/rifle.dm index 81a64d8c83f..bf2b8140e48 100644 --- a/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/rifle.dm +++ b/modular_nova/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/rifle.dm @@ -35,7 +35,7 @@ suppressor_y_offset = 1 burst_size = 1 - fire_delay = 0.25 SECONDS + fire_delay = 0.35 SECONDS actions_types = list() spread = 2 diff --git a/modular_nova/modules/sec_haul/code/guns/armory_spawns.dm b/modular_nova/modules/sec_haul/code/guns/armory_spawns.dm index 832b8a1e0f0..c9d16e90bff 100644 --- a/modular_nova/modules/sec_haul/code/guns/armory_spawns.dm +++ b/modular_nova/modules/sec_haul/code/guns/armory_spawns.dm @@ -93,8 +93,6 @@ guns = list( /obj/item/storage/toolbox/guncase/nova/carwo_large_case/sindano, /obj/item/storage/toolbox/guncase/nova/carwo_large_case/sindano, - /* // FLUFFY FRONTIER REMOVAL START - /obj/item/storage/toolbox/guncase/nova/carwo_large_case/sol_classic, /obj/item/storage/toolbox/guncase/nova/carwo_large_case/sol_classic, - */ // FLUFFY FRONTIER REMOVAL END ) diff --git a/modular_nova/modules/traitor-uplinks/additions/ammunition.dm b/modular_nova/modules/traitor-uplinks/additions/ammunition.dm index 51988901a24..ae480cf1617 100644 --- a/modular_nova/modules/traitor-uplinks/additions/ammunition.dm +++ b/modular_nova/modules/traitor-uplinks/additions/ammunition.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* // LOW COST /datum/uplink_item/ammo/enforcer name = "Enforcer 10mm Magazine Case" @@ -163,3 +165,5 @@ item = /obj/item/ammo_box/speedloader/c357/haywire cost = /datum/uplink_item/high_cost/ammunition::cost purchasable_from = UPLINK_TRAITORS | UPLINK_SERIOUS_OPS +// TFF REMOVAL START - RETURN COSTS TO TG - START: +*/ diff --git a/modular_nova/modules/traitor-uplinks/additions/badass.dm b/modular_nova/modules/traitor-uplinks/additions/badass.dm index 11b91f684ed..070df4d2eca 100644 --- a/modular_nova/modules/traitor-uplinks/additions/badass.dm +++ b/modular_nova/modules/traitor-uplinks/additions/badass.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* // LOW COST /datum/uplink_item/badass/guerilla_gloves name = "Guerilla Gloves" @@ -57,3 +59,4 @@ ), src) // HIGH COST +*/ diff --git a/modular_nova/modules/traitor-uplinks/additions/dangerous.dm b/modular_nova/modules/traitor-uplinks/additions/dangerous.dm index 913c8109339..9974e7de528 100644 --- a/modular_nova/modules/traitor-uplinks/additions/dangerous.dm +++ b/modular_nova/modules/traitor-uplinks/additions/dangerous.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* // LOW COST /datum/uplink_item/dangerous/foamsmg name = "Donksoft Riot SMG Case" @@ -140,3 +142,4 @@ item = /obj/item/storage/toolbox/guncase/nova/opfor/hook_shotgun cost = /datum/uplink_item/high_cost/weaponry::cost purchasable_from = UPLINK_TRAITORS | UPLINK_SERIOUS_OPS +*/ diff --git a/modular_nova/modules/traitor-uplinks/additions/device_tools.dm b/modular_nova/modules/traitor-uplinks/additions/device_tools.dm index fae61a4916b..a7eac234464 100644 --- a/modular_nova/modules/traitor-uplinks/additions/device_tools.dm +++ b/modular_nova/modules/traitor-uplinks/additions/device_tools.dm @@ -4,14 +4,14 @@ desc = "Based on a Nanotrasen model, this powerful tool can be used as both a crowbar and a pair of wirecutters. \ In its crowbar configuration, it can be used to force open airlocks. Very useful for entering the station or its departments." item = /obj/item/crowbar/power/syndicate - cost = /datum/uplink_item/low_cost::cost + cost = 3 // TFF EDIT - ORIGINAL: cost = /datum/uplink_item/low_cost::cost purchasable_from = UPLINK_TRAITORS | UPLINK_SERIOUS_OPS /datum/uplink_item/device_tools/syndicateborg name = "Syndicate Cyborg Upgrade" desc = "A marvel of modern syndicate technology; a syndicate borg hijacker. Allowing for the use of extremely powerful repair nanites, building equipment and otherwise useful upgrades to the standard saboteur modules." item = /obj/item/borg/upgrade/transform/syndicatejack - cost = /datum/uplink_item/low_cost::cost + cost = 4 // TFF EDIT - ORIGINAL: cost = /datum/uplink_item/low_cost::cost purchasable_from = UPLINK_TRAITORS /datum/uplink_item/device_tools/syndikush @@ -30,14 +30,14 @@ Use on any item to make it undroppable. \ Be careful not to glue an item you're already holding!" item = /obj/item/syndie_glue - cost = /datum/uplink_item/medium_cost::cost + cost = 6 // TFF EDIT - ORIGINAL: cost = /datum/uplink_item/medium_cost::cost purchasable_from = UPLINK_TRAITORS | UPLINK_SPY /datum/uplink_item/ammo/evil_module name = "Ammo Fabricator Advanced Lethal Authentication Module" desc = "A Gorlex Marauders-modified ammunition fabricator module, loaded with the authentication keys for causing lots and lots of problems." item = /obj/item/ammo_workbench_module/lethal_super/evil - cost = /datum/uplink_item/medium_cost::cost + cost = 6 // TFF EDIT - ORIGINAL: cost = /datum/uplink_item/low_cost::cost uplink_item_flags = SYNDIE_TRIPS_CONTRABAND purchasable_from = UPLINK_TRAITORS | UPLINK_SERIOUS_OPS diff --git a/modular_nova/modules/traitor-uplinks/additions/species.dm b/modular_nova/modules/traitor-uplinks/additions/species.dm index b8449d126d3..46da78dbfb6 100644 --- a/modular_nova/modules/traitor-uplinks/additions/species.dm +++ b/modular_nova/modules/traitor-uplinks/additions/species.dm @@ -6,7 +6,7 @@ name = "Xeno-organ Implant Kit" desc = "An organ implant kit filled with illegally obtained xenomorph organs." item = /obj/item/storage/organbox/strange - cost = /datum/uplink_item/medium_cost::cost + cost = 6 // TFF EDIT - ORIGINAL: cost = /datum/uplink_item/medium_cost::cost restricted_species = list(SPECIES_XENO) surplus = 5 diff --git a/modular_nova/modules/traitor-uplinks/additions/suits.dm b/modular_nova/modules/traitor-uplinks/additions/suits.dm index 15cd41390d0..25d87c9ca71 100644 --- a/modular_nova/modules/traitor-uplinks/additions/suits.dm +++ b/modular_nova/modules/traitor-uplinks/additions/suits.dm @@ -3,19 +3,19 @@ name = "Nakamura Standard MODsuit" desc = "A third-generation, modular civilian class suit by Nakamura Engineering, this suit is a staple across the galaxy for civilian applications." item = /obj/item/mod/control/pre_equipped/empty - cost = /datum/uplink_item/low_cost/modsuit::cost + cost = 6 // TFF EDIT - ORIGINAL: cost = /datum/uplink_item/low_cost/modsuit::cost /datum/uplink_item/suits/modsuit_contractor name = "Contractor MODsuit" desc = "A rare depart from the Syndicate's usual color scheme, this MODsuit is produced and manufactured for private mercenaries." item = /obj/item/mod/control/pre_equipped/contractor - cost = /datum/uplink_item/low_cost/modsuit::cost + cost = 8 // TFF EDIT - ORIGINAL: cost = /datum/uplink_item/low_cost/modsuit::cost /datum/uplink_item/suits/modsuit_elite name = "Elite MODsuit" desc = "An evolution of the syndicate suit, featuring a bulkier build and a matte black color scheme, this suit is only produced for high ranking Syndicate officers and elite strike teams." item = /obj/item/mod/control/pre_equipped/elite/unrestricted - cost = /datum/uplink_item/high_cost/modsuit::cost + cost = 16 // TFF EDIT - ORIGINAL: cost = /datum/uplink_item/high_cost/modsuit::cost // LOW COST @@ -24,13 +24,13 @@ desc = "A mod module collects and repackages fired foam darts (and garbage) into half-sized boxes of riot foam darts. \ Activate on a nearby turf or storage to unload stored ammo boxes." item = /obj/item/mod/module/recycler/donk - cost = /datum/uplink_item/low_cost::cost + cost = 3 // TFF EDIT - ORIGINAL: cost = /datum/uplink_item/low_cost::cost /datum/uplink_item/suits/flamethrower name = "MODsuit Flamethrower" desc = "A custom-manufactured flamethrower, used to burn through your path. Burn well." item = /obj/item/mod/module/flamethrower - cost = /datum/uplink_item/low_cost::cost + cost = 3 // TFF EDIT - ORIGINAL: cost = /datum/uplink_item/low_cost::cost /datum/uplink_item/suits/energy_shield name = "MODsuit Energy-Shield" @@ -39,7 +39,7 @@ and the power cost can be an easy indicator of this. However, it is capable of blocking nearly any incoming attack, \ but only once every few seconds; a grim reminder of the users mortality." item = /obj/item/mod/module/energy_shield - cost = /datum/uplink_item/low_cost::cost + cost = 4 // TFF EDIT - ORIGINAL: cost = /datum/uplink_item/low_cost::cost // MEDIUM COST @@ -48,7 +48,7 @@ desc = "A specialised ionic thruster which provides a short but powerful boost capable of pushing against gravity, \ after which time it needs to recharge." item = /obj/item/mod/module/jump_jet - cost = /datum/uplink_item/medium_cost::cost + cost = /datum/uplink_item/medium_cost::cost // TFF EDIT - ORIGINAL: cost = /datum/uplink_item/medium_cost::cost // HIGH COST @@ -56,4 +56,4 @@ name = "MODsuit Bulwark" desc = "Layers upon layers of shock dampening plates, just to stop you from getting shoved into a wall by an angry mob." item = /obj/item/mod/module/shove_blocker - cost = /datum/uplink_item/high_cost::cost + cost = 6 // TFF EDIT - ORIGINAL: cost = /datum/uplink_item/high_cost::cost diff --git a/modular_nova/modules/traitor-uplinks/overwrites/ammunition.dm b/modular_nova/modules/traitor-uplinks/overwrites/ammunition.dm index bda859cdf46..2bad5de1332 100644 --- a/modular_nova/modules/traitor-uplinks/overwrites/ammunition.dm +++ b/modular_nova/modules/traitor-uplinks/overwrites/ammunition.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* /* Includes: /datum/uplink_category/ammo /datum/uplink_item/ammo @@ -32,3 +34,5 @@ // HIGH COST +// TFF REMOVAL START - RETURN COSTS TO TG - START: +*/ diff --git a/modular_nova/modules/traitor-uplinks/overwrites/badass.dm b/modular_nova/modules/traitor-uplinks/overwrites/badass.dm index e3369ade95c..320e5f67dfe 100644 --- a/modular_nova/modules/traitor-uplinks/overwrites/badass.dm +++ b/modular_nova/modules/traitor-uplinks/overwrites/badass.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* /* Includes: /datum/uplink_category/badassery /datum/uplink_item/badass @@ -19,3 +21,4 @@ /datum/uplink_item/badass/dangerous_horse cost = /datum/uplink_item/high_cost::cost // cost = 10 +*/ diff --git a/modular_nova/modules/traitor-uplinks/overwrites/bundle.dm b/modular_nova/modules/traitor-uplinks/overwrites/bundle.dm index 97097fa9b94..0fbc5d2262a 100644 --- a/modular_nova/modules/traitor-uplinks/overwrites/bundle.dm +++ b/modular_nova/modules/traitor-uplinks/overwrites/bundle.dm @@ -5,7 +5,8 @@ // LOW COST - +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* // MEDIUM COST /datum/uplink_item/bundles_tc/bundle_a cost = /datum/uplink_item/medium_cost/bundle::cost @@ -35,3 +36,5 @@ // HIGH COST +*/ +// TFF REMOVAL START - RETURN COSTS TO TG - END diff --git a/modular_nova/modules/traitor-uplinks/overwrites/contractor.dm b/modular_nova/modules/traitor-uplinks/overwrites/contractor.dm index c5f9a5d5b2b..836142d4eb1 100644 --- a/modular_nova/modules/traitor-uplinks/overwrites/contractor.dm +++ b/modular_nova/modules/traitor-uplinks/overwrites/contractor.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* /// How much TC should an operative have left after buying the contractor kit, factoring in the default TC granted below. #define CONTRACTOR_KIT_REMAINING_TC (/datum/uplink_item/low_cost/modsuit::cost + /datum/uplink_item/low_cost::cost) /// Static define that will automatically update according to the traitor's default TC amount, factoring in the desired remaining TC defined above. @@ -18,8 +20,9 @@ // LOW COST - // MEDIUM COST // HIGH COST +// TFF REMOVAL START - RETURN COSTS TO TG - START: +*/ diff --git a/modular_nova/modules/traitor-uplinks/overwrites/dangerous.dm b/modular_nova/modules/traitor-uplinks/overwrites/dangerous.dm index deb1f447c7f..f7363a72d2e 100644 --- a/modular_nova/modules/traitor-uplinks/overwrites/dangerous.dm +++ b/modular_nova/modules/traitor-uplinks/overwrites/dangerous.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* /* Includes: /datum/uplink_category/dangerous /datum/uplink_item/dangerous @@ -42,3 +44,4 @@ /datum/uplink_item/dangerous/doublesword cost = /datum/uplink_item/high_cost/weaponry::cost // cost = 13 +*/ diff --git a/modular_nova/modules/traitor-uplinks/overwrites/device_tools.dm b/modular_nova/modules/traitor-uplinks/overwrites/device_tools.dm index 83f2c0ca678..0d42d8949d5 100644 --- a/modular_nova/modules/traitor-uplinks/overwrites/device_tools.dm +++ b/modular_nova/modules/traitor-uplinks/overwrites/device_tools.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* /* Includes: /datum/uplink_category/device_tools /datum/uplink_item/device_tools @@ -68,3 +70,4 @@ /datum/uplink_item/device_tools/powersink cost = /datum/uplink_item/high_cost::cost // cost = 11 +*/ diff --git a/modular_nova/modules/traitor-uplinks/overwrites/explosive.dm b/modular_nova/modules/traitor-uplinks/overwrites/explosive.dm index 8ee0337f5db..da9850e92a3 100644 --- a/modular_nova/modules/traitor-uplinks/overwrites/explosive.dm +++ b/modular_nova/modules/traitor-uplinks/overwrites/explosive.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* /* Includes: /datum/uplink_category/explosives /datum/uplink_item/explosives @@ -29,3 +31,4 @@ /datum/uplink_item/explosives/syndicate_bomb/emp cost = /datum/uplink_item/high_cost/explosive::cost // cost = 22 (parent type * 2) +*/ diff --git a/modular_nova/modules/traitor-uplinks/overwrites/implant.dm b/modular_nova/modules/traitor-uplinks/overwrites/implant.dm index 48d17c7743b..641ff9077de 100644 --- a/modular_nova/modules/traitor-uplinks/overwrites/implant.dm +++ b/modular_nova/modules/traitor-uplinks/overwrites/implant.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* /* Includes: /datum/uplink_category/implants /datum/uplink_item/implants @@ -23,3 +25,4 @@ /datum/uplink_item/implants/storage cost = /datum/uplink_item/high_cost::cost // cost = 8 +*/ diff --git a/modular_nova/modules/traitor-uplinks/overwrites/job.dm b/modular_nova/modules/traitor-uplinks/overwrites/job.dm index 527e5030320..5f225203e86 100644 --- a/modular_nova/modules/traitor-uplinks/overwrites/job.dm +++ b/modular_nova/modules/traitor-uplinks/overwrites/job.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* /* Includes: /datum/uplink_category/role_restricted /datum/uplink_item/role_restricted @@ -108,3 +110,4 @@ /datum/uplink_item/role_restricted/blastcannon purchasable_from = NONE +*/ diff --git a/modular_nova/modules/traitor-uplinks/overwrites/special.dm b/modular_nova/modules/traitor-uplinks/overwrites/special.dm index 6a5aa3b35d4..5be7d0d2908 100644 --- a/modular_nova/modules/traitor-uplinks/overwrites/special.dm +++ b/modular_nova/modules/traitor-uplinks/overwrites/special.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* /* Includes: /datum/uplink_category/special /datum/uplink_item/special @@ -13,3 +15,4 @@ // HIGH COST +*/ diff --git a/modular_nova/modules/traitor-uplinks/overwrites/stealthy.dm b/modular_nova/modules/traitor-uplinks/overwrites/stealthy.dm index f9543ccc1eb..0d8a7d02087 100644 --- a/modular_nova/modules/traitor-uplinks/overwrites/stealthy.dm +++ b/modular_nova/modules/traitor-uplinks/overwrites/stealthy.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* /* Includes: /datum/uplink_category/stealthy /datum/uplink_item/stealthy_weapons @@ -26,3 +28,4 @@ // HIGH COST /datum/uplink_item/stealthy_weapons/romerol_kit purchasable_from = NONE +*/ diff --git a/modular_nova/modules/traitor-uplinks/overwrites/stealthy_tools.dm b/modular_nova/modules/traitor-uplinks/overwrites/stealthy_tools.dm index aaf1c20a9db..2d33efae608 100644 --- a/modular_nova/modules/traitor-uplinks/overwrites/stealthy_tools.dm +++ b/modular_nova/modules/traitor-uplinks/overwrites/stealthy_tools.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* /* Includes: /datum/uplink_category/stealthy_tools /datum/uplink_item/stealthy_tools @@ -26,3 +28,4 @@ // HIGH COST +*/ diff --git a/modular_nova/modules/traitor-uplinks/overwrites/suits.dm b/modular_nova/modules/traitor-uplinks/overwrites/suits.dm index 40c4a79ab50..f20a61d130a 100644 --- a/modular_nova/modules/traitor-uplinks/overwrites/suits.dm +++ b/modular_nova/modules/traitor-uplinks/overwrites/suits.dm @@ -1,3 +1,5 @@ +// TFF REMOVAL START - RETURN COSTS TO TG - START: +/* /* Includes: /datum/uplink_category/suits /datum/uplink_item/suits @@ -23,3 +25,4 @@ // HIGH COST +*/ diff --git a/modular_nova/modules/traitor-uplinks/standard_cost.dm b/modular_nova/modules/traitor-uplinks/standard_cost.dm index 7b31fd080f0..339308f012d 100644 --- a/modular_nova/modules/traitor-uplinks/standard_cost.dm +++ b/modular_nova/modules/traitor-uplinks/standard_cost.dm @@ -5,6 +5,8 @@ */ +// TFF REMOVAL - RETURN COSTS TO TG - START: +/* /// TC cost for generic uplink gadgets /datum/uplink_item/low_cost cost = 3 @@ -83,3 +85,5 @@ /datum/uplink_item/high_cost/bundle cost = 30 +*/ +// TFF REMOVAL - RETURN COSTS TO TG - END: diff --git a/tff_modular/modules/ALMG-90/code/almg.dm b/tff_modular/modules/ALMG-90/code/almg.dm index 08d073b32d4..0d1ef45a4b1 100644 --- a/tff_modular/modules/ALMG-90/code/almg.dm +++ b/tff_modular/modules/ALMG-90/code/almg.dm @@ -3,6 +3,9 @@ . = ..() insert_all_icons("", 'tff_modular/modules/ALMG-90/icons/ALMG-90.dmi') +/obj/projectile/beam/laser/rapid/mecha + damage = 12.5 + // Добавляем лазерный аналог Ultra AC 2 для мехов /obj/item/mecha_parts/mecha_equipment/weapon/energy/amlg90 name = "\improper AMLG-90" @@ -10,7 +13,7 @@ icon = 'tff_modular/modules/ALMG-90/icons/ALMG-90.dmi' icon_state = "mecha_amlg90" equip_cooldown = 10 - projectile = /obj/projectile/beam/laser/rapid + projectile = /obj/projectile/beam/laser/rapid/mecha fire_sound = 'tff_modular/modules/ALMG-90/sound/gunshot_lascarbine.ogg' energy_drain = 120 projectiles_per_shot = 3 diff --git a/tff_modular/modules/antagonism_updates/bloodred_cutter/code/bloodred_plasmacutter.dm b/tff_modular/modules/antagonism_updates/bloodred_cutter/code/bloodred_plasmacutter.dm index 00cf3946d78..71d077a7690 100644 --- a/tff_modular/modules/antagonism_updates/bloodred_cutter/code/bloodred_plasmacutter.dm +++ b/tff_modular/modules/antagonism_updates/bloodred_cutter/code/bloodred_plasmacutter.dm @@ -15,7 +15,7 @@ e_cost = LASER_SHOTS(20, STANDARD_CELL_CHARGE) /obj/projectile/plasma/adv/bloodred - damage = 37 + damage = 24 range = 7 mine_range = 9 diff --git a/tff_modular/modules/antagonism_updates/guardianbuff/code/guardianbuffs.dm b/tff_modular/modules/antagonism_updates/guardianbuff/code/guardianbuffs.dm index 383b4b1f161..57e9dd3d2be 100644 --- a/tff_modular/modules/antagonism_updates/guardianbuff/code/guardianbuffs.dm +++ b/tff_modular/modules/antagonism_updates/guardianbuff/code/guardianbuffs.dm @@ -1,3 +1,4 @@ +/* /mob/living/basic/guardian/standard melee_damage_lower = 30 melee_damage_upper = 30 @@ -68,3 +69,4 @@ /datum/action/cooldown/mob_cooldown/guardian_bluespace_beacon cooldown_time = 2.5 MINUTES +*/ diff --git a/tff_modular/modules/antagonism_updates/guardianbuff/code/other_creator.dm b/tff_modular/modules/antagonism_updates/guardianbuff/code/other_creator.dm index 5d57069d24e..b8a1211d767 100644 --- a/tff_modular/modules/antagonism_updates/guardianbuff/code/other_creator.dm +++ b/tff_modular/modules/antagonism_updates/guardianbuff/code/other_creator.dm @@ -1,4 +1,4 @@ - +/* /obj/item/guardian_creator/miner //add more types to dusty shard!!!! possible_guardians = list( /mob/living/basic/guardian/charger, @@ -9,3 +9,4 @@ /mob/living/basic/guardian/explosive, /mob/living/basic/guardian/assassin, ) +*/ diff --git a/tff_modular/modules/antagonism_updates/uplink_item/code/categories/ammuniton.dm b/tff_modular/modules/antagonism_updates/uplink_item/code/categories/ammuniton.dm index db3dccd3733..f743f2c7ea6 100644 --- a/tff_modular/modules/antagonism_updates/uplink_item/code/categories/ammuniton.dm +++ b/tff_modular/modules/antagonism_updates/uplink_item/code/categories/ammuniton.dm @@ -5,27 +5,27 @@ desc = "An additional 15-round 9mm magazine, compatible with the Stechkin APS machine pistol." item = /obj/item/ammo_box/magazine/m9mm_aps purchasable_from = ~UPLINK_ALL_SYNDIE_OPS - cost = 1 + cost = 2 /datum/uplink_item/ammo/smg_traitor name = ".45 SMG Magazine" desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun." item = /obj/item/ammo_box/magazine/smgm45 - cost = 1 + cost = 2 /datum/uplink_item/ammo/smgap_traitor name = ".45 Armor Piercing SMG Magazine" desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun.\ These rounds are less effective at injuring the target but penetrate protective gear." item = /obj/item/ammo_box/magazine/smgm45/ap - cost = 1 + cost = 2 /datum/uplink_item/ammo/smgfire_traitor name = ".45 Incendiary SMG Magazine" desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun.\ Loaded with incendiary rounds which inflict little damage, but ignite the target." item = /obj/item/ammo_box/magazine/smgm45/incen - cost = 1 + cost = 4 /datum/uplink_item/ammo/smgempty_traitor name = "Empty .45 SMG Magazine" @@ -38,14 +38,14 @@ name = "12g Buckshot Drum" desc = "An additional 8-round buckshot magazine for use with the Bulldog shotgun. Front towards enemy." item = /obj/item/ammo_box/magazine/m12g - cost = 1 + cost = 2 /datum/uplink_item/ammo/shotgun/dragon_traitor name = "12g Dragon's Breath Drum" desc = "An alternative 8-round dragon's breath magazine for use in the Bulldog shotgun. \ 'I'm a fire starter, twisted fire starter!'" item = /obj/item/ammo_box/magazine/m12g/dragon - cost = 1 + cost = 3 /datum/uplink_item/ammo/shotgun/meteor_traitor @@ -53,7 +53,7 @@ desc = "An alternative 8-round meteorslug magazine for use in the Bulldog shotgun. \ Great for blasting airlocks off their frames and knocking down enemies." limited_stock = 1 - cost = 1 + cost = 4 item = /obj/item/ammo_box/magazine/m12g/meteor purchasable_from = ~UPLINK_ALL_SYNDIE_OPS @@ -61,25 +61,15 @@ name = "12g Slug Drum" desc = "An additional 8-round slug magazine for use with the Bulldog shotgun. \ Now 8 times less likely to shoot your pals." - cost = 1 + cost = 3 item = /obj/item/ammo_box/magazine/m12g/slug - -/datum/uplink_item/ammo/shotgun/empty_traitor - name = "Empty 12g Drum" - desc = "An empty 8-round magazine for use in the Bulldog shotgun. \ - Ammunition not included." - cost = 1 - item = /obj/item/ammo_box/magazine/m12g/empty - - /datum/uplink_item/ammo/pistolap name = "9mm Armour Piercing Magazine" desc = "An additional 8-round 9mm magazine, compatible with the Makarov pistol. \ These rounds are less effective at injuring the target but penetrate protective gear." item = /obj/item/ammo_box/magazine/m9mm/ap purchasable_from = ~UPLINK_ALL_SYNDIE_OPS - cost = 1 /datum/uplink_item/ammo/pistolhp name = "9mm Hollow Point Magazine" @@ -87,7 +77,6 @@ These rounds are more damaging but ineffective against armour." item = /obj/item/ammo_box/magazine/m9mm/hp purchasable_from = ~UPLINK_ALL_SYNDIE_OPS - cost = 1 /datum/uplink_item/ammo/pistolfire name = "9mm Incendiary Magazine" @@ -95,7 +84,6 @@ Loaded with incendiary rounds which inflict little damage, but ignite the target." item = /obj/item/ammo_box/magazine/m9mm/fire purchasable_from = ~UPLINK_ALL_SYNDIE_OPS - cost = 1 /datum/uplink_item/ammo/revolver name = ".357 Speed Loader" @@ -104,4 +92,3 @@ item = /obj/item/ammo_box/speedloader/c357 purchasable_from = ~(UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) //nukies get their own version uplink_item_flags = SYNDIE_TRIPS_CONTRABAND - cost = 1 diff --git a/tff_modular/modules/antagonism_updates/uplink_item/code/categories/badass.dm b/tff_modular/modules/antagonism_updates/uplink_item/code/categories/badass.dm index c0db71c9360..c3c57eeaf21 100644 --- a/tff_modular/modules/antagonism_updates/uplink_item/code/categories/badass.dm +++ b/tff_modular/modules/antagonism_updates/uplink_item/code/categories/badass.dm @@ -2,7 +2,7 @@ name = "Syndicate Maid Outfit" desc = "A very obvious joke. A standard syndicate maid suit with bulky armor added to it. The added armor prevents you from wearing any extra outerwear" item = /obj/item/storage/box/syndimaid - cost = /datum/uplink_item/low_cost/modsuit::cost // Same as the redsuit mod. It's worse than it in almost every way but that's by design + cost = 8 // Same as the redsuit mod. It's worse than it in almost every way but that's by design cant_discount = TRUE uplink_item_flags = SYNDIE_TRIPS_CONTRABAND diff --git a/tff_modular/modules/antagonism_updates/uplink_item/code/categories/dangerous.dm b/tff_modular/modules/antagonism_updates/uplink_item/code/categories/dangerous.dm index aac311818e0..d3404f5f73b 100644 --- a/tff_modular/modules/antagonism_updates/uplink_item/code/categories/dangerous.dm +++ b/tff_modular/modules/antagonism_updates/uplink_item/code/categories/dangerous.dm @@ -4,7 +4,7 @@ desc = "An ancient Soviet machine pistol, refurbished for the modern age. Uses 9mm auto rounds in 15-round magazines and is compatible \ with suppressors. The gun fires in three round bursts." item = /obj/item/gun/ballistic/automatic/pistol/aps - cost = /datum/uplink_item/medium_cost::cost + cost = 8 purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) @@ -14,7 +14,7 @@ desc = "A fully-loaded Scarborough Arms bullpup submachine gun. The C-20r fires .45 rounds with a \ 24-round magazine and is compatible with suppressors." item = /obj/item/gun/ballistic/automatic/c20r/unrestricted - cost = /datum/uplink_item/medium_cost/weaponry::cost + cost = 10 purchasable_from = ~UPLINK_ALL_SYNDIE_OPS progression_minimum = 30 MINUTES @@ -23,7 +23,7 @@ desc = "A fully-loaded semi-automatic drum-fed shotgun. Compatible with all 12g rounds. Designed for close \ quarter anti-personnel engagements." item = /obj/item/gun/ballistic/shotgun/bulldog/unrestricted - cost = /datum/uplink_item/medium_cost/weaponry::cost + cost = 14 progression_minimum = 50 MINUTES purchasable_from = ~UPLINK_ALL_SYNDIE_OPS @@ -39,9 +39,3 @@ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND restricted_roles = list(JOB_CARGO_TECHNICIAN, JOB_QUARTERMASTER) surplus = 5 - -/datum/uplink_item/device_tools/borer_egg - name = "Borer Egg" - desc = "Creates a borer egg that can give you various powers!" - item = /obj/effect/mob_spawn/ghost_role/borer_egg/traitor - cost = /datum/uplink_item/high_cost::cost diff --git a/tff_modular/modules/antagonism_updates/uplink_item/code/categories/device_tools.dm b/tff_modular/modules/antagonism_updates/uplink_item/code/categories/device_tools.dm index 28a31036c74..a541feca3e6 100644 --- a/tff_modular/modules/antagonism_updates/uplink_item/code/categories/device_tools.dm +++ b/tff_modular/modules/antagonism_updates/uplink_item/code/categories/device_tools.dm @@ -5,7 +5,6 @@ Also includes a remote control, disguised as an ordinary folder. Touch the briefcase with the remote to link it." surplus = 0 item = /obj/item/storage/briefcase/launchpad - cost = /datum/uplink_item/low_cost::cost /datum/uplink_item/device_tools/suspiciousphone name = "Protocol CRAB-17 Phone" @@ -13,11 +12,16 @@ The crew can move their funds to a new banking site though, unless they HODL, in which case they deserve it." item = /obj/item/suspiciousphone restricted = TRUE - cost = /datum/uplink_item/medium_cost::cost limited_stock = 1 /datum/uplink_item/device_tools/thief_gloves name = "Thief Gloves" desc = "Thief's gloves allow you to steal other people's things silently, but it takes some time..." item = /obj/item/clothing/gloves/color/black/thief - cost = /datum/uplink_item/low_cost::cost + cost = 6 + +/datum/uplink_item/device_tools/borer_egg + name = "Borer Egg" + desc = "Creates a borer egg that can give you various powers!" + item = /obj/effect/mob_spawn/ghost_role/borer_egg/traitor + cost = 16 diff --git a/tff_modular/modules/antagonism_updates/uplink_item/code/categories/explosive.dm b/tff_modular/modules/antagonism_updates/uplink_item/code/categories/explosive.dm index ecb33810adb..bfc9bbb4b2b 100644 --- a/tff_modular/modules/antagonism_updates/uplink_item/code/categories/explosive.dm +++ b/tff_modular/modules/antagonism_updates/uplink_item/code/categories/explosive.dm @@ -4,10 +4,6 @@ detonate tablets of crewmembers who have their message feature enabled. \ The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer." item = /obj/item/disk/computer/virus/detomatix - cost = /datum/uplink_item/low_cost/explosive::cost + cost = 6 limited_stock = 1 restricted = TRUE - -// TFF override for EMP cost -/datum/uplink_item/explosives/emp - cost = /datum/uplink_item/low_cost/explosive::cost diff --git a/tff_modular/modules/antagonism_updates/uplink_item/code/categories/stealthy_weapons.dm b/tff_modular/modules/antagonism_updates/uplink_item/code/categories/stealthy_weapons.dm index fbb6138f1e2..e8e172f256a 100644 --- a/tff_modular/modules/antagonism_updates/uplink_item/code/categories/stealthy_weapons.dm +++ b/tff_modular/modules/antagonism_updates/uplink_item/code/categories/stealthy_weapons.dm @@ -2,7 +2,7 @@ name = "CQC Manual" desc = "A manual that teaches a single user tactical Close-Quarters Combat before self-destructing." item = /obj/item/book/granter/martial/cqc - cost = /datum/uplink_item/medium_cost/martial_arts::cost + cost = 17 surplus = 17 progression_minimum = 30 MINUTES purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) diff --git a/tff_modular/modules/gun_balance/pistol.dm b/tff_modular/modules/gun_balance/pistol.dm index 9c59dd94527..53357a93976 100644 --- a/tff_modular/modules/gun_balance/pistol.dm +++ b/tff_modular/modules/gun_balance/pistol.dm @@ -1,3 +1,4 @@ + //родной файл - modular_nova/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/pistol.dm /obj/projectile/bullet/c35sol diff --git a/tff_modular/modules/gun_balance/rifles.dm b/tff_modular/modules/gun_balance/rifles.dm index 0b5e377a544..ac80fe21a2e 100644 --- a/tff_modular/modules/gun_balance/rifles.dm +++ b/tff_modular/modules/gun_balance/rifles.dm @@ -1,7 +1,10 @@ // родной файл - modular_nova/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/rifle.dm /obj/projectile/bullet/c40sol + name = ".40 Sol Long bullet" damage = 35 + wound_bonus = -30 + exposed_wound_bonus = -35 /obj/projectile/bullet/c40sol/fragmentation damage = 15 diff --git a/tff_modular/modules/gun_balance/shotgun.dm b/tff_modular/modules/gun_balance/shotgun.dm index 959284efd91..d042a48fa86 100644 --- a/tff_modular/modules/gun_balance/shotgun.dm +++ b/tff_modular/modules/gun_balance/shotgun.dm @@ -1,33 +1,67 @@ //родной - modular_nova/modules/shotgunrebalance/code/shotgun.dm +/obj/projectile/bullet/pellet/shotgun_buckshot/milspec + damage = 5.5 + damage_falloff_tile = -0.1 + wound_falloff_tile = -0.25 + speed = 1.5 + armour_penetration = 5 + +/obj/projectile/bullet/pellet/shotgun_buckshot + damage = 5 + wound_bonus = 5 + exposed_wound_bonus = 5 + /obj/projectile/bullet/shotgun_slug - damage = 50 + damage = 35 wound_bonus = 5 exposed_wound_bonus = 10 +/obj/item/gun/ballistic/shotgun/automatic/combat + projectile_damage_multiplier = 1.2 + /obj/projectile/bullet/shotgun_slug/milspec - damage = 60 + damage = 38 wound_bonus = 10 exposed_wound_bonus = 10 /obj/item/ammo_casing/shotgun/buckshot - pellets = 12 // 5 * 12 for 60 damage if every pellet hits + pellets = 12 variance = 18 /obj/item/ammo_casing/shotgun/magnum - pellets = 6 // Half as many pellets for twice the damage each pellet, same overall damage as buckshot + pellets = 6 variance = 15 - /obj/projectile/bullet/pellet/shotgun_buckshot/magnum + damage = 6 exposed_wound_bonus = 10 +/obj/projectile/bullet/pellet/shotgun_buckshot/flechette_nova + damage = 4 + +/obj/projectile/bullet/pellet/flechette + damage = 4 + +/obj/projectile/bullet/shotgun_slug/hunter + damage = 20 + +/obj/projectile/bullet/incendiary/shotgun/no_trail + damage = 25 + +/obj/item/ammo_casing/shotgun/scatterlaser + projectile_type = /obj/projectile/beam/scatter/tff + +/obj/projectile/beam/scatter/tff + damage = 6 + /obj/item/ammo_casing/shotgun/express - pellets = 15 // 4 * 15 for 60 damage, with less spread then buckshot. + pellets = 15 variance = 22 /obj/projectile/bullet/pellet/shotgun_buckshot/express - damage = 4 + damage = 3.4 + //TFF баф дроби, выпилить бы /obj/item/ammo_casing/shotgun/rubbershot variance = 16 @@ -35,10 +69,10 @@ /obj/item/ammo_casing/shotgun/ion variance = 10 -/obj/item/ammo_casing/shotgun/incapacitate +/obj/item/ammo_casing/shotgun/flechette variance = 18 -/obj/item/ammo_casing/shotgun/flechette +/obj/item/ammo_casing/shotgun/incapacitate variance = 18 /obj/item/ammo_casing/shotgun/antitide @@ -46,6 +80,8 @@ /obj/item/gun/ballistic/shotgun/katyusha weapon_weight = WEAPON_HEAVY + fire_delay = 1 SECONDS /obj/item/gun/ballistic/shotgun/katyusha/shitzu slot_flags = ITEM_SLOT_BACK + diff --git a/tff_modular/modules/nabbers/code/abilites/toggle_arms.dm b/tff_modular/modules/nabbers/code/abilites/toggle_arms.dm index cf31461e018..74729acc823 100644 --- a/tff_modular/modules/nabbers/code/abilites/toggle_arms.dm +++ b/tff_modular/modules/nabbers/code/abilites/toggle_arms.dm @@ -5,7 +5,7 @@ icon_state = "mantis_arm_r" item_flags = ABSTRACT | DROPDEL w_class = WEIGHT_CLASS_HUGE - force = 25 + force = 15 throwforce = 0 //Просто предохранимся throw_range = 0 throw_speed = 0 diff --git a/tff_modular/modules/weaponry_rebalance/cawro.dm b/tff_modular/modules/weaponry_rebalance/cawro.dm new file mode 100644 index 00000000000..cf3f69a0a94 --- /dev/null +++ b/tff_modular/modules/weaponry_rebalance/cawro.dm @@ -0,0 +1,2 @@ +/obj/item/gun/ballistic/automatic/sol_smg + fire_delay = 0.3 SECONDS diff --git a/tff_modular/modules/weaponry_rebalance/nanotrasen.dm b/tff_modular/modules/weaponry_rebalance/nanotrasen.dm new file mode 100644 index 00000000000..79b497a4b74 --- /dev/null +++ b/tff_modular/modules/weaponry_rebalance/nanotrasen.dm @@ -0,0 +1,7 @@ +/obj/item/gun/ballistic/automatic/wt550 + fire_delay = 3 + +/obj/item/gun/ballistic/automatic/battle_rifle + max_shots_before_degradation = 10 + shots_before_degradation = 10 + degradation_probability = 10 diff --git a/tff_modular/modules/weaponry_rebalance/other.dm b/tff_modular/modules/weaponry_rebalance/other.dm new file mode 100644 index 00000000000..2707fba65f9 --- /dev/null +++ b/tff_modular/modules/weaponry_rebalance/other.dm @@ -0,0 +1,105 @@ +/mob/living/basic/space_dragon + health = 400 + maxHealth = 400 + damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, STAMINA = 0.5, OXY = 1) + +/obj/item/gun/energy/e_gun/nuclear + fire_delay = 10 + +/obj/item/gun/energy/laser/captain + charge_delay = 15 + +/obj/structure/carp_rift + max_integrity = 400 + +/obj/item/gun/ballistic/automatic/c20r + projectile_damage_multiplier = 0.75 + +// Это как бы не оружие, но оно тоже ломается из-за перехода на 100 хп +/obj/structure/millstone/mill_it_up(mob/living/carbon/human/user) + if(!length(contents)) + balloon_alert(user, "nothing to mill") + return + + if(user.get_stamina_loss() > 50) + balloon_alert(user, "too tired") + return + + if(!length(contents) || !in_range(src, user)) + return + + balloon_alert_to_viewers("grinding...") + + flick("millstone_spin", src) + playsound(src, 'sound/effects/stonedoor_openclose.ogg', 50, TRUE) + + user.adjust_stamina_loss(65) // Prevents spamming it + + var/skill_modifier = user.mind?.get_skill_modifier(/datum/skill/primitive, SKILL_SPEED_MODIFIER) + if(!do_after(user, 5 SECONDS * skill_modifier, target = src)) + balloon_alert_to_viewers("stopped grinding") + return + + for(var/target_item in contents) + seedify(target_item, t_max = 1) + + balloon_alert_to_viewers("finished grinding") + user.mind?.adjust_experience(/datum/skill/primitive, 5) + +/obj/projectile/bullet/incendiary/fire + damage = 5 + range = 5 + wound_bonus = 15 + fire_stacks = 2 + +/obj/projectile/bullet/incendiary/fire/backblast/short_range + range = 1 + +/obj/projectile/bullet/incendiary/fire + armor_flag = FIRE + +/obj/item/melee/implantarmblade/early + force = 8 + +/obj/item/melee/implantarmblade/energy + force = 15 + +// Это не оружие, но это буквально станционный синдимод, что не очень то вписывается +/datum/armor/mod_theme_infantry + melee = 35 + bullet = 30 + laser = 30 + energy = 40 + bomb = 25 + bio = 100 + fire = 50 + acid = 50 + wound = 10 + +// Возвращаем генокрадские штуки в игру +/datum/action/changeling/spiders + name = "Spread Infestation" + desc = "Our form divides, creating a cluster of eggs which will grow into a deadly arachnid. Costs 45 chemicals." + helptext = "The spiders are ruthless creatures, and may attack their creators when fully grown. Requires at least 3 DNA absorptions." + button_icon_state = "spread_infestation" + category = "utility" + chemical_cost = 45 + dna_cost = 1 + req_absorbs = 3 + +// Ensures that you cannot horrifically cheese the game by spawning spiders while in the vents +/datum/action/changeling/spiders/can_be_used_by(mob/living/user) + if (!isopenturf(user.loc)) + var/turf/user_turf = get_turf(user) + user_turf.balloon_alert(user, "not enough space!") + return FALSE + return ..() + +//Makes a spider egg cluster. Allows you enable further general havok by introducing spiders to the station. +/datum/action/changeling/spiders/sting_action(mob/user) + ..() + new /obj/effect/mob_spawn/ghost_role/spider/bloody(user.loc) + return TRUE + +/datum/action/changeling/sting/transformation + dna_cost = 2 diff --git a/tff_modular/modules/weaponry_rebalance/saibasan.dm b/tff_modular/modules/weaponry_rebalance/saibasan.dm new file mode 100644 index 00000000000..14b0746ed19 --- /dev/null +++ b/tff_modular/modules/weaponry_rebalance/saibasan.dm @@ -0,0 +1,5 @@ +/obj/projectile/beam/cybersun_laser + damage = 20 + +/obj/projectile/beam/cybersun_laser/hellfire + damage = 20 diff --git a/tff_modular/modules/weaponry_rebalance/sol.dm b/tff_modular/modules/weaponry_rebalance/sol.dm new file mode 100644 index 00000000000..43d4f274a37 --- /dev/null +++ b/tff_modular/modules/weaponry_rebalance/sol.dm @@ -0,0 +1,34 @@ +/obj/item/gun/ballistic/shotgun/riot/sol + fire_delay = 0.8 SECONDS + +/obj/item/gun/ballistic/shotgun/riot/sol/super + fire_delay = 0.75 SECONDS + +/obj/item/gun/ballistic/shotgun/doublebarrel + fire_delay = 1 SECONDS + +/obj/item/gun/ballistic/shotgun/doublebarrel/super + projectile_damage_multiplier = 1 + pb_knockback = 2 + +/obj/item/gun/ballistic/shotgun/doublebarrel/super/on_booster_toggle(datum/component/source, mob/user, amped) + if(amped) + fire_sound = amped_fire_sound + recoil = amped_recoil + pb_knockback = 3 + balloon_alert(user, "barrels amped") + else + fire_sound = base_fire_sound + recoil = base_recoil + pb_knockback = initial(pb_knockback) + balloon_alert(user, "barrels de-amped") + +/datum/supply_pack/companies/ballistics/sol_fed/longarm/outomaties + contains = list(/obj/item/gun/ballistic/automatic/sol_rifle) + cost = CARGO_CRATE_VALUE * 7 + +/obj/item/gun/ballistic/automatic/sol_rifle + projectile_damage_multiplier = 0.8 + +/obj/item/gun/ballistic/automatic/sol_rifle/marksman + projectile_damage_multiplier = 1 diff --git a/tff_modular/modules/weaponry_rebalance/szot_dynamica.dm b/tff_modular/modules/weaponry_rebalance/szot_dynamica.dm new file mode 100644 index 00000000000..1e915e00e2d --- /dev/null +++ b/tff_modular/modules/weaponry_rebalance/szot_dynamica.dm @@ -0,0 +1,5 @@ +/obj/item/gun/ballistic/automatic/napad + w_class = WEIGHT_CLASS_NORMAL + +/obj/item/gun/ballistic/automatic/miecz + fire_delay = 0.2 SECONDS diff --git a/tff_modular/modules/weaponry_rebalance/trappiste.dm b/tff_modular/modules/weaponry_rebalance/trappiste.dm new file mode 100644 index 00000000000..9b261c862ea --- /dev/null +++ b/tff_modular/modules/weaponry_rebalance/trappiste.dm @@ -0,0 +1,2 @@ +/obj/item/gun/ballistic/revolver/takbok + fire_delay = 1 SECONDS diff --git a/tff_modular/modules/weaponry_rebalance/uplink.dm b/tff_modular/modules/weaponry_rebalance/uplink.dm new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tgstation.dme b/tgstation.dme index d118893bd95..268634b4bb4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9891,6 +9891,13 @@ #include "tff_modular\modules\vulpkanin_accessories\code\ears.dm" #include "tff_modular\modules\vulpkanin_accessories\code\hair.dm" #include "tff_modular\modules\vulpkanin_accessories\code\snouts.dm" +#include "tff_modular\modules\weaponry_rebalance\cawro.dm" +#include "tff_modular\modules\weaponry_rebalance\nanotrasen.dm" +#include "tff_modular\modules\weaponry_rebalance\other.dm" +#include "tff_modular\modules\weaponry_rebalance\saibasan.dm" +#include "tff_modular\modules\weaponry_rebalance\sol.dm" +#include "tff_modular\modules\weaponry_rebalance\szot_dynamica.dm" +#include "tff_modular\modules\weaponry_rebalance\trappiste.dm" #include "tff_modular\modules\~donator\loadout.dm" #include "tff_modular\modules\~donator\clothes\donator_cloaks.dm" #include "tff_modular\modules\~donator\clothes\donator_glasses.dm"