Merge pull request #1 from ZomgPonies/master

Updating My Branch

code/_onclick/hud/human.dm

@@ -368,7 +368,7 @@
 	mymob.blind = new /obj/screen()
 	mymob.blind.icon = 'icons/mob/screen1_full.dmi'
 	mymob.blind.icon_state = "blackimageoverlay"
-	mymob.blind.name = " "
+	mymob.blind.name = "blind"
 	mymob.blind.screen_loc = "1,1"
 	mymob.blind.mouse_opacity = 0
 	mymob.blind.layer = 0

code/datums/supplypacks.dm

@@ -597,6 +597,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 					/obj/item/device/assembly/prox_sensor,
 					/obj/item/device/assembly/prox_sensor,
 					/obj/item/device/assembly/prox_sensor,
+					/obj/item/device/transfer_valve,
+					/obj/item/device/transfer_valve,
+					/obj/item/device/transfer_valve,
 					/obj/item/device/assembly/timer,
 					/obj/item/device/assembly/timer,
 					/obj/item/device/assembly/timer)

code/game/dna/dna_misc.dm

@@ -296,7 +296,7 @@
 			M.verbs += /mob/living/carbon/human/proc/remoteobserve
 	if(ismuton(REGENERATEBLOCK,M))
 		if(probinj(45,inj) || (mRegen in old_mutations))
-			M << "\blue You feel strange"
+			M << "\blue Your body pulses with energy"
 			M.mutations.Add(mRegen)
 	if(ismuton(INCREASERUNBLOCK,M))
 		if(probinj(45,inj) || (mRun in old_mutations))
@@ -327,7 +327,7 @@
 	if(ismuton(SHOCKIMMUNITYBLOCK,M))
 		if(probinj(45,inj) || (mShock in old_mutations))
 			M.mutations.Add(mShock)
-			M << "\blue You feel strange"
+			M << "\blue Your skin feels dry"
 	if(ismuton(SMALLSIZEBLOCK,M))
 		if(probinj(45,inj) || (mSmallsize in old_mutations))
 			M << "\blue Your skin feels rubbery"

code/game/machinery/autolathe.dm

