Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub

code/__DEFINES/admin.dm

@@ -43,4 +43,21 @@
 
 #define R_MAXPERMISSION 32768 //This holds the maximum value for a permission. It is used in iteration, so keep it updated.
 
-#define R_HOST			65535
+#define R_HOST			65535
+
+#define ADMIN_QUE(user) "(<a href='?_src_=holder;adminmoreinfo=[user.UID()]'>?</a>)"
+#define ADMIN_FLW(user) "(<a href='?_src_=holder;adminplayerobservefollow=[user.UID()]'>FLW</a>)"
+#define ADMIN_PP(user) "(<a href='?_src_=holder;adminplayeropts=[user.UID()]'>PP</a>)"
+#define ADMIN_VV(atom) "(<a href='?_src_=vars;Vars=[atom.UID()]'>VV</a>)"
+#define ADMIN_SM(user) "(<a href='?_src_=holder;subtlemessage=[user.UID()]'>SM</a>)"
+#define ADMIN_TP(user) "(<a href='?_src_=holder;traitor=[user.UID()]'>TP</a>)"
+#define ADMIN_BSA(user) "(<a href='?_src_=holder;BlueSpaceArtillery=[user.UID()]'>BSA</a>)"
+#define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;CentcommReply=[user.UID()]'>RPLY</a>)"
+#define ADMIN_SYNDICATE_REPLY(user) "(<a href='?_src_=holder;SyndicateReply=[user.UID()]'>RPLY</a>)"
+#define ADMIN_SC(user) "(<a href='?_src_=holder;adminspawncookie=[user.UID()]'>SC</a>)"
+#define ADMIN_LOOKUP(user) "[key_name_admin(user)][ADMIN_QUE(user)]"
+#define ADMIN_LOOKUPFLW(user) "[key_name_admin(user)][ADMIN_QUE(user)] [ADMIN_FLW(user)]"
+#define ADMIN_FULLMONTY(user) "[key_name_admin(user)] [ADMIN_QUE(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_FLW(user)] [ADMIN_TP(user)]"
+#define ADMIN_JMP(src) "(<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)"
+#define COORD(src) "[src ? "([src.x],[src.y],[src.z])" : "nonexistent location"]"
+#define ADMIN_COORDJMP(src) "[src ? "[COORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"

code/__HELPERS/matrices.dm

@@ -24,3 +24,39 @@
 		animate(transform = matrices[i], time = speed)
 		//doesn't have an object argument because this is "Stacking" with the animate call above
 		//3 billion% intentional
+
+//Dumps the matrix data in format a-f
+/matrix/proc/tolist()
+	. = list()
+	. += a
+	. += b
+	. += c
+	. += d
+	. += e
+	. += f
+
+//Dumps the matrix data in a matrix-grid format
+/*
+  a d 0
+  b e 0
+  c f 1
+*/
+/matrix/proc/togrid()
+	. = list()
+	. += a
+	. += d
+	. += 0
+	. += b
+	. += e
+	. += 0
+	. += c
+	. += f
+	. += 1
+
+//The X pixel offset of this matrix
+/matrix/proc/get_x_shift()
+	. = c
+
+//The Y pixel offset of this matrix
+/matrix/proc/get_y_shift()
+	. = f

code/__HELPERS/unsorted.dm

@@ -1009,6 +1009,50 @@ proc/get_mob_with_client_list()
 	else if(zone == "l_foot") return "left foot"
 	else if(zone == "r_foot") return "right foot"
 	else return zone
