Merge

code/game/dna/genes/disabilities.dm

@@ -32,7 +32,7 @@
 		M.mutations.Add(mutation)
 	if(disability)
 		M.disabilities|=disability
-	if(mutation)
+	if(sdisability)
 		M.sdisabilities|=sdisability
 	if(activation_message)
 		M << "\red [activation_message]"
@@ -43,9 +43,9 @@
 	if(mutation && (mutation in M.mutations))
 		M.mutations.Remove(mutation)
 	if(disability)
-		M.disabilities-=disability
-	if(mutation)
-		M.sdisabilities-=sdisability
+		M.disabilities &= (~disability)
+	if(sdisability)
+		M.sdisabilities &= (~sdisability)
 	if(deactivation_message)
 		M << "\red [deactivation_message]"
 	else

code/game/gamemodes/events/space_ninja.dm

@@ -415,7 +415,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 		if(13)
 			directive += "Some disgruntled NanoTrasen employees have been supportive of our operations. Be wary of any mistreatment by command staff."
 		if(14)
-			var/xenorace = pick("Unathi","Tajaran", "Skrellian")
+			var/xenorace = pick("Unathi","Tajara", "Skrell")
 			directive += "A group of [xenorace] radicals have been loyal supporters of the Spider Clan. Favor [xenorace] crew whenever possible."
 		if(15)
 			directive += "The Spider Clan has recently been accused of religious insensitivity. Attempt to speak with the Chaplain and prove these accusations false."

code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm

@@ -6,7 +6,7 @@ datum/directive/terminations/alien_fraud
 
 	proc/is_alien(mob/M)
 		var/species = M.get_species()
-		return species == "Tajaran" || species == "Unathi"
+		return species == "Tajara" || species == "Unathi"
 
 datum/directive/terminations/alien_fraud/get_crew_to_terminate()
 	var/list/aliens[0]
@@ -30,7 +30,7 @@ datum/directive/terminations/alien_fraud/meets_prerequisites()
 	var/unathi = 0
 	for(var/mob/M in player_list)
 		var/species = M.get_species()
-		if(species == "Tajaran")
+		if(species == "Tajara")
 			tajarans++
 		if(species == "Unathi")
 			unathi++

code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm

@@ -28,7 +28,7 @@ datum/directive/tau_ceti_needs_women
 		var/list/aliens[0]
 		for(var/mob/M in get_crew_of_target_gender())
 			var/species = M.get_species()
-			if(species == "Tajaran" || species == "Unathi" || species == "Skrell")
+			if(species == "Tajara" || species == "Unathi" || species == "Skrell")
 				aliens.Add(M)
 		return aliens
 

code/game/gamemodes/nuclear/nuclear.dm

@@ -232,8 +232,8 @@ var/global/list/turf/synd_spawn = list()
 		switch(race)
 			if("Unathi")
 				new_suit.species_restricted = list("Unathi")
-			if("Tajaran")
-				new_suit.species_restricted = list("Tajaran")
+			if("Tajara")
+				new_suit.species_restricted = list("Tajara")
 			if("Skrell")
 				new_suit.species_restricted = list("Skrell")
 

code/game/jobs/job_controller.dm

@@ -480,7 +480,7 @@ var/global/datum/controller/occupations/job_master
 
 		//TODO: Generalize this by-species
 		if(H.species)
-			if(H.species.name == "Tajaran" || H.species.name == "Unathi")
+			if(H.species.name == "Tajara" || H.species.name == "Unathi")
 				H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes,1)
 			else if(H.species.name == "Vox")
 				H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask)

code/game/jobs/whitelist.dm

@@ -46,7 +46,6 @@ var/list/whitelist = list()
 				return 1
 			if(findtext(s,"[M.ckey] - All"))
 				return 1
-
 	return 0
 
 #undef WHITELISTFILE

code/game/machinery/Sleeper.dm

@@ -311,6 +311,9 @@
 			M:reagents.add_reagent("inaprovaline", 5)
 		return
 	proc/toggle_filter()
+		if(!src.occupant)
+			filtering = 0
+			return
 		if(filtering)
 			filtering = 0
 		else

code/game/machinery/alarm.dm

@@ -1310,6 +1310,11 @@ FIRE ALARM
 						user.visible_message("\red [user] has reconnected [src]'s detecting unit!", "You have reconnected [src]'s detecting unit.")
 					else
 						user.visible_message("\red [user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.")
+				else if (istype(W, /obj/item/weapon/wirecutters))
+					user.visible_message("\red [user] has cut the wires inside \the [src]!", "You have cut the wires inside \the [src].")
+					playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
+					buildstage = 1
+					update_icon()
 			if(1)
 				if(istype(W, /obj/item/stack/cable_coil))
 					var/obj/item/stack/cable_coil/C = W

code/game/machinery/bioprinter.dm

@@ -5,6 +5,9 @@
 	desc = "It's a machine that grows replacement organs."
 	icon = 'icons/obj/surgery.dmi'
 
+	anchored = 1
+	density = 1
+
 	icon_state = "bioprinter"
 
 	var/prints_prosthetics

code/game/machinery/computer/card.dm

@@ -11,24 +11,24 @@
 	var/mode = 0.0
 	var/printing = null
 
-	proc/is_centcom()
-		return istype(src, /obj/machinery/computer/card/centcom)
+/obj/machinery/computer/card/proc/is_centcom()
+	return 0
 
-	proc/is_authenticated()
-		return scan ? check_access(scan) : 0
+/obj/machinery/computer/card/proc/is_authenticated()
+	return scan ? check_access(scan) : 0
 
-	proc/get_target_rank()
-		return modify && modify.assignment ? modify.assignment : "Unassigned"
+/obj/machinery/computer/card/proc/get_target_rank()
+	return modify && modify.assignment ? modify.assignment : "Unassigned"
 
-	proc/format_jobs(list/jobs)
-		var/list/formatted = list()
-		for(var/job in jobs)
-			formatted.Add(list(list(
-				"display_name" = replacetext(job, " ", "&nbsp"),
-				"target_rank" = get_target_rank(),
-				"job" = job)))
+/obj/machinery/computer/card/proc/format_jobs(list/jobs)
+	var/list/formatted = list()
+	for(var/job in jobs)
+		formatted.Add(list(list(
+			"display_name" = replacetext(job, " ", "&nbsp"),
+			"target_rank" = get_target_rank(),
+			"job" = job)))
 
-		return formatted
+	return formatted
 
 /obj/machinery/computer/card/verb/eject_id()
 	set category = "Object"
@@ -288,3 +288,7 @@
 	name = "CentCom Identification Computer"
 	circuit = "/obj/item/weapon/circuitboard/card/centcom"
 	req_access = list(access_cent_captain)
+
+
+/obj/machinery/computer/card/centcom/is_centcom()
+	return 1

code/game/machinery/suit_storage_unit.dm

@@ -602,7 +602,7 @@
 	//Departments that the cycler can paint suits to look like.
 	var/list/departments = list("Engineering","Mining","Medical","Security","Atmos")
 	//Species that the suits can be configured to fit.
-	var/list/species = list("Human","Skrell","Unathi","Tajaran")
+	var/list/species = list("Human","Skrell","Unathi","Tajara")
 
 	var/target_department
 	var/target_species
@@ -622,35 +622,35 @@
 	model_text = "Engineering"
 	req_access = list(access_construction)
 	departments = list("Engineering","Atmos")
-	species = list("Human","Tajaran","Skrell","Unathi") //Add Unathi when sprites exist for their suits.
+	species = list("Human","Tajara","Skrell","Unathi") //Add Unathi when sprites exist for their suits.
 
 /obj/machinery/suit_cycler/mining
 	name = "Mining suit cycler"
 	model_text = "Mining"
 	req_access = list(access_mining)
 	departments = list("Mining")
-	species = list("Human","Tajaran","Skrell","Unathi")
+	species = list("Human","Tajara","Skrell","Unathi")
 
 /obj/machinery/suit_cycler/security
 	name = "Security suit cycler"
 	model_text = "Security"
 	req_access = list(access_security)
 	departments = list("Security")
-	species = list("Human","Tajaran","Skrell","Unathi")
+	species = list("Human","Tajara","Skrell","Unathi")
 
 /obj/machinery/suit_cycler/medical
 	name = "Medical suit cycler"
 	model_text = "Medical"
 	req_access = list(access_medical)
 	departments = list("Medical")
-	species = list("Human","Tajaran","Skrell","Unathi")
+	species = list("Human","Tajara","Skrell","Unathi")
 
 /obj/machinery/suit_cycler/syndicate
 	name = "Nonstandard suit cycler"
 	model_text = "Nonstandard"
 	req_access = list(access_syndicate)
 	departments = list("Mercenary")
-	species = list("Human","Tajaran","Skrell","Unathi")
+	species = list("Human","Tajara","Skrell","Unathi")
 	can_repair = 1
 
 /obj/machinery/suit_cycler/attack_ai(mob/user as mob)

code/game/mecha/equipment/tools/tools.dm

@@ -1136,16 +1136,13 @@
 		M.verbs -= /obj/mecha/proc/move_inside_passenger
 
 /obj/item/mecha_parts/mecha_equipment/tool/passenger/get_equip_info()
-	var/output = ..()
-	if(output)
-		var/temp = "<br />[occupant? "\[Occupant: [occupant]\]|" : ""]Exterior Hatch: <a href='?src=\ref[src];toggle_lock=1'>[door_locked? "Locked" : "Unlocked"]</a>"
-		return "[output] [temp]"
-	return
+	return "[..()] <br />[occupant? "\[Occupant: [occupant]\]|" : ""]Exterior Hatch: <a href='?src=\ref[src];toggle_lock=1'>Toggle Lock</a>"
 
 /obj/item/mecha_parts/mecha_equipment/tool/passenger/Topic(href,href_list)
 	..()
 	if (href_list["toggle_lock"])
 		door_locked = !door_locked
+		occupant_message("Passenger compartment hatch [door_locked? "locked" : "unlocked"].")
 		if (chassis)
 			chassis.visible_message("The hatch on \the [chassis] [door_locked? "locks" : "unlocks"].", "You hear something latching.")
 		
@@ -1200,6 +1197,4 @@
 		if (OCCUPIED|LOCKED)
 			usr << "\red All of the passenger compartments are already occupied or locked!"
 		if (0)
-			usr << "\red \The [src] doesn't have a passenger compartment."
-
-/obj/mecha/proc/remove_passenger()
+			usr << "\red \The [src] doesn't have a passenger compartment."

code/game/mecha/mecha.dm

@@ -1575,14 +1575,19 @@
 			
 		var/pname = input(user, "Choose a passenger to forcibly remove.", "Forcibly Remove Passenger") as null|anything in passengers
 		
-		if (pname)
-			var/obj/item/mecha_parts/mecha_equipment/tool/passenger/P = passengers[pname]
-			var/mob/occupant = P.occupant
+		if (!pname)
+			return
 			
-			visible_message("\red [user] opens the hatch on \the [P] and removes [occupant]!")
-			P.go_out()
-			P.log_message("[occupant] was removed.")
-			occupant_message("\red [occupant] was removed from \the [P] by [user]!")
+		var/obj/item/mecha_parts/mecha_equipment/tool/passenger/P = passengers[pname]
+		var/mob/occupant = P.occupant
+		
+		user.visible_message("\red [user] begins opening the hatch on \the [P]...", "\red You begin opening the hatch on \the [P]...")
+		if (!do_after(user, 40, needhand=0))
+			return
+		
+		user.visible_message("\red [user] opens the hatch on \the [P] and removes [occupant]!", "\red You open the hatch on \the [P] and remove [occupant]!")
+		P.go_out()
+		P.log_message("[occupant] was removed.")
 		return
 	if(href_list["add_req_access"] && add_req_access && filter.getObj("id_card"))
 		if(!in_range(src, usr))	return

code/game/objects/items.dm

@@ -44,7 +44,7 @@
 	/* Species-specific sprites, concept stolen from Paradise//vg/.
 	ex:
 	sprite_sheets = list(
-		"Tajaran" = 'icons/cat/are/bad'
+		"Tajara" = 'icons/cat/are/bad'
 		)
 	If index term exists and icon_override is not set, this sprite sheet will be used.
 	*/
@@ -261,6 +261,9 @@
 		//START HUMAN
 		var/mob/living/carbon/human/H = M
 
+		if(H.species && !(slot in H.species.hud.equip_slots))
+			return 0
+
 		switch(slot)
 			if(slot_l_hand)
 				if(H.l_hand)

code/game/objects/items/devices/modkit.dm

@@ -17,7 +17,7 @@
 /obj/item/device/modkit/afterattack(obj/O, mob/user as mob, proximity)
 	if(!proximity)
 		return
-	
+
 	if (!target_species)
 		return	//it shouldn't be null, okay?
 
@@ -31,12 +31,12 @@
 	for (var/permitted_type in permitted_types)
 		if(istype(O, permitted_type))
 			allowed = 1
-	
+
 	var/obj/item/clothing/I = O
 	if (!istype(I) || !allowed)
 		user << "<span class='notice'>[src] is unable to modify that.</span>"
 		return
-	
+
 	var/excluding = ("exclude" in I.species_restricted)
 	var/in_list = (target_species in I.species_restricted)
 	if (excluding ^ in_list)
@@ -57,7 +57,7 @@
 		parts &= ~MODKIT_HELMET
 	if (istype(I, /obj/item/clothing/suit))
 		parts &= ~MODKIT_SUIT
-	
+
 	if(!parts)
 		user.drop_from_inventory(src)
 		del(src)
@@ -69,4 +69,4 @@
 /obj/item/device/modkit/tajaran
 	name = "tajaran hardsuit modification kit"
 	desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user. This one looks like it's meant for Tajaran."
-	target_species = "Tajaran"
+	target_species = "Tajara"