Ports Tweaks

code/game/machinery/recycler.dm

@@ -40,7 +40,7 @@ var/const/SAFETY_COOLDOWN = 100
 		mat_mod = 2 * B.rating
 	mat_mod *= 50000
 	for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
-		amt_made = 25 * M.rating //% of materials salvaged
+		amt_made = 100 * M.rating //% of materials salvaged
 	materials.max_amount = mat_mod
 	amount_produced = min(100, amt_made)
 

code/game/machinery/teleporter.dm

@@ -261,7 +261,7 @@
 /obj/item/weapon/circuitboard/machine/teleporter_hub
 	name = "circuit board (Teleporter Hub)"
 	build_path = /obj/machinery/teleport/hub
-	origin_tech = "programming=3;engineering=4;bluespace=4;materials=4"
+	origin_tech = "programming=5;engineering=6;bluespace=6;materials=6"
 	req_components = list(
 							/obj/item/weapon/ore/bluespace_crystal = 3,
 							/obj/item/weapon/stock_parts/matter_bin = 1)
@@ -374,7 +374,7 @@
 /obj/item/weapon/circuitboard/machine/teleporter_station
 	name = "circuit board (Teleporter Station)"
 	build_path = /obj/machinery/teleport/station
-	origin_tech = "programming=4;engineering=4;bluespace=4;plasmatech=3"
+	origin_tech = "programming=6;engineering=6;bluespace=6;plasmatech=4"
 	req_components = list(
 							/obj/item/weapon/ore/bluespace_crystal = 2,
 							/obj/item/weapon/stock_parts/capacitor = 2,

code/game/mecha/working/ripley.dm

@@ -2,13 +2,14 @@
 	desc = "Autonomous Power Loader Unit. This newer model is refitted with powerful armour against the dangers of the EVA mining process."
 	name = "\improper APLU \"Ripley\""
 	icon_state = "ripley"
-	step_in = 5
+	step_in = 3
 	max_temperature = 20000
-	health = 200
+	health = 250
 	lights_power = 7
 	deflect_chance = 15
 	damage_absorption = list("brute"=0.6,"fire"=1,"bullet"=0.8,"laser"=0.9,"energy"=1,"bomb"=0.6)
 	max_equip = 6
+	step_energy_drain = 1
 	wreckage = /obj/structure/mecha_wreckage/ripley
 	var/list/cargo = new
 	var/cargo_capacity = 15
@@ -60,10 +61,11 @@
 	name = "\improper APLU \"Firefighter\""
 	icon_state = "firefighter"
 	max_temperature = 65000
-	health = 250
+	health = 350
 	burn_state = LAVA_PROOF
 	lights_power = 7
-	damage_absorption = list("brute"=0.6,"fire"=0.5,"bullet"=0.7,"laser"=0.7,"energy"=1,"bomb"=0.4)
+	deflect_chance = 45
+	damage_absorption = list("brute"=0.4,"fire"=0.1,"bullet"=0.4,"laser"=0.2"energy"=0.5,"bomb"=0.1)
 	max_equip = 5 // More armor, less tools
 	wreckage = /obj/structure/mecha_wreckage/ripley/firefighter
 
@@ -150,11 +152,11 @@
 	var/pressure = environment.return_pressure()
 
 	if(pressure < 40)
-		step_in = 3
+		step_in = 1
 		for(var/obj/item/mecha_parts/mecha_equipment/drill/drill in equipment)
-			drill.equip_cooldown = initial(drill.equip_cooldown)/2
+			drill.equip_cooldown = initial(drill.equip_cooldown)/4
 	else
-		step_in = 5
+		step_in = 3
 		for(var/obj/item/mecha_parts/mecha_equipment/drill/drill in equipment)
 			drill.equip_cooldown = initial(drill.equip_cooldown)
 

code/game/objects/items/weapons/cigs_lighters.dm

@@ -202,7 +202,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		if(iscarbon(loc))
 			var/mob/living/carbon/C = loc
 			if (src == C.wear_mask) // if it's in the human/monkey mouth, transfer reagents to the mob
-				if(prob(15)) // so it's not an instarape in case of acid
+				if(prob(75))
 					var/fraction = min(REAGENTS_METABOLISM/reagents.total_volume, 1)
 					reagents.reaction(C, INGEST, fraction)
 				reagents.trans_to(C, REAGENTS_METABOLISM)

code/game/objects/items/weapons/storage/backpack.dm

@@ -269,8 +269,9 @@
 	name = "smuggler's satchel"
 	desc = "A very slim satchel that can easily fit into tight spaces."
 	icon_state = "satchel-flat"
-	w_class = 3 //Can fit in backpacks itself.
-	max_combined_w_class = 15
+	w_class = 2 //Can fit in your ass.
+	max_combined_w_class = 20
+	embed_chance = 1 //This is a meme
 	level = 1
 	cant_hold = list(/obj/item/weapon/storage/backpack/satchel/flat) //muh recursive backpacks
 

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -245,7 +245,7 @@
 
 /obj/item/weapon/storage/box/syndie_kit/chemical
 	name = "boxed chemical kit"
-	storage_slots = 14
+	storage_slots = 16
 
 /obj/item/weapon/storage/box/syndie_kit/chemical/New()
 	..()
@@ -261,6 +261,7 @@
 	new /obj/item/weapon/reagent_containers/glass/bottle/coniine(src)
 	new /obj/item/weapon/reagent_containers/glass/bottle/curare(src)
 	new /obj/item/weapon/reagent_containers/glass/bottle/amanitin(src)
+	new /obj/item/weapon/reagent_containers/food/drinks/beer/sleepy(src)
 	new /obj/item/weapon/reagent_containers/syringe(src)
 	return
 

code/modules/food_and_drinks/drinks/drinks.dm

@@ -193,6 +193,9 @@
 	desc = "Beer. In space."
 	icon_state = "beer"
 	list_reagents = list("beer" = 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/beer/sleepy
+	list_reagents = list("beer2" = 30)
 
 /obj/item/weapon/reagent_containers/food/drinks/ale
 	name = "Magm-Ale"

code/modules/hydroponics/hydroponics.dm

@@ -131,7 +131,7 @@
 		lastcycle = world.time
 		if(myseed && !dead)
 			// Advance age
-			age++
+			age += 5
 			if(age < myseed.maturation)
 				lastproduce = age
 
@@ -207,7 +207,7 @@
 				adjustHealth(-rand(1,5) / rating)
 
 			// Harvest code
-			if(age > myseed.production && (age - lastproduce) > myseed.production && (!harvest && !dead))
+			if(age > myseed.production+myseed.growthstages+(myseed.oneharvest*myseed.growthstages) && (age - lastproduce) > myseed.production && (!harvest && !dead))
 				nutrimentMutation()
 				if(myseed && myseed.yield != -1) // Unharvestable shouldn't be harvested
 					harvest = 1

code/modules/mining/machine_redemption.dm

@@ -19,7 +19,7 @@
 	var/ore_pickup_rate = 15
 	var/sheet_per_ore = 1
 	var/point_upgrade = 1
-	var/list/ore_values = list(("sand" = 1), ("iron" = 1), ("plasma" = 15), ("silver" = 16), ("gold" = 18), ("titanium" = 30), ("uranium" = 30), ("diamond" = 50), ("bluespace crystal" = 50), ("bananium" = 60))
+	var/list/ore_values = list(("sand" = 2), ("iron" = 10), ("plasma" = 50), ("silver" = 20), ("gold" = 25), ("titanium" = 30), ("uranium" = 30), ("diamond" = 50), ("bluespace crystal" = 50), ("bananium" = 60))
 	speed_process = 1
 
 /obj/machinery/mineral/ore_redemption/New()

code/modules/mining/mine_turfs.dm

@@ -60,11 +60,11 @@
 
 /turf/closed/mineral/random
 	var/mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium = 5, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 10,
+		/turf/closed/mineral/uranium = 5, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 10, /turf/closed/mineral/bananium = 3,
 		/turf/closed/mineral/silver = 12, /turf/closed/mineral/plasma = 20, /turf/closed/mineral/iron = 40, /turf/closed/mineral/titanium = 11,
 		/turf/closed/mineral/gibtonite = 4, /turf/open/floor/plating/asteroid/airless/cave = 2, /turf/closed/mineral/bscrystal = 1)
 		//Currently, Adamantine won't spawn as it has no uses. -Durandan
-	var/mineralChance = 13
+	var/mineralChance = 20
 
 /turf/closed/mineral/random/New()
 	..()
@@ -84,21 +84,21 @@
 
 /turf/closed/mineral/random/high_chance
 	icon_state = "rock_highchance"
-	mineralChance = 25
+	mineralChance = 35
 	mineralSpawnChanceList = list(
 		/turf/closed/mineral/uranium = 35, /turf/closed/mineral/diamond = 30, /turf/closed/mineral/gold = 45, /turf/closed/mineral/titanium = 45,
-		/turf/closed/mineral/silver = 50, /turf/closed/mineral/plasma = 50, /turf/closed/mineral/bscrystal = 20)
+		/turf/closed/mineral/silver = 50, /turf/closed/mineral/plasma = 50, /turf/closed/mineral/bananium = 30, /turf/closed/mineral/bscrystal = 20)
 
 /turf/closed/mineral/random/high_chance/New()
 	icon_state = "rock"
 	..()
 
 /turf/closed/mineral/random/low_chance
 	icon_state = "rock_lowchance"