+	
+/*
+
+ Gets the turf this atom's *ICON* appears to inhabit
+ It takes into account:
+ * Pixel_x/y
+ * Matrix x/y
+
+ NOTE: if your atom has non-standard bounds then this proc
+ will handle it, but:
+ * if the bounds are even, then there are an even amount of "middle" turfs, the one to the EAST, NORTH, or BOTH is picked
+ (this may seem bad, but you're atleast as close to the center of the atom as possible, better than byond's default loc being all the way off)
+ * if the bounds are odd, the true middle turf of the atom is returned
+
+*/
+
+/proc/get_turf_pixel(atom/movable/AM)
+	if(!istype(AM))
+		return
+
+	//Find AM's matrix so we can use it's X/Y pixel shifts
+	var/matrix/M = matrix(AM.transform)
+
+	var/pixel_x_offset = AM.pixel_x + M.get_x_shift()
+	var/pixel_y_offset = AM.pixel_y + M.get_y_shift()
+
+	//Irregular objects
+	if(AM.bound_height != world.icon_size || AM.bound_width != world.icon_size)
+		var/icon/AMicon = icon(AM.icon, AM.icon_state)
+		pixel_x_offset += ((AMicon.Width()/world.icon_size)-1)*(world.icon_size*0.5)
+		pixel_y_offset += ((AMicon.Height()/world.icon_size)-1)*(world.icon_size*0.5)
+		qdel(AMicon)
+
+	//DY and DX
+	var/rough_x = round(round(pixel_x_offset,world.icon_size)/world.icon_size)
+	var/rough_y = round(round(pixel_y_offset,world.icon_size)/world.icon_size)
+
+	//Find coordinates
+	var/turf/T = get_turf(AM) //use AM's turfs, as it's coords are the same as AM's AND AM's coords are lost if it is inside another atom
+	var/final_x = T.x + rough_x
+	var/final_y = T.y + rough_y
+
+	if(final_x || final_y)
+		return locate(final_x, final_y, T.z)
 
 //Finds the distance between two atoms, in pixels
 //centered = 0 counts from turf edge to edge

code/_onclick/ai.dm

@@ -31,9 +31,15 @@
 		return
 	next_click = world.time + 1
 
-
 	if(control_disabled || stat)
 		return
+		
+	var/turf/pixel_turf = get_turf_pixel(A)
+	if(pixel_turf && !cameranet.checkTurfVis(pixel_turf))
+		log_admin("[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(A)])")
+		message_admins("[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([ADMIN_COORDJMP(A)]))")
+		send2irc_adminless_only("NOCHEAT", "[key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(A)]))")
+		return
 
 	var/list/modifiers = params2list(params)
 	if(modifiers["shift"] && modifiers["ctrl"])

code/game/gamemodes/gameticker.dm

@@ -411,7 +411,7 @@ var/round_start_time = 0
 					var/dat
 					dat += {"<html><head><title>Karma Reminder</title></head><body><h1><B>Karma Reminder</B></h1><br>
 					You have not yet spent your karma for the round, surely there is a player who was worthy of receiving<br>
-					your reward? Look under 'Special Verbs' for the 'Award Karma' button, and use it once a round for best results!</table></body></html>"}
+					your reward? Look under 'OOC' for the 'Award Karma' button, and use it once a round for best results!</table></body></html>"}
 					player << browse(dat, "window=karmareminder;size=400x300")
 
 

code/game/machinery/cryo.dm

@@ -122,7 +122,7 @@
 	..()
 	if(autoeject)
 		if(occupant)
-			if(occupant.health >= 100)
+			if(!occupant.has_organic_damage())
 				on = 0
 				go_out()
 				playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)

code/game/mecha/mecha.dm

@@ -563,7 +563,9 @@
 			dam_coeff = B.damage_coeff
 			break
 