@@ -39,6 +39,7 @@ var/global/list/autolathe_recipes = list( \
 		new /obj/item/device/radio/headset(), \
 		new /obj/item/device/radio/off(), \
 		new /obj/item/device/assembly/infra(), \
+		new /obj/item/device/assembly/prox_sensor(), \
 		new /obj/item/device/assembly/timer(), \
 		new /obj/item/weapon/light/tube(), \
 		new /obj/item/weapon/light/bulb(), \

code/game/machinery/suit_storage_unit.dm

@@ -331,11 +331,11 @@
 		sleep(50)
 		if(src.OCCUPANT)
 			if(src.issuperUV)
-				var/burndamage = rand(28,35)
+				var/burndamage = rand(35,45)
 				OCCUPANT.take_organ_damage(0,burndamage)
 				OCCUPANT.emote("scream")
 			else
-				var/burndamage = rand(6,10)
+				var/burndamage = rand(10,15)
 				OCCUPANT.take_organ_damage(0,burndamage)
 				OCCUPANT.emote("scream")
 		if(i==3) //End of the cycle

code/game/machinery/vending.dm

@@ -834,7 +834,7 @@
 					/obj/item/clothing/suit/wcoat = 1,/obj/item/clothing/under/suit_jacket = 1,/obj/item/clothing/head/that =1,/obj/item/clothing/head/cueball = 1,
 					/obj/item/clothing/under/scratch = 1,/obj/item/clothing/under/kilt = 1,/obj/item/clothing/head/beret = 1,/obj/item/clothing/suit/wcoat = 1,
 					/obj/item/clothing/glasses/monocle =1,/obj/item/clothing/head/bowler = 1,/obj/item/weapon/cane = 1,/obj/item/clothing/under/sl_suit = 1,
-					/obj/item/clothing/mask/fakemoustache = 1,/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,/obj/item/clothing/head/plaguedoctorhat = 1,
+					/obj/item/clothing/mask/fakemoustache = 1,/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,/obj/item/clothing/head/plaguedoctorhat = 1,/obj/item/clothing/mask/gas/plaguedoctor = 1,
 					/obj/item/clothing/under/owl = 1,/obj/item/clothing/mask/gas/owl_mask = 1,/obj/item/clothing/suit/apron = 1,/obj/item/clothing/under/waiter = 1,
 					/obj/item/clothing/under/pirate = 1,/obj/item/clothing/suit/pirate = 1,/obj/item/clothing/head/pirate = 1,/obj/item/clothing/head/bandana = 1,
 					/obj/item/clothing/head/bandana = 1,/obj/item/clothing/under/soviet = 1,/obj/item/clothing/head/ushanka = 1,/obj/item/clothing/suit/imperium_monk = 1,

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -342,3 +342,9 @@
 	icon_state = "mucus"
 	random_icon_states = list("mucus")
 	var/list/datum/disease2/disease/virus2 = list()
+	var/dry=0 // Keeps the lag down
+
+/obj/effect/decal/cleanable/mucus/New()
+	spawn(DRYING_TIME * 2)
+		dry=1
+

code/modules/client/preferences.dm

@@ -949,7 +949,7 @@ datum/preferences
 							b_type = new_b_type
 
 					if("hair")
-						if(species == "Human" || species == "Unathi")
+						if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell")
 							var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference") as color|null
 							if(new_hair)
 								r_hair = hex2num(copytext(new_hair, 2, 4))

code/modules/food/recipes_microwave.dm

@@ -1010,14 +1010,18 @@
 		/obj/item/weapon/ore/clown,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/clownstears
-/*
+
 /datum/recipe/boiledslimeextract
 	reagents = list("water" = 5)
 	items = list(
-		/obj/item/slime_core,
+		/obj/item/slime_extract,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/boiledslimecore
-*/
+
+/datum/recipe/mint
+	reagents = list("toxin" = 5)
+	result = /obj/item/weapon/reagent_containers/food/snacks/mint
+
 /datum/recipe/braincake
 	reagents = list("milk" = 5, "flour" = 15)
 	items = list(

code/modules/mob/living/carbon/human/human.dm

@@ -1343,9 +1343,7 @@ mob/living/carbon/human/yank_out_object()
 	if(species.name=="Slime People")
 		dna.mutantrace = "slime"
 
-	if(mutations.len==0)
-		mutations=species.default_mutations
-
+	mutations+=species.default_mutations
 
 	spawn(0)
 		update_icons()

code/modules/mob/living/carbon/human/update_icons.dm

@@ -267,9 +267,6 @@ proc/get_damage_icon_part(damage_state, body_part)
 			else
 				temp = part.get_icon()
 
-			if(part.status & ORGAN_ROBOT)
-				temp.GrayScale()
-
 			if(part.status & ORGAN_DEAD)
 				temp.ColorTone(necrosis_color_mod)
 				temp.SetIntensity(0.7)

code/modules/mob/living/carbon/species.dm

@@ -174,6 +174,7 @@
 	attack_verb = "punch"
 	path = /mob/living/carbon/human/grey
 	darksight = 5 // BOOSTED from 2
+	eyes = "grey_eyes_s"
 	max_hurt_damage = 3 // From 5 (for humans)
 	default_mutations=list(mRemotetalk) // TK is also another candidate, but TK is overpowered as fuck.
 

code/modules/mob/new_player/sprite_accessories.dm

@@ -385,133 +385,133 @@
 		name = "Long Unathi Spines"
 		icon_state = "soghun_longspines"
 		species_allowed = list("Unathi")
-		do_colouration = 0
+		do_colouration = 1
 
 	una_spines_short
 		name = "Short Unathi Spines"
 		icon_state = "soghun_shortspines"
 		species_allowed = list("Unathi")
-		do_colouration = 0
+		do_colouration = 1
 
 	una_frills_long
 		name = "Long Unathi Frills"
 		icon_state = "soghun_longfrills"
 		species_allowed = list("Unathi")
-		do_colouration = 0
+		do_colouration = 1
 
 	una_frills_short
 		name = "Short Unathi Frills"
 		icon_state = "soghun_shortfrill"
 		species_allowed = list("Unathi")
-		do_colouration = 0
+		do_colouration = 1
 
 	una_horns
 		name = "Unathi Horns"
 		icon_state = "soghun_horns"
 		species_allowed = list("Unathi")
-		do_colouration = 0
+		do_colouration = 1
 
 	skr_tentacle_m
 		name = "Skrell Male Tentacles"
 		icon_state = "skrell_hair_m"
 		species_allowed = list("Skrell")
 		gender = MALE
-		do_colouration = 0
+		do_colouration = 1
 
 	skr_tentacle_f
 		name = "Skrell Female Tentacles"
 		icon_state = "skrell_hair_f"
 		species_allowed = list("Skrell")
 		gender = FEMALE
-		do_colouration = 0
+		do_colouration = 1
 
 	skr_gold_m
 		name = "Gold plated Skrell Male Tentacles"
 		icon_state = "skrell_goldhair_m"
 		species_allowed = list("Skrell")
 		gender = MALE
-		do_colouration = 0
+		do_colouration = 1
 
 	skr_gold_f
 		name = "Gold chained Skrell Female Tentacles"
 		icon_state = "skrell_goldhair_f"
 		species_allowed = list("Skrell")
 		gender = FEMALE
-		do_colouration = 0
+		do_colouration = 1
 
 	skr_clothtentacle_m
 		name = "Cloth draped Skrell Male Tentacles"
 		icon_state = "skrell_clothhair_m"
 		species_allowed = list("Skrell")
 		gender = MALE
-		do_colouration = 0
+		do_colouration = 1
 
 	skr_clothtentacle_f
 		name = "Cloth draped Skrell Female Tentacles"
 		icon_state = "skrell_clothhair_f"
 		species_allowed = list("Skrell")
 		gender = FEMALE
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_ears
 		name = "Tajaran Ears"
 		icon_state = "ears_plain"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_ears_clean
 		name = "Tajara Clean"
 		icon_state = "hair_clean"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_ears_shaggy
 		name = "Tajara Shaggy"
 		icon_state = "hair_shaggy"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_ears_mohawk
 		name = "Tajaran Mohawk"
 		icon_state = "hair_mohawk"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_ears_plait
 		name = "Tajara Plait"
 		icon_state = "hair_plait"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_ears_straight
 		name = "Tajara Straight"
 		icon_state = "hair_straight"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_ears_long
 		name = "Tajara Long"
 		icon_state = "hair_long"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_ears_rattail
 		name = "Tajara Rat Tail"
 		icon_state = "hair_rattail"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_ears_spiky
 		name = "Tajara Spiky"
 		icon_state = "hair_tajspiky"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_ears_messy
 		name = "Tajara Messy"
 		icon_state = "hair_messy"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	vox_quills_short
 		name = "Short Vox Quills"
@@ -524,37 +524,37 @@
 		name = "Tajara Sideburns"
 		icon_state = "facial_mutton"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_mutton
 		name = "Tajara Mutton"
 		icon_state = "facial_mutton"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_pencilstache
 		name = "Tajara Pencilstache"
 		icon_state = "facial_pencilstache"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_moustache
 		name = "Tajara Moustache"
 		icon_state = "facial_moustache"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_goatee
 		name = "Tajara Goatee"
 		icon_state = "facial_goatee"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 	taj_smallstache
 		name = "Tajara Smallsatche"
 		icon_state = "facial_smallstache"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
+		do_colouration = 1
 
 //skin styles - WIP
 //going to have to re-integrate this with surgery

code/modules/organs/organ_external.dm

@@ -625,6 +625,8 @@
 
 /datum/organ/external/get_icon(gender="",isFat=0)
 	//stand_icon = new /icon(icobase, "torso_[g][fat?"_fat":""]")
+	if (status & ORGAN_ROBOT)
+		return new /icon('icons/mob/human_races/robotic.dmi', "[icon_name][gender ? "_[gender]" : ""]")
 	if(gender)
 		gender="_[gender]"
 	var/fat=""

code/modules/reagents/Chemistry-Machinery.dm

@@ -56,13 +56,13 @@
 	if(broken_on_spawn)
 		var/amount = pick(3,3,4)
 		var/list/options = list()
-		options[/obj/item/weapon/stock_parts/capacitor/super] = "Add a super capacitor to fix it."
+		options[/obj/item/weapon/stock_parts/capacitor/adv] = "Add an advanced capacitor to fix it."
 		options[/obj/item/weapon/stock_parts/console_screen] = "Replace the console screen to fix it."
 		options[/obj/item/weapon/stock_parts/manipulator/pico] = "Upgrade to a pico manipulator to fix it."
 		options[/obj/item/weapon/stock_parts/matter_bin/super] = "Give it a super matter bin to fix it."
 		options[/obj/item/weapon/cell/super] = "Replace the reagent synthesizer with a super capacity cell to fix it."
 		options[/obj/item/device/mass_spectrometer/adv] = "Replace the reagent scanner with an advanced mass spectrometer to fix it"
-		options[/obj/item/weapon/stock_parts/micro_laser/ultra] = "Repair the reagent synthesizer with an ultra-high-power micro-laser to fix it"
+		options[/obj/item/weapon/stock_parts/micro_laser/high] = "Repair the reagent synthesizer with an high-power micro-laser to fix it"
 		options[/obj/item/device/reagent_scanner/adv] = "Replace the reagent scanner with an advanced reagent scanner to fix it"
 		options[/obj/item/stack/nanopaste] = "Apply some nanopaste to the broken nozzles to fix it."
 		options[/obj/item/stack/sheet/plasteel] = "Surround the outside with a plasteel cover to fix it."

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -1851,16 +1851,16 @@
 	New()
 		..()
 		reagents.add_reagent("cherryjelly", 5)
-/*
+
 /obj/item/weapon/reagent_containers/food/snacks/boiledslimecore
-	name = "Boiled slime Core"
+	name = "Boiled Slime Core"
 	desc = "A boiled red thing."
-	icon_state = "boiledslimecore"
+	icon_state = "boiledrorocore"
 	New()
 		..()
 		reagents.add_reagent("slimejelly", 5)
 		bitesize = 3
-*/
+
 /obj/item/weapon/reagent_containers/food/snacks/mint
 	name = "mint"
 	desc = "it is only wafer thin."

code/modules/virus2/effect.dm

@@ -361,6 +361,14 @@
 		if (prob(30))
 			mob.jitteriness += 10
 
+/datum/disease2/effect/drunk
+	name = "Glasgow Syndrome"
+	stage = 2
+	activate(var/mob/living/carbon/mob,var/multiplier)
+		mob << "<span class='notice'>You feel like you had one hell of a party!</span>"
+		if (mob.reagents.get_reagent_amount("ethanol") < 325)
+			mob.reagents.add_reagent("ethanol", 5*multiplier)
+
 ////////////////////////STAGE 1/////////////////////////////////
 
 /datum/disease2/effect/sneeze
@@ -369,8 +377,13 @@
 	activate(var/mob/living/carbon/mob,var/multiplier)
 		mob.say("*sneeze")
 		if (prob(50))
-			var/obj/effect/decal/cleanable/mucus/M = new(get_turf(mob))
-			M.virus2 = virus_copylist(mob.virus2)
+			var/obj/effect/decal/cleanable/mucus/M= locate(/obj/effect/decal/cleanable/mucus) in get_turf(mob)
+			if(M==null)
+				M = new(get_turf(mob))
+			else
+				if(M.dry)
+					M.dry=0
+			M.virus2 |= virus_copylist(mob.virus2)
 
 /datum/disease2/effect/gunck
 	name = "Flemmingtons"