-	mineralChance = 6
+	mineralChance = 10
 	mineralSpawnChanceList = list(
 		/turf/closed/mineral/uranium = 2, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 4, /turf/closed/mineral/titanium = 4,
-		/turf/closed/mineral/silver = 6, /turf/closed/mineral/plasma = 15, /turf/closed/mineral/iron = 40,
+		/turf/closed/mineral/silver = 6, /turf/closed/mineral/plasma = 15, /turf/closed/mineral/iron = 40, /turf/closed/mineral/bananium = 3,
 		/turf/closed/mineral/gibtonite = 2, /turf/closed/mineral/bscrystal = 1)
 
 /turf/closed/mineral/random/low_chance/New()
@@ -119,7 +119,7 @@
 
 /turf/closed/mineral/diamond
 	mineralType = /obj/item/weapon/ore/diamond
-	spreadChance = 0
+	spreadChance = 3
 	spread = 1
 	scan_state = "rock_Diamond"
 
@@ -150,21 +150,21 @@
 /turf/closed/mineral/clown
 	mineralType = /obj/item/weapon/ore/bananium
 	mineralAmt = 3
-	spreadChance = 0
+	spreadChance = 5
 	spread = 0
 	scan_state = "rock_Clown"
 
 /turf/closed/mineral/bscrystal
 	mineralType = /obj/item/weapon/ore/bluespace_crystal
 	mineralAmt = 1