-	if(prob(deflect_chance * deflection) && (Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+	if(Proj.damage_type != BRUTE && Proj.damage_type != BURN)
+		visible_message("<span class='danger'>[src]'s armour is undamaged by [Proj]!</span>")
+	else if(prob(deflect_chance * deflection))
 		visible_message("<span class='danger'>[src]'s armour deflects [Proj]!</span>")
 	else
 		visible_message("<span class='danger'>[src] is hit by [Proj].</span>")

code/modules/admin/admin.dm

@@ -539,9 +539,9 @@ var/global/nologevent = 0
 	world.Reboot("Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key].", "end_error", "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", delay)
 
 /datum/admins/proc/announce()
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Announce"
-	set desc="Announce your desires to the world"
+	set desc = "Announce your desires to the world"
 
 	if(!check_rights(R_ADMIN))
 		return

code/modules/admin/admin_verbs.dm

@@ -533,7 +533,7 @@ var/list/admin_verbs_snpc = list(
 #undef AUTOBANTIME
 
 /client/proc/drop_bomb() // Some admin dickery that can probably be done better -- TLE
-	set category = "Special Verbs"
+	set category = "Event"
 	set name = "Drop Bomb"
 	set desc = "Cause an explosion of varying strength at your location."
 

code/modules/admin/buildmode.dm

@@ -396,7 +396,8 @@
 
 /proc/togglebuildmode(mob/M as mob in player_list)
 	set name = "Toggle Build Mode"
-	set category = "Special Verbs"
+	set category = "Event"
+
 	if(M.client)
 		if(istype(M.client.click_intercept,/datum/click_intercept/buildmode))
 			var/datum/click_intercept/buildmode/B = M.client.click_intercept
@@ -404,7 +405,7 @@
 			log_admin("[key_name(usr)] has left build mode.")
 		else
 			new/datum/click_intercept/buildmode(M.client)
-			message_admins("[key_name(usr)] has entered build mode.")
+			message_admins("[key_name_admin(usr)] has entered build mode.")
 			log_admin("[key_name(usr)] has entered build mode.")
 
 /datum/click_intercept/buildmode/InterceptClickOn(user,params,atom/object) //Click Intercept

code/modules/admin/verbs/adminsay.dm

@@ -1,5 +1,5 @@
 /client/proc/cmd_admin_say(msg as text)
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Asay" //Gave this shit a shorter name so you only have to time out "asay" rather than "admin say" to use it --NeoFite
 	set hidden = 1
 	if(!check_rights(R_ADMIN))	return
@@ -17,7 +17,7 @@
 	feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_mentor_say(msg as text)
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Msay"
 	set hidden = 1
 

code/modules/admin/verbs/deadsay.dm

@@ -1,5 +1,5 @@
 /client/proc/dsay(msg as text)
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Dsay" //Gave this shit a shorter name so you only have to time out "dsay" rather than "dead say" to use it --NeoFite
 	set hidden = 1
 	

code/modules/admin/verbs/freeze.dm

@@ -7,13 +7,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 var/global/list/frozen_mob_list = list()
 /client/proc/freeze(var/mob/living/M as mob in mob_list)
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Freeze"
-	if(!holder)
-		to_chat(src, "<font color='red'>Error: Freeze: Only administrators may use this command.</font>")
+		
+	if(!check_rights(R_ADMIN))
 		return
-	if(!istype(M))	return
-	if(!check_rights(R_ADMIN))	return
+		
+	if(!istype(M))	
+		return	
+
 	if(M in frozen_mob_list)
 		M.admin_unFreeze(src)
 	else
@@ -83,14 +85,15 @@ var/global/list/frozen_mob_list = list()
 //////////////////////////Freeze Mech
 
 /client/proc/freezemecha(var/obj/mecha/O as obj in mechas_list)
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Freeze Mech"
-	if(!holder)
-		to_chat(src, "Only administrators may use this command.")
-		return
+
+	if(!check_rights(R_ADMIN))
+		return	
+	
 	var/obj/mecha/M = O
 	if(!istype(M,/obj/mecha))
-		to_chat(src, "<span class='danger'>This can only be used on Mechs!</span>")
+		to_chat(src, "<span class='danger'>This can only be used on mechs!</span>")
 		return
 	else
 		if(usr)

code/modules/admin/verbs/infiltratorteam_syndicate.dm

@@ -21,8 +21,8 @@ var/global/sent_syndicate_infiltration_team = 0
 	var/pick_manually = 0
 	if(alert("Pick the team members manually? If you select yes, you pick from ghosts. If you select no, ghosts get offered the chance to join.",,"Yes","No")=="Yes")
 		pick_manually = 1
-	var/list/teamsizeoptions = list(1,2,3,4,5)
-	var/teamsize = input(src, "How many team members, not counting the team leader?") as null|anything in teamsizeoptions
+	var/list/teamsizeoptions = list(2,3,4,5,6)
+	var/teamsize = input(src, "How many team members, including the team leader?") as null|anything in teamsizeoptions
 	if(!(teamsize in teamsizeoptions))
 		alert("Invalid team size specified. Aborting.")
 		return
@@ -102,11 +102,11 @@ var/global/sent_syndicate_infiltration_team = 0
 			to_chat(new_syndicate_infiltrator, "<span class='danger'>As team leader, it is up to you to organize your team! Give the job to someone else if you can't handle it. Only your ID opens the exit door.</span>")
 		else
 			to_chat(new_syndicate_infiltrator, "<span class='danger'>Your team leader is: [team_leader]. They are in charge!</span>")
-			teamsize--
+		teamsize--
 		to_chat(new_syndicate_infiltrator, "<span class='notice'>You have more helpful information stored in your Notes.</span>")
 		new_syndicate_infiltrator.mind.store_memory("<B>Mission:</B> [input] ")
 		new_syndicate_infiltrator.mind.store_memory("<B>Team Leader:</B> [team_leader] ")
-		new_syndicate_infiltrator.mind.store_memory("<B>Starting Equipment:</B> <BR>- Chameleon Jumpsuit ((right click to Change Color))<BR> - Agent ID card ((disguise as another job))<BR> - Uplink Implant ((top left of screen)) <BR> - Dust Implant ((destroys your body on death)) <BR> - Combat Gloves ((insulated, disguised as black gloves)) <BR> - Anything bought with your uplink implant")
+		new_syndicate_infiltrator.mind.store_memory("<B>Starting Equipment:</B> <BR>- Syndicate Headset ((.h for your radio))<BR>- Chameleon Jumpsuit ((right click to Change Color))<BR> - Agent ID card ((disguise as another job))<BR> - Uplink Implant ((top left of screen)) <BR> - Dust Implant ((destroys your body on death)) <BR> - Combat Gloves ((insulated, disguised as black gloves)) <BR> - Anything bought with your uplink implant")
 		var/datum/atom_hud/antag/opshud = huds[ANTAG_HUD_OPS]
 		opshud.join_hud(new_syndicate_infiltrator.mind.current)
 		ticker.mode.set_antag_hud(new_syndicate_infiltrator.mind.current, "hudoperative")
@@ -145,8 +145,7 @@ var/global/sent_syndicate_infiltration_team = 0
 	var/datum/preferences/A = new() //Randomize appearance
 	A.real_name = syndicate_infiltrator_name
 	A.copy_to(new_syndicate_infiltrator)
-
-	new_syndicate_infiltrator.dna.ready_dna(new_syndicate_infiltrator) //Creates DNA.
+	new_syndicate_infiltrator.dna.ready_dna(new_syndicate_infiltrator)
 
 	//Creates mind stuff.
 	new_syndicate_infiltrator.mind_initialize()
@@ -154,7 +153,6 @@ var/global/sent_syndicate_infiltration_team = 0
 	new_syndicate_infiltrator.mind.special_role = "Syndicate Infiltrator"
 	ticker.mode.traitors |= new_syndicate_infiltrator.mind //Adds them to extra antag list
 	new_syndicate_infiltrator.equip_syndicate_infiltrator(syndicate_leader_selected, uplink_tc, is_mgmt)
-	qdel(spawn_location)
 	return new_syndicate_infiltrator
 
 // ---------------------------------------------------------------------------------------------------------
@@ -180,9 +178,6 @@ var/global/sent_syndicate_infiltration_team = 0
 		U.hidden_uplink.uses = 500
 	else
 		U.hidden_uplink.uses = num_tc
-	// Storage
-	//var/obj/item/weapon/implant/storage/T = new /obj/item/weapon/implant/storage(src)
-	//T.implant(src)
 	// Dust
 	var/obj/item/weapon/implant/dust/D = new /obj/item/weapon/implant/dust(src)
 	D.implant(src)
@@ -196,7 +191,7 @@ var/global/sent_syndicate_infiltration_team = 0
 	// Other gear
 	equip_to_slot_or_del(new /obj/item/clothing/shoes/syndigaloshes(src), slot_shoes)
 
-	var/obj/item/weapon/card/id/syndicate/W = new(src) //Untrackable by AI
+	var/obj/item/weapon/card/id/syndicate/W = new(src)
 	if (flag_mgmt)
 		W.icon_state = "commander"
 	else

code/modules/admin/verbs/randomverbs.dm

@@ -139,7 +139,7 @@
 	feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_godmode(mob/M as mob in mob_list)
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Godmode"
 
 	if(!check_rights(R_ADMIN))
@@ -287,7 +287,7 @@ Works kind of like entering the game with a new character. Character receives a
 Traitors and the like can also be revived with the previous role mostly intact.
 /N */
 /client/proc/respawn_character()
-	set category = "Special Verbs"
+	set category = "Event"
 	set name = "Respawn Character"
 	set desc = "Respawn a person that has been gibbed/dusted/killed. They must be a ghost for this to work and preferably should not have a body to go back into."
 
@@ -520,7 +520,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	feedback_add_details("admin_verb","IONC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_rejuvenate(mob/living/M as mob in mob_list)
-	set category = "Special Verbs"
+	set category = "Event"
 	set name = "Rejuvenate"
 
 	if(!check_rights(R_REJUVINATE))
@@ -659,7 +659,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		return
 
 /client/proc/cmd_admin_emp(atom/O as obj|mob|turf in view())
-	set category = "Special Verbs"
+	set category = "Event"
 	set name = "EM Pulse"
 
 	if(!check_rights(R_DEBUG|R_EVENT))
@@ -682,7 +682,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		return
 
 /client/proc/cmd_admin_gib(mob/M as mob in mob_list)
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Gib"
 
 	if(!check_rights(R_ADMIN|R_EVENT))
@@ -722,7 +722,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		feedback_add_details("admin_verb","GIBS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_check_contents(mob/living/M as mob in mob_list)
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Check Contents"
 
 	if(!check_rights(R_ADMIN))
@@ -734,7 +734,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	feedback_add_details("admin_verb","CC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/toggle_view_range()
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Change View Range"
 	set desc = "switches between 1x and custom views"
 
@@ -806,7 +806,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	message_admins("[key_name_admin(usr)] has [shuttle_master.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
 
 /client/proc/cmd_admin_attack_log(mob/M as mob in mob_list)
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Attack Log"
 
 	if(!check_rights(R_ADMIN))
@@ -875,7 +875,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set name = "Reset Telecomms Scripts"
 	set desc = "Blanks all telecomms scripts from all telecomms servers"
 
-	if(!check_rights(R_ADMIN, 1, src))
+	if(!check_rights(R_ADMIN))
 		return
 
 	var/confirm = alert(src, "You sure you want to blank all NTSL scripts?", "Confirm", "Yes", "No")

code/modules/client/preference/preferences.dm

@@ -213,15 +213,14 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 /datum/preferences/New(client/C)
 	b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
 
+	max_gear_slots = config.max_loadout_points
 	if(istype(C))
 		if(!IsGuestKey(C.key))
 			unlock_content = C.IsByondMember()
 			if(unlock_content)
 				max_save_slots = MAX_SAVE_SLOTS_MEMBER
-
-	max_gear_slots = config.max_loadout_points
-	if(C.donator_level >= DONATOR_LEVEL_ONE)
-		max_gear_slots += 5
+			if(C.donator_level >= DONATOR_LEVEL_ONE)
+				max_gear_slots += 5
 
 	var/loaded_preferences_successfully = load_preferences(C)
 	if(loaded_preferences_successfully)

code/modules/karma/karma.dm

@@ -84,7 +84,7 @@ var/list/karma_spenders = list()
 /mob/verb/spend_karma_list()
 	set name = "Award Karma"
 	set desc = "Let the gods know whether someone's been nice. Can only be used once per round."
-	set category = "Special Verbs"
+	set category = "OOC"
 
 	if(!can_give_karma())
 		return
@@ -113,7 +113,7 @@ var/list/karma_spenders = list()
 /mob/verb/spend_karma(var/mob/M)
 	set name = "Award Karma to Player"
 	set desc = "Let the gods know whether someone's been nice. Can only be used once per round."
-	set category = "Special Verbs"
+	set category = "OOC"
 
 	if(!M)
 		to_chat(usr, "Please right click a mob to award karma directly, or use the 'Award Karma' verb to select a player from the player listing.")
@@ -144,8 +144,8 @@ var/list/karma_spenders = list()
 
 /client/verb/check_karma()
 	set name = "Check Karma"
-	set category = "Special Verbs"
 	set desc = "Reports how much karma you have accrued."
+	set category = "OOC"
 
 	var/currentkarma=verify_karma()
 	to_chat(usr, {"<br>You have <b>[currentkarma]</b> available."})

code/modules/mining/equipment_locker.dm

@@ -105,34 +105,30 @@
 						i++
 
 /obj/machinery/mineral/ore_redemption/attackby(var/obj/item/weapon/W, var/mob/user, params)
-	if(!powered())
-		return
-	if(istype(W,/obj/item/weapon/card/id))
-		var/obj/item/weapon/card/id/I = usr.get_active_hand()
-		if(istype(I) && !istype(inserted_id))
-			if(!user.drop_item())
-				return
-			I.loc = src
-			inserted_id = I
-			interact(user)
-		return
-
 	if(default_deconstruction_screwdriver(user, "ore_redemption-open", "ore_redemption", W))
 		updateUsrDialog()
 		return
-
 	if(exchange_parts(user, W))
 		return
-
 	if(panel_open)
 		if(istype(W, /obj/item/weapon/crowbar))
 			empty_content()
 			default_deconstruction_crowbar(W)
 		return
-
 	if(default_unfasten_wrench(user, W))
 		return
-
+	if(istype(W,/obj/item/weapon/card/id))
+		if(!powered())
+			return
+		else
+			var/obj/item/weapon/card/id/I = usr.get_active_hand()
+			if(istype(I) && !istype(inserted_id))
+				if(!user.drop_item())
+					return
+				I.forceMove(src)
+				inserted_id = I
+				interact(user)
+			return
 	..()
 
 /obj/machinery/mineral/ore_redemption/proc/SmeltMineral(var/obj/item/weapon/ore/O)
@@ -437,18 +433,6 @@
 	return
 
 /obj/machinery/mineral/equipment_vendor/attackby(obj/item/I as obj, mob/user as mob, params)
-	if(istype(I, /obj/item/weapon/mining_voucher))
-		RedeemVoucher(I, user)
-		return
-	if(istype(I,/obj/item/weapon/card/id))
-		var/obj/item/weapon/card/id/C = usr.get_active_hand()
-		if(istype(C) && !istype(inserted_id))
-			if(!usr.drop_item())
-				return
-			C.loc = src
-			inserted_id = C
-			interact(user)
-		return
 	if(default_deconstruction_screwdriver(user, "mining-open", "mining", I))
 		updateUsrDialog()
 		return
@@ -456,6 +440,24 @@
 		if(istype(I, /obj/item/weapon/crowbar))
 			default_deconstruction_crowbar(I)
 		return 1
+	if(istype(I, /obj/item/weapon/mining_voucher))
+		if(!powered())
+			return
+		else
+			RedeemVoucher(I, user)
+			return
+	if(istype(I,/obj/item/weapon/card/id))
+		if(!powered())
+			return
+		else
+			var/obj/item/weapon/card/id/C = usr.get_active_hand()
+			if(istype(C) && !istype(inserted_id))
+				if(!usr.drop_item())
+					return
+				C.forceMove(src)
+				inserted_id = C
+				interact(user)
+			return
 	..()
 
 /obj/machinery/mineral/equipment_vendor/proc/RedeemVoucher(obj/item/weapon/mining_voucher/voucher, mob/redeemer)

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

@@ -201,3 +201,12 @@ I use this to standardize shadowling dethrall code
 		return null
 	var/obj/item/organ/internal/O = get_int_organ(organ_name)
 	return O.parent_organ
+
+/mob/living/carbon/human/has_organic_damage()
+	var/odmg = 0
+	for(var/obj/item/organ/external/O in organs)
+		if(O.status & ORGAN_ROBOT)
+			odmg += O.brute_dam
+			odmg += O.burn_dam
+	return (health < (100 - odmg))
+

code/modules/mob/living/living.dm

@@ -287,6 +287,10 @@
 	adjustFireLoss(burn)
 	src.updatehealth()
 
+/mob/living/proc/has_organic_damage()
+	return (maxHealth - health)
+
+
 /mob/living/proc/restore_all_organs()
 	return
 

code/modules/mob/living/simple_animal/bot/medbot.dm

@@ -368,6 +368,9 @@
 	if(declare_crit && C.health <= 0) //Critical condition! Call for help!
 		declare(C)
 
+	if(!C.has_organic_damage())
+		return 0
+
 	//If they're injured, we're using a beaker, and don't have one of our WONDERCHEMS.
 	if((reagent_glass) && (use_beaker) && ((C.getBruteLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getOxyLoss() >= (heal_threshold + 15))))
 		for(var/datum/reagent/R in reagent_glass.reagents.reagent_list)

html/changelog.html

@@ -55,6 +55,27 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">08 December 2016</h2>
+			<h3 class="author">Kyep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Ensures cryo pods will properly auto-eject people whose organic parts (limbs) have been healed, but who still have damaged mechanical limbs.</li>
+				<li class="bugfix">Disabler shots no longer damage mechs.</li>
+				<li class="bugfix">On impact, both taser and disabler shots now produce a message saying that the mech is undamaged by them, instead of a message saying they 'hit'.</li>
+				<li class="bugfix">Fixed runtimes created when SIT, ERT, and some other mobs are spawned.</li>
+				<li class="bugfix">Fixed a bug causing SITs to be spawned with one less person than desired in some cases.</li>
+			</ul>
+
+			<h2 class="date">07 December 2016</h2>
+			<h3 class="author">Markolie updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Verbs have been cleaned up: all karma verbs can now be found under "OOC" instead of "Special Verbs". Most admin verbs have been moved out of "Special Verbs" as well.</li>
+			</ul>
+			<h3 class="author">TullyBurnalot updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Unpowered Mining Vendors no longer accept IDs</li>
+				<li class="bugfix">Ore Redemption Machine and Mining Vendor can now be deconstructed if unpowered</li>
+			</ul>
+
 			<h2 class="date">06 December 2016</h2>
 			<h3 class="author">Markolie updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -3144,3 +3144,21 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: The track button on the AI crew monitor now works.
   - bugfix: Permanent door electrification by alt-clicking a door as an AI or setting
       it manually now works again.
+2016-12-07:
+  Markolie:
+  - tweak: 'Verbs have been cleaned up: all karma verbs can now be found under "OOC"
+      instead of "Special Verbs". Most admin verbs have been moved out of "Special
+      Verbs" as well.'
+  TullyBurnalot:
+  - bugfix: Unpowered Mining Vendors no longer accept IDs
+  - bugfix: Ore Redemption Machine and Mining Vendor can now be deconstructed if unpowered
+2016-12-08:
+  Kyep:
+  - bugfix: Ensures cryo pods will properly auto-eject people whose organic parts
+      (limbs) have been healed, but who still have damaged mechanical limbs.
+  - bugfix: Disabler shots no longer damage mechs.
+  - bugfix: On impact, both taser and disabler shots now produce a message saying
+      that the mech is undamaged by them, instead of a message saying they 'hit'.
+  - bugfix: Fixed runtimes created when SIT, ERT, and some other mobs are spawned.
+  - bugfix: Fixed a bug causing SITs to be spawned with one less person than desired
+      in some cases.