Merge pull request #5576 from ARF-SS13/dan-is-thinking-about-gregtech

Tonights work - a few things, you know

code/__DEFINES/effects.dm

@@ -2,5 +2,6 @@
 
 #define EFFECT_NONE "none"
 #define EFFECT_SMOKE_CONE "smoke_cone"
+#define EFFECT_SMOKE_CONE_SMALL "smoke_cone_small"
 #define EFFECT_LINE_EFFECT "angled_line"
 #define EFFECT_PARTICLE_SPARKLE "particle_sparkle"

code/__DEFINES/turf_flags.dm

@@ -6,3 +6,5 @@
 #define CHANGETURF_RECALC_ADJACENT 32 //Immediately recalc adjacent atmos turfs instead of queuing.
 
 #define IS_OPAQUE_TURF(turf) (turf.directional_opacity == ALL_CARDINALS)
+#define OUTSIDE_JUNK_DISTRIBUTION list("nest" = 1, "salvage" = 2, "trash" = 2, "nothing" = 95)
+

code/_globalvars/lists/maintenance_loot.dm

@@ -212,8 +212,6 @@ GLOBAL_LIST_INIT(trash_chem, list(
 	/obj/item/export/bottle/whiskey = 10,
 	/obj/item/export/bottle/vodka = 10,
 	/obj/item/export/bottle/nukashine = 1,
-	/obj/item/stock_parts/chem_cartridge/garbage = 10,
-	/obj/item/stock_parts/chem_cartridge/simple = 1,
 	/obj/item/reagent_containers/pill/patch/jet = 5,
 	/obj/item/reagent_containers/pill/patch/turbo = 1,
 	/obj/item/reagent_containers/pill/healingpowder = 10,

code/_onclick/item_attack.dm

@@ -140,9 +140,9 @@
 			if(HAS_TRAIT(user, TRAIT_BIG_LEAGUES))
 				force_modifier += 25
 			if(HAS_TRAIT(user, TRAIT_LITTLE_LEAGUES))
-				force_modifier += 13
+				force_modifier += 18
 			if(HAS_TRAIT(user, TRAIT_GENTLE))
-				force_modifier += -13
+				force_modifier += -18
 			if(HAS_TRAIT(user, TRAIT_WIMPY))
 				force_modifier += -25
 			if(HAS_TRAIT(user, TRAIT_BUFFOUT_BUFF))

code/controllers/subsystem/mobs.dm

@@ -9,6 +9,7 @@ SUBSYSTEM_DEF(mobs)
 	var/static/list/dead_players_by_zlevel[][] = list(list()) // Needs to support zlevel 1 here, MaxZChanged only happens when z2 is created and new_players can login before that.
 	var/static/list/cubemonkeys = list()
 	var/static/list/cheeserats = list()
+	var/buggy_mob_running_away = FALSE
 
 	/// List of all mobs that are currently in some way alive and not dead (despawned counts too)
 	var/list/mob_tally = list()

code/controllers/subsystem/processing/quirks.dm

@@ -19,7 +19,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 	var/list/cached_all_categories = list() // A list of all categories, for the tgui
 	var/list/cached_all_quirks = list() // A list of all quirks, sorted by name, for the tgui -- no categories!
 	var/top_quirk // The top quirk, for the tgui
-	var/max_points = 6000 // Hey guess where this was
+	var/max_points = 100 // Hey guess where this was
 	var/max_good_quirks = 6 // Hey guess where this was
 
 	/// Demographic shit

code/controllers/subsystem/recoil.dm

@@ -16,7 +16,7 @@ SUBSYSTEM_DEF(recoil)
 	flags = SS_BACKGROUND
 	wait = 0.2 SECONDS // Fast processing! But, not too fast. Like a medium rare steak.
 	/// If false, just, just ignore this whole system, its not real. looks real but it isnt
-	var/use_recoil = FALSE
+	var/use_recoil = TRUE
 	/// Time to datumize the recoil system.
 	/// Format: list("ckey" = /datum/mob_recoil, ...)
 	var/list/mob_recoils = list()
@@ -66,15 +66,16 @@ SUBSYSTEM_DEF(recoil)
 	var/recoil_softcap = 30
 	var/recoil_movement_spread_cap = 10
 
-	var/kick_to_recoil_mult = 1
+	var/kick_to_recoil_mult = 0.65
 
 	var/use_movement_recoil = TRUE
 	var/use_shoot_recoil = TRUE
 
 	var/recoil_min_movement = -40
 	var/recoil_max_movement = 15
 	var/recoil_max_shoot = 40
-	var/recoil_max_spread = MAX_ACCURACY_OFFSET
+	var/recoil_max_spread = MAX_ACCURACY_OFFSET / 2
+	var/recoil_max_spread_turbofrick = MAX_ACCURACY_OFFSET
 
 	var/recoil_movement_increase_multiplier = 1
 	var/recoil_shoot_increase_multiplier = 1
@@ -204,8 +205,10 @@ SUBSYSTEM_DEF(recoil)
 		if(istype(shotter.loc, /obj/item/clothing/head/mob_holder) && isliving(shotter.loc.loc))
 			my_angle += (abs(get_offset(shotter.loc.loc, FALSE, TRUE)) * SIGN(my_angle))
 			my_angle *= 1.5 // just a little bit more
-
-	return round(clamp(my_angle, -recoil_max_spread, recoil_max_spread), 0.1)
+	var/turbomax = recoil_max_spread
+	if(turbofrick_unwielded_spread)
+		turbomax = recoil_max_spread_turbofrick
+	return round(clamp(my_angle, -turbomax, turbomax), 0.1)
 
 ////////////// MOB RECOIL STUFF //////////////
 /datum/controller/subsystem/recoil/proc/kickback(mob/living/user, atom/my_weapon, recoil_tag = RECOIL_TAG_DEFAULT, recoil_in = 1)

code/datums/traits/good.dm

@@ -733,7 +733,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	gain_text = span_notice("You know how plants work!")
 	lose_text = span_danger("You forgot how plants work... somehow.")
 
-/*
+
 /datum/quirk/night_vision
 	name = "Dark Vision - Minor"
 	desc = "You can see a small distance around you in full darkness compared to most people by two whole tiles."
@@ -777,7 +777,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 
 /datum/quirk/night_vision_greater/remove()
 	quirk_holder.update_sight()
-*/
+
 
 /datum/quirk/nukalover
 	name = "Cola Fiend"
@@ -857,7 +857,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	locked = FALSE
 	human_only = FALSE
 
-/*
+
 /datum/quirk/bigleagues
 	name = "Melee - Big Leagues"
 	desc = "Swing for the fences! You deal even more additional damage with melee weapons."
@@ -895,7 +895,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	medical_record_text = "Patient appears to have above average upper body strength."
 	locked = FALSE
 	human_only = FALSE
-	*/
+
 
 /datum/quirk/chemwhiz
 	name = "Chem Whiz"
@@ -946,9 +946,9 @@ GLOBAL_LIST_INIT(security_expert, list(
 	medical_record_text = "Patient claims to wear a powerful suit of metal."
 	locked = FALSE
 
-/*
+
 /datum/quirk/hard_yards
-	name = "Mobility - Wasteland Trekker"
+	name = "Mobility - Faster"
 	desc = "You've spent a lot of time wandering the wastes, and for your hard work you out pace most folks when travelling across them."
 	value = 55
 	category = "Movement Quirks"
@@ -966,7 +966,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	locked = FALSE
 
 /datum/quirk/soft_yards
-	name = "Mobility - Wasteland Wanderer"
+	name = "Mobility - Fast"
 	desc = "You've spent some time in the wastes, and can move a bit better around them for it."
 
 	value = 22
@@ -983,7 +983,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	lose_text = span_danger("The world beneath your heels suddenly feels like tugging you down...")
 	medical_record_text = "Patient describes going on walks."
 	locked = FALSE
-*/
+
 
 /datum/quirk/lifegiver
 	name = "Health - Tough"
@@ -1452,10 +1452,10 @@ GLOBAL_LIST_INIT(security_expert, list(
 	locked =  FALSE
 */
 
-/* /datum/quirk/radimmune
+/datum/quirk/radimmune
 	name = "Radiation - Immune"
 	desc = "Gieger Counters are for suckers."
-	value = 5
+	value = 40
 	category = ""
 	mechanics = ""
 	conflicts = list(
@@ -1464,13 +1464,13 @@ GLOBAL_LIST_INIT(security_expert, list(
 	mob_trait = TRAIT_RADIMMUNE
 	gain_text = span_notice("You've decided radiation just doesn't matter.")
 	lose_text = span_danger("You no longer feel like you could probably live in a microwave while its on.")
-	locked =  FALSE */
+	locked =  FALSE 
+
 
-/*
 /datum/quirk/radimmuneish
 	name = "Radiation - Mostly Immune"
 	desc = "Gieger Counters are for suckers, mostly."
-	value = 40
+	value = 15
 	category = "Radiation Quirks"
 	mechanics = "Who needs a geiger counter? Gives 75% innate rad resist."
 	conflicts = list(
@@ -1487,7 +1487,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 /datum/quirk/radimmunesorta
 	name = "Radiation - Sorta Immune"
 	desc = "Gieger Counters are for suckers, sorta. Gives 50% innate rad resist."
-	value = 20
+	value = 33
 	category = "Radiation Quirks"
 	mechanics = "You only absorb half of all radiation."
 	conflicts = list(
@@ -1500,7 +1500,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	lose_text = span_danger("You no longer think you should hang out next to rad puddles.")
 	medical_record_text = "Patient appears to be resilient to some radiation. X-Ray scans are fuzzy. "
 	locked =  FALSE
-*/
+
 
 /datum/quirk/nohunger
 	name = "Does not Eat"
@@ -2827,15 +2827,15 @@ GLOBAL_LIST_INIT(security_expert, list(
 		REMOVE_TRAIT(H, TRAIT_SURGERY_LOW, "Minor Surgery")
 	if(H)
 		H.mind.learned_recipes -= GLOB.chemwhiz_recipes
-
+*/
 
 /datum/quirk/bruteresist
 	name = "Brute Resist, Minor"
 	desc = "You're more resistant to physical trauma than others."
 	mob_trait = TRAIT_BRUTERESIST
 	value = 22
 	category = "Health Quirks"
-	mechanics = "You take 10% less brute damage."
+	mechanics = "You take 5% less brute damage."
 	conflicts = list(
 		/datum/quirk/bruteresistmajor,
 		/datum/quirk/bruteweak,
@@ -2845,7 +2845,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 /datum/quirk/bruteresist/add()
 	var/mob/living/carbon/human/H = quirk_holder
 	var/datum/species/species = H.dna.species
-	species.brutemod = 0.9
+	species.brutemod = 0.95
 
 /datum/quirk/bruteresist/remove()
 	var/mob/living/carbon/human/H = quirk_holder
@@ -2858,7 +2858,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	mob_trait = TRAIT_BRUTERESISTMAJOR
 	value = 44
 	category = "Health Quirks"
-	mechanics = "You take 20% less brute damage."
+	mechanics = "You take 10% less brute damage."
 	conflicts = list(
 		/datum/quirk/bruteresist,
 		/datum/quirk/bruteweak,
@@ -2868,7 +2868,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 /datum/quirk/bruteresistmajor/add()
 	var/mob/living/carbon/human/H = quirk_holder
 	var/datum/species/species = H.dna.species
-	species.brutemod = 0.8
+	species.brutemod = 0.9
 
 /datum/quirk/bruteresistmajor/remove()
 	var/mob/living/carbon/human/H = quirk_holder
@@ -2881,7 +2881,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	mob_trait = TRAIT_BURNRESIST
 	value = 22
 	category = "Health Quirks"
-	mechanics = "You take 10% less burn damage."
+	mechanics = "You take 5% less burn damage."
 	conflicts = list(
 		/datum/quirk/burnresistmajor,
 		/datum/quirk/burnweak,
@@ -2891,7 +2891,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 /datum/quirk/burnresist/add()
 	var/mob/living/carbon/human/H = quirk_holder
 	var/datum/species/species = H.dna.species
-	species.burnmod = 0.9
+	species.burnmod = 0.95
 
 /datum/quirk/burnresist/remove()
 	var/mob/living/carbon/human/H = quirk_holder
@@ -2904,7 +2904,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	mob_trait = TRAIT_BURNRESISTMAJOR
 	value = 44
 	category = "Health Quirks"
-	mechanics = "You take 20% less burn damage."
+	mechanics = "You take 10% less burn damage."
 	conflicts = list(
 		/datum/quirk/burnresist,
 		/datum/quirk/burnweak,
@@ -2914,10 +2914,10 @@ GLOBAL_LIST_INIT(security_expert, list(
 /datum/quirk/burnresistmajor/add()
 	var/mob/living/carbon/human/H = quirk_holder
 	var/datum/species/species = H.dna.species
-	species.burnmod = 0.8
+	species.burnmod = 0.9
 
 /datum/quirk/burnresistmajor/remove()
 	var/mob/living/carbon/human/H = quirk_holder
 	var/datum/species/species = H.dna.species
 	species.burnmod = 1
-*/
+