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/mining/equipment/goliath_hide.dm

@@ -21,9 +21,8 @@
 		return
 	if(is_type_in_typecache(target, goliath_platable_armor_typecache))
 		var/obj/item/clothing/C = target
-		var/list/current_armor = C.armor
-		if(current_armor["melee"] < 60)
-			current_armor["melee"] = min(current_armor["melee"] + 10, 60)
+		if(armor.melee < 60)
+			armor = armor.setRating(melee = min(armor.melee + 10, 60))
 			to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
 			use(1)
 		else
@@ -32,9 +31,10 @@
 		var/obj/mecha/working/ripley/D = target
 		if(D.hides < 3)
 			D.hides++
-			D.armor["melee"] = min(D.armor["melee"] + 10, 70)
-			D.armor["bullet"] = min(D.armor["bullet"] + 5, 50)
-			D.armor["laser"] = min(D.armor["laser"] + 5, 50)
+			D.armor = D.armor.setRating(\
+				melee = min(D.armor.melee + 10, 70),\
+				bullet = min(D.armor.laser + 5, 50),\
+				laser = min(D.armor.laser + 5, 50))
 			to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
 			D.update_icon()
 			if(D.hides == 3)

code/modules/mining/laborcamp/laborstacker.dm

@@ -44,7 +44,7 @@
 	var/list/data = list()
 	var/can_go_home = FALSE
 
-	data["emagged"] = emagged
+	data["emagged"] = (obj_flags & EMAGGED) ? 1 : 0
 	if(inserted_id)
 		data["id"] = inserted_id
 		data["id_name"] = inserted_id.registered_name
@@ -101,13 +101,13 @@
 					if(3)
 						to_chat(usr, "<span class='notice'>No permission to dock could be granted.</span>")
 					else
-						if(!emagged)
+						if(!(obj_flags & EMAGGED))
 							Radio.set_frequency(FREQ_SECURITY)
 							Radio.talk_into(src, "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval.", FREQ_SECURITY, get_spans(), get_default_language())
 						to_chat(usr, "<span class='notice'>Shuttle received message and will be sent shortly.</span>")
 
 /obj/machinery/mineral/labor_claim_console/proc/check_auth()
-	if(emagged)
+	if(obj_flags & EMAGGED)
 		return 1 //Shuttle is emagged, let any ol' person through
 	return (istype(inserted_id) && inserted_id.points >= inserted_id.goal) //Otherwise, only let them out if the prisoner's reached his quota.
 
@@ -119,8 +119,8 @@
 		qdel(src)
 
 /obj/machinery/mineral/labor_claim_console/emag_act(mob/user)
-	if(!emagged)
-		emagged = TRUE
+	if(!(obj_flags & EMAGGED))
+		obj_flags |= EMAGGED
 		to_chat(user, "<span class='warning'>PZZTTPFFFT</span>")
 
 

code/modules/mining/lavaland/necropolis_chests.dm

@@ -588,7 +588,7 @@
 	playsound(user, 'sound/magic/clockwork/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000))
 
 /obj/item/melee/transforming/cleaving_saw/clumsy_transform_effect(mob/living/user)
-	if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
+	if(user.has_trait(TRAIT_CLUMSY) && prob(50))
 		to_chat(user, "<span class='warning'>You accidentally cut yourself with [src], like a doofus!</span>")
 		user.take_bodypart_damage(10)
 

code/modules/mining/lavaland/ruins/gym.dm

@@ -21,11 +21,11 @@
 	anchored = TRUE
 
 /obj/structure/stacklifter/attack_hand(mob/living/user)
-	if(in_use)
+	if(obj_flags & IN_USE)
 		to_chat(user, "It's already in use - wait a bit.")
 		return
 	else
-		in_use = 1
+		obj_flags |= IN_USE
 		icon_state = "fitnesslifter2"
 		user.setDir(SOUTH)
 		user.Stun(80)
@@ -44,7 +44,7 @@
 			playsound(user, 'goon/sound/effects/spring.ogg', 60, 1)
 
 		playsound(user, 'sound/machines/click.ogg', 60, 1)
-		in_use = 0
+		obj_flags &= ~IN_USE
 		user.pixel_y = 0
 		var/finishmessage = pick("You feel stronger!","You feel like you can take on the world!","You feel robust!","You feel indestructible!")
 		icon_state = "fitnesslifter"
@@ -59,11 +59,11 @@
 	anchored = TRUE
 
 /obj/structure/weightlifter/attack_hand(mob/living/user)
-	if(in_use)
+	if(obj_flags & IN_USE)
 		to_chat(user, "It's already in use - wait a bit.")
 		return
 	else
-		in_use = 1
+		obj_flags |= IN_USE
 		icon_state = "fitnessweight-c"
 		user.setDir(SOUTH)
 		user.Stun(80)
@@ -88,7 +88,7 @@
 		animate(user, pixel_y = 2, time = 3)
 		sleep(3)
 		playsound(user, 'sound/machines/click.ogg', 60, 1)
-		in_use = 0
+		obj_flags &= ~IN_USE
 		animate(user, pixel_y = 0, time = 3)
 		var/finishmessage = pick("You feel stronger!","You feel like you can take on the world!","You feel robust!","You feel indestructible!")
 		icon_state = "fitnessweight"