Tg 1 28 sync testing/confirmation (#5178)

* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS

code/modules/surgery/bodyparts/bodyparts.dm

@@ -11,6 +11,8 @@
 	var/mob/living/carbon/original_owner = null
 	var/status = BODYPART_ORGANIC
 	var/body_zone //"chest", "l_arm", etc , used for def_zone
+	var/aux_zone // used for hands
+	var/aux_layer
 	var/body_part = null //bitflag used to check which clothes cover this bodypart
 	var/use_digitigrade = NOT_DIGITIGRADE //Used for alternate legs, useless elsewhere
 	var/brutestate = 0
@@ -217,7 +219,7 @@
 		C = owner
 		no_update = 0
 
-	if(C.has_disability(DISABILITY_HUSK))
+	if(C.has_trait(TRAIT_HUSK))
 		species_id = "husk" //overrides species_id
 		dmg_overlay_type = "" //no damage overlay shown when husked
 		should_draw_gender = FALSE
@@ -297,6 +299,7 @@
 				. += image('icons/mob/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_0[burnstate]", -DAMAGE_LAYER, image_dir)
 
 	var/image/limb = image(layer = -BODYPARTS_LAYER, dir = image_dir)
+	var/image/aux
 	. += limb
 
 	if(animal_origin)
@@ -331,6 +334,9 @@
 				limb.icon_state = "[species_id]_[body_zone]_[icon_gender]"
 			else
 				limb.icon_state = "[species_id]_[body_zone]"
+		if(aux_zone)
+			aux = image(limb.icon, "[species_id]_[aux_zone]", -aux_layer, image_dir)
+			. += aux
 
 	else
 		limb.icon = icon
@@ -345,6 +351,8 @@
 		var/draw_color = mutation_color || species_color || (skin_tone && skintone2hex(skin_tone))
 		if(draw_color)
 			limb.color = "#[draw_color]"
+			if(aux_zone)
+				aux.color = "#[draw_color]"
 
 /obj/item/bodypart/deconstruct(disassembled = TRUE)
 	drop_organs()
@@ -407,6 +415,8 @@
 	max_damage = 50
 	body_zone ="l_arm"
 	body_part = ARM_LEFT
+	aux_zone = "l_hand"
+	aux_layer = HANDS_PART_LAYER
 	held_index = 1
 	px_x = -6
 	px_y = 0
@@ -441,6 +451,8 @@
 	max_damage = 50
 	body_zone = "r_arm"
 	body_part = ARM_RIGHT
+	aux_zone = "r_hand"
+	aux_layer = HANDS_PART_LAYER
 	held_index = 2
 	px_x = 6
 	px_y = 0

code/modules/surgery/bodyparts/head.dm

@@ -61,7 +61,7 @@
 		C = owner
 
 	real_name = C.real_name
-	if(C.has_disability(DISABILITY_HUSK))
+	if(C.has_trait(TRAIT_HUSK))
 		real_name = "Unknown"
 		hair_style = "Bald"
 		facial_hair_style = "Shaved"

code/modules/surgery/lipoplasty.dm

@@ -4,7 +4,7 @@
 	possible_locs = list("chest")
 
 /datum/surgery/lipoplasty/can_start(mob/user, mob/living/carbon/target)
-	if(target.has_disability(DISABILITY_FAT))
+	if(target.has_trait(TRAIT_FAT))
 		return 1
 	return 0
 

code/modules/surgery/organ_manipulation.dm

@@ -119,11 +119,11 @@
 		current_type = "extract"
 		var/list/organs = target.getorganszone(target_zone)
 
-		var/mob/living/simple_animal/borer/B = target.has_brain_worms()
+/*		var/mob/living/simple_animal/borer/B = target.has_brain_worms()
 		if(target.has_brain_worms())
 			user.visible_message("[user] begins to extract [B] from [target]'s [parse_zone(target_zone)].",
 					"<span class='notice'>You begin to extract [B] from [target]'s [parse_zone(target_zone)]...</span>")
-			return TRUE
+			return TRUE*/
 
 		if(!organs.len)
 			to_chat(user, "<span class='notice'>There are no removable organs in [target]'s [parse_zone(target_zone)]!</span>")
@@ -164,13 +164,13 @@
 			"<span class='notice'>You insert [tool] into [target]'s [parse_zone(target_zone)].</span>")
 
 	else if(current_type == "extract")
-		var/mob/living/simple_animal/borer/B = target.has_brain_worms()
+/*		var/mob/living/simple_animal/borer/B = target.has_brain_worms()
 		if(B && B.victim == target)
 			user.visible_message("[user] successfully extracts [B] from [target]'s [parse_zone(target_zone)]!",
 				"<span class='notice'>You successfully extract [B] from [target]'s [parse_zone(target_zone)].</span>")
 			add_logs(user, target, "surgically removed [B] from", addition="INTENT: [uppertext(user.a_intent)]")
 			B.leave_victim()
-			return FALSE
+			return FALSE */
 		if(I && I.owner == target)
 			user.visible_message("[user] successfully extracts [I] from [target]'s [parse_zone(target_zone)]!",
 				"<span class='notice'>You successfully extract [I] from [target]'s [parse_zone(target_zone)].</span>")

code/modules/surgery/organs/ears.dm

@@ -25,7 +25,7 @@
 		return
 	var/mob/living/carbon/C = owner
 	// genetic deafness prevents the body from using the ears, even if healthy
-	if(C.has_disability(DISABILITY_DEAF))
+	if(C.has_trait(TRAIT_DEAF))
 		deaf = max(deaf, 1)
 	else
 		if(C.ears && (C.ears.flags_2 & HEALS_EARS_2))
@@ -42,7 +42,7 @@
 
 	var/mob/living/carbon/C = owner
 
-	if(iscarbon(owner) && C.has_disability(DISABILITY_DEAF))
+	if(iscarbon(owner) && C.has_trait(TRAIT_DEAF))
 		deaf = 1
 
 /obj/item/organ/ears/proc/adjustEarDamage(ddmg, ddeaf)
@@ -82,6 +82,7 @@
 	name = "cat ears"
 	icon = 'icons/obj/clothing/hats.dmi'
 	icon_state = "kitty"
+	damage_multiplier = 2
 
 /obj/item/organ/ears/cat/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE)
 	..()

code/modules/surgery/organs/eyes.dm

@@ -316,3 +316,8 @@
 	parent = loc
 	if(!istype(parent))
 		return INITIALIZE_HINT_QDEL
+
+/obj/item/organ/eyes/moth
+	name = "moth eyes"
+	desc = "These eyes seem to have increased sensitivity to bright light, with no improvement to low light vision."
+	flash_protect = -1

code/modules/surgery/organs/tongue.dm

@@ -16,7 +16,7 @@
 		/datum/language/narsie,
 		/datum/language/beachbum,
 		/datum/language/ratvar,
-		/datum/language/aphasia
+		/datum/language/aphasia,
 	))
 
 /obj/item/organ/tongue/Initialize(mapload)

code/modules/surgery/plastic_surgery.dm

@@ -13,8 +13,8 @@
 	user.visible_message("[user] begins to alter [target]'s appearance.", "<span class='notice'>You begin to alter [target]'s appearance...</span>")
 
 /datum/surgery_step/reshape_face/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
-	if(target.status_flags & DISFIGURED)
-		target.status_flags &= ~DISFIGURED
+	if(target.has_trait(TRAIT_DISFIGURED, TRAIT_GENERIC))
+		target.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC)
 		user.visible_message("[user] successfully restores [target]'s appearance!", "<span class='notice'>You successfully restore [target]'s appearance.</span>")
 	else
 		var/oldname = target.real_name