Секреты

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)

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
 

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)
 

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'

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()

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

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"

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

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:

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"

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))
 

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

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
 	)

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:
+*/

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
+*/

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
+*/

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
@@ -19,7 +19,7 @@
 	desc = "A cheap Chinese vape cart that contains a potent combination of THC and \
 			stimulants. Not made with real crack."
 	item = /obj/item/reagent_containers/vapecart/syndicate
 	cost = /datum/uplink_item/low_cost::cost
 	purchasable_from = UPLINK_TRAITORS | UPLINK_SPY
 
 
@@ -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
 

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
 

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,12 +48,12 @@
 	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
 /datum/uplink_item/suits/shove_blocker
 	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

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:
+*/

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
+*/

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

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:
+*/

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
+*/

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
+*/

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)
+*/