Merge pull request #834 from Erthilo/master

Nerfs punching, buffs disarm pushing slightly, fixes toxins crate charges and jetpack objective, adds sprites for different Soghun and Tajaran genders

code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm

@@ -56,7 +56,7 @@
 
 	if (mutantrace)
 		switch(mutantrace)
-			if("lizard","golem","metroid")
+			if("golem","metroid")
 				overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat][!lying ? "_s" : "_l"]")
 				if(face_standing)
 					del(face_standing)
@@ -66,6 +66,16 @@
 					del(stand_icon)
 				if(lying_icon)
 					del(lying_icon)
+			if("lizard")
+				overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]")
+				if(face_standing)
+					del(face_standing)
+				if(face_lying)
+					del(face_lying)
+				if(stand_icon)
+					del(stand_icon)
+				if(lying_icon)
+					del(lying_icon)
 			if("plant")
 				if(stat != 2) //if not dead, that is
 					overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]")

code/defines/obj/supplypacks.dm

@@ -114,12 +114,12 @@
 	contains = list("/obj/item/weapon/vending_charge/chemistry")
 	containername = "Chemistry charge crate"
 
-/* removed these for now, as to not confuse people (the machines are in the tg map)
 /datum/supply_packs/charge/toxins
 	name = "Toxins Research Charge"
 	contains = list("/obj/item/weapon/vending_charge/toxins")
 	containername = "Toxins Reasearch charge crate"
 
+/* removed these for now, as to not confuse people (the machines are in the tg map)
 /datum/supply_packs/charge/genetics
 	name = "Genetics Research Charge"
 	contains = list("/obj/item/weapon/vending_charge/genetics")
@@ -183,11 +183,12 @@
 	contains = list("/obj/item/weapon/vending_charge/hydroponics")
 	containername = "Hydroponics charge crate"
 
+/* Wrong toxins charge!
 /datum/supply_packs/charge/tl
 	name = "Toxins Lab Charge"
 	contains = list("/obj/item/weapon/vending_charge/toxinslab")
 	containername = "Toxins Lab charge crate"
-
+*/
 
 /datum/supply_packs/food
 	name = "Food crate"
@@ -567,7 +568,7 @@
 	containername = "APLU \"Ripley\" Circuit Crate"
 	access = access_robotics
 	group = "Robotics"
-	
+
 /datum/supply_packs/surgery
 	name = "Surgery crate"
 	contains = list("/obj/item/weapon/cautery",

code/game/gamemodes/newobjective.dm

@@ -652,8 +652,8 @@ datum
 
 
 			jetpack
-				steal_target = /obj/item/weapon/tank/jetpack
-				explanation_text = "Steal a jetpack."
+				steal_target = /obj/item/weapon/tank/jetpack/oxygen
+				explanation_text = "Steal a blue oxygen jetpack."
 				weight = 20
 
 				get_points(var/job)

code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm

@@ -191,4 +191,20 @@ I kind of like the right click only--the window version can get a little confusi
 				src << "\green This vent is not connected to anything."
 		else
 			src << "\green You must be standing on or beside an open air vent to enter it."
+	return
+
+/mob/living/carbon/alien/humanoid/verb/regurgitate()
+	set name = "Regurgitate"
+	set desc = "Empties the contents of your stomach"
+	set category = "Alien"
+
+	if(powerc())
+		if(stomach_contents.len)
+			for(var/mob/M in src)
+				if(M in stomach_contents)
+					stomach_contents.Remove(M)
+					M.loc = loc
+					Paralyse(4)
+			for(var/mob/O in viewers(src, null))
+				O.show_message(text("\green <B>[src] hurls out the contents of their stomach!</B>"), 1)
 	return

code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm

@@ -183,19 +183,3 @@
 				alien_invis = 0.0
 				src << "\green You are no longer invisible."
 	return
-
-/mob/living/carbon/alien/humanoid/hunter/verb/regurgitate()
-	set name = "Regurgitate"
-	set desc = "Empties the contents of your stomach"
-	set category = "Alien"
-
-	if(powerc())
-		if(stomach_contents.len)
-			for(var/mob/M in src)
-				if(M in stomach_contents)
-					stomach_contents.Remove(M)
-					M.loc = loc
-					Paralyse(10)
-			for(var/mob/O in viewers(src, null))
-				O.show_message(text("\green <B>[src] hurls out the contents of their stomach!</B>"), 1)
-	return

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

@@ -873,7 +873,7 @@
 		fat = "fat"
 
 	if (mutations & HULK)
-		overlays += image("icon" = 'genetics.dmi', "icon_state" = "hulk[fat][!lying ? "_s" : "_l"]")
+		overlays += image("icon" = 'genetics.dmi', "icon_state" = "hulk[fat]_[gender][!lying ? "_s" : "_l"]")
 
 	if (mutations & COLD_RESISTANCE)
 		overlays += image("icon" = 'genetics.dmi', "icon_state" = "fire[fat][!lying ? "_s" : "_l"]")
@@ -886,7 +886,7 @@
 
 	if (mutantrace)
 		switch(mutantrace)
-			if("lizard","golem","metroid")
+			if("golem","metroid")
 				overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat][!lying ? "_s" : "_l"]")
 				if(face_standing)
 					del(face_standing)
@@ -896,6 +896,16 @@
 					del(stand_icon)
 				if(lying_icon)
 					del(lying_icon)
+			if("lizard")
+				overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]")
+				if(face_standing)
+					del(face_standing)
+				if(face_lying)
+					del(face_lying)
+				if(stand_icon)
+					del(stand_icon)
+				if(lying_icon)
+					del(lying_icon)
 			if("plant")
 				if(stat != 2) //if not dead, that is
 					overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]")

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

@@ -95,9 +95,11 @@
 			if(M.type == /mob/living/carbon/human/tajaran)
 				attack_verb = "slash"
 
-			var/damage = rand(0, 9)
+			var/damage = rand(0, 5)
 			if(!damage)
-				if(M.type != /mob/living/carbon/human/tajaran)
+				if(M.mutantrace == "lizard")
+					playsound(loc, 'slashmiss.ogg', 25, 1, -1)
+				else if(M.type != /mob/living/carbon/human/tajaran)
 					playsound(loc, 'punchmiss.ogg', 25, 1, -1)
 				else if (M.type == /mob/living/carbon/human/tajaran)
 					playsound(loc, 'slashmiss.ogg', 25, 1, -1)
@@ -107,7 +109,10 @@
 			var/armor_block = run_armor_check(affecting, "melee")
 
 			if(M.mutations & HULK)	damage += 5
-			if(M.type != /mob/living/carbon/human/tajaran)
+			if(M.mutantrace == "lizard")
+				damage += 10
+				playsound(loc, 'slice.ogg', 25, 1, -1)
+			else if(M.type != /mob/living/carbon/human/tajaran)
 				playsound(loc, "punch", 25, 1, -1)
 			else if (M.type == /mob/living/carbon/human/tajaran)
 				damage += 10
@@ -116,9 +121,9 @@
 			visible_message("\red <B>[M] has [attack_verb]ed [src]!</B>")
 
 			apply_damage(damage, BRUTE, affecting, armor_block)
-			if(damage >= 9)
+			if(damage >= 5 && prob(50))
 				visible_message("\red <B>[M] has weakened [src]!</B>")
-				apply_effect(4, WEAKEN, armor_block)
+				apply_effect(2, WEAKEN, armor_block)
 			UpdateDamageIcon()
 
 
@@ -132,7 +137,7 @@
 			var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
 			var/randn = rand(1, 100)
 			if (randn <= 25)
-				apply_effect(2, WEAKEN, run_armor_check(affecting, "melee"))
+				apply_effect(5, WEAKEN, run_armor_check(affecting, "melee"))
 				playsound(loc, 'thudswoosh.ogg', 50, 1, -1)
 				visible_message("\red <B>[M] has pushed [src]!</B>")
 				return