-	spreadChance = 0
+	spreadChance = 2
 	spread = 0
 	scan_state = "rock_BScrystal"
 
 ////////////////////////////////Gibtonite
 /turf/closed/mineral/gibtonite
 	mineralAmt = 1
-	spreadChance = 0
+	spreadChance = 1
 	spread = 0
 	scan_state = "rock_Gibtonite"
 	var/det_time = 8 //Countdown till explosion, but also rewards the player for how close you were to detonation when you defuse it
@@ -263,7 +263,7 @@
 
 /turf/open/floor/plating/asteroid/airless/cave
 	var/length = 100
-	var/mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 1, /mob/living/simple_animal/hostile/asteroid/goliath = 5, /mob/living/simple_animal/hostile/asteroid/basilisk = 4, /mob/living/simple_animal/hostile/asteroid/hivelord = 3)
+	var/mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 1, /mob/living/simple_animal/hostile/asteroid/goliath = 5, /mob/living/simple_animal/hostile/asteroid/basilisk = 4, /mob/living/simple_animal/hostile/asteroid/hivelord = 3, /mob/living/simple_animal/hostile/asteroid/fugu = 2)
 	var/sanity = 1
 	var/forward_cave_dir = 1
 	var/backward_cave_dir = 2

code/modules/mob/living/simple_animal/hostile/headcrab.dm

@@ -47,9 +47,13 @@
 			if(C.status_flags & XENO_HOST)
 				src << "<span class='userdanger'>A foreign presence repels us from this body. Perhaps we should try to infest another?</span>"
 				return
+			if(getorgan(/obj/item/organ/internal/body_egg/changeling_egg))
+				src << "<span class='userdanger'>One of us has already planted thier seed in this body! Perhaps we should try to infest another?</span>"
+				return
 			Infect(target)
 			src << "<span class='userdanger'>With our egg laid, our death approaches rapidly...</span>"
 			spawn(100)
+				egg_lain = 0
 				death()
 			return
 	target.attack_animal(src)

code/modules/projectiles/ammunition/ammo_casings.dm

@@ -367,7 +367,7 @@
 			return
 		A.loc = FD
 		FD.pen = A
-		FD.damage = 5
+		FD.damage += 10
 		FD.nodamage = 0
 		user << "<span class='notice'>You insert [A] into [src].</span>"
 	return

code/modules/projectiles/projectile/special.dm

@@ -163,9 +163,9 @@
 	name = "plasma blast"
 	icon_state = "plasmacutter"
 	damage_type = BRUTE
-	damage = 5
-	range = 3.5 //works as 4, but doubles to 7
-	dismemberment = 20
+	damage = 10
+	range = 5.5 //works as 6, but doubles to 11
+	dismemberment = 30
 
 /obj/item/projectile/plasma/New()
 	var/turf/proj_turf = get_turf(src)
@@ -190,12 +190,12 @@
 			return -1
 
 /obj/item/projectile/plasma/adv
-	damage = 7
-	range = 5
+	damage = 15
+	range = 6.5
 
 /obj/item/projectile/plasma/adv/mech
-	damage = 10
-	range = 6
+	damage = 20
+	range = 7.5
 
 
 /obj/item/projectile/gravityrepulse

code/modules/reagents/chemistry/machinery/reagentgrinder.dm

@@ -28,6 +28,20 @@
 				/obj/item/weapon/grown/nettle/basic = list("sacid" = 0),
 				/obj/item/weapon/grown/nettle/death = list("facid" = 0),
 				/obj/item/weapon/grown/novaflower = list("capsaicin" = 0, "condensedcapsaicin" = 0),
+				/obj/item/weapon/coin/gold = list("gold" = 4),
+				/obj/item/weapon/coin/silver = list("silver" = 4),
+				/obj/item/weapon/coin/iron = list("iron" = 4),
+				/obj/item/weapon/coin/plasma = list("plasma" = 4),
+				/obj/item/weapon/coin/uranium = list("uranium" = 4),
+				/obj/item/weapon/coin/clown = list("banana" = 4),
+				/obj/item/toy/crayon/red = list("redcrayonpowder" = 50),
+				/obj/item/toy/crayon/orange = list("orangecrayonpowder" = 50),
+				/obj/item/toy/crayon/yellow = list("yellowcrayonpowder" = 50),
+				/obj/item/toy/crayon/green = list("greencrayonpowder" = 50),
+				/obj/item/toy/crayon/blue = list("bluecrayonpowder" = 50),
+				/obj/item/toy/crayon/purple = list("purplecrayonpowder" = 50),
+ 				/obj/item/toy/crayon/mime = list("invisiblecrayonpowder" = 50),
+				/obj/item/toy/crayon/rainbow = list("colorful_reagent" = 100),
 
 				//Blender Stuff
 				/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = list("soymilk" = 0),
@@ -421,4 +435,4 @@
 						beaker.reagents.add_reagent(r_id,min(amount, space))
 						if (space < amount)
 								break
-				remove_object(O)
+				remove_object(O)

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -1087,6 +1087,67 @@
 	if(T)
 		T.color = pick(random_color_list)
 	..()
+
+/datum/reagent/colorful_reagent/red
+	name = "Red Reagent"
+	id = "red_reagent"
+	description = "A red solution."
+	color = "#FF0000"
+	list/random_color_list = list("#FF0000")
+
+/datum/reagent/colorful_reagent/orange
+	name = "Orange Reagent"
+	id = "orange_reagent"
+	description = "An orange solution."
+	color = "#FF9300"
+	list/random_color_list = list("#FF9300")
+
+/datum/reagent/colorful_reagent/yellow
+	name = "Yellow Reagent"
+	id = "yellow_reagent"
+	description = "A yellow solution."
+	color = "#FFF200"
+	list/random_color_list = list("#FFF200")
+
+/datum/reagent/colorful_reagent/green
+	name = "Green Reagent"
+	id = "green_reagent"
+	description = "A green solution."
+	color = "#A8E61D"
+	list/random_color_list = list("#A8E61D")
+
+/datum/reagent/colorful_reagent/blue
+	name = "Blue Reagent"
+	id = "blue_reagent"
+	description = "A blue solution."
+	color = "#00B7EF"
+	list/random_color_list = list("#00B7EF")
+
+/datum/reagent/colorful_reagent/purple
+	name = "Purple Reagent"
+	id = "purple_reagent"
+	description = "A purple solution."
+	color = "#DA00FF"
+	list/random_color_list = list("#DA00FF")
+
+/datum/reagent/translucent_reagent
+	name = "Translucent Reagent"
+	id = "translucent_reagent"
+	description = "A near inivisble solution."
+	reagent_state = LIQUID
+	color = "#60AAAAAA"
+
+/datum/reagent/translucent_reagent/on_mob_life(mob/living/M)
+	if(M && isliving(M))
+		M.color = "#60AAAAAA"
+	..()
+	return
+
+/datum/reagent/translucent_reagent/reaction_mob(mob/living/M, reac_volume)
+	if(M && isliving(M))
+		M.color = "#60AAAAAA"
+	..()
+
 
 /datum/reagent/hair_dye
 	name = "Quantum Hair Dye"