Merge pull request #26 from ParadiseSS13/master

Merge from Master

code/WorkInProgress/Mini/atmos_control.dm

@@ -68,6 +68,8 @@
 			continue
 		if(alarm.hidden)
 			continue
+		if(alarm.z != z)
+			continue
 		var/turf/pos = get_turf(alarm)
 		var/list/alarm_data=list()
 		alarm_data["ID"]="\ref[alarm]"

code/_onclick/ai.dm

@@ -42,6 +42,9 @@
 	if(modifiers["shift"] && modifiers["ctrl"])
 		CtrlShiftClickOn(A)
 		return
+	if(modifiers["shift"] && modifiers["alt"])
+		AltShiftClickOn(A)
+		return
 	if(modifiers["middle"])
 		MiddleClickOn(A)
 		return
@@ -99,6 +102,8 @@
 
 /mob/living/silicon/ai/CtrlShiftClickOn(var/atom/A)
 	A.AICtrlShiftClick(src)
+/mob/living/silicon/ai/AltShiftClickOn(var/atom/A)
+	A.AIAltShiftClick(src)
 /mob/living/silicon/ai/ShiftClickOn(var/atom/A)
 	A.AIShiftClick(src)
 /mob/living/silicon/ai/CtrlClickOn(var/atom/A)
@@ -118,6 +123,18 @@
 		examine()
 	return
 	
+/atom/proc/AIAltShiftClick() 
+	return
+	
+/obj/machinery/door/airlock/AIAltShiftClick()  // Sets/Unsets Emergency Access Override
+	if(emagged)
+		return
+	if(!emergency)
+		Topic("aiEnable=11", list("aiEnable"="11"), 1) // 1 meaning no window (consistency!)
+	else
+		Topic("aiDisable=11", list("aiDisable"="11"), 1)
+	return
+	
 /atom/proc/AIShiftClick()
 	return
 

code/_onclick/click.dm

@@ -46,6 +46,9 @@
 	if(modifiers["shift"] && modifiers["ctrl"])
 		CtrlShiftClickOn(A)
 		return
+	if(modifiers["shift"] && modifiers["alt"])
+		AltShiftClickOn(A)
+		return
 	if(modifiers["middle"])
 		MiddleClickOn(A)
 		return
@@ -262,7 +265,7 @@
 	return T.Adjacent(src)
 
 /*
-	Control+Shift click
+	Control+Shift/Alt+Shift click
 	Unused except for AI
 */
 /mob/proc/CtrlShiftClickOn(var/atom/A)
@@ -271,6 +274,14 @@
 
 /atom/proc/CtrlShiftClick(var/mob/user)
 	return	
+
+/mob/proc/AltShiftClickOn(var/atom/A)
+	A.AltShiftClick(src)
+	return
+
+/atom/proc/AltShiftClick(var/mob/user)
+	return	
+	
 	
 /*
 	Misc helpers

code/_onclick/cyborg.dm

@@ -19,6 +19,9 @@
 	if(modifiers["shift"] && modifiers["ctrl"])
 		CtrlShiftClickOn(A)
 		return
+	if(modifiers["shift"] && modifiers["alt"])
+		AltShiftClickOn(A)
+		return
 	if(modifiers["middle"])
 		MiddleClickOn(A)
 		return
@@ -117,6 +120,8 @@
 // for non-doors/apcs
 /mob/living/silicon/robot/CtrlShiftClickOn(var/atom/A)
 	A.BorgCtrlShiftClick(src)
+/mob/living/silicon/robot/AltShiftClickOn(var/atom/A)
+	A.BorgAltShiftClick(src)
 /mob/living/silicon/robot/ShiftClickOn(var/atom/A)
 	A.BorgShiftClick(src)
 /mob/living/silicon/robot/CtrlClickOn(var/atom/A)
@@ -129,9 +134,15 @@
 		examine()
 		user.face_atom(src)
 	return
+
+/atom/proc/BorgAltShiftClick()
+	return	
+	
+/obj/machinery/door/airlock/BorgAltShiftClick()  // Enables emergency override on doors! Forwards to AI code.
+	AIAltShiftClick()
 	
 /atom/proc/BorgShiftClick()
-	return	
+	return		
 	
 /obj/machinery/door/airlock/BorgShiftClick()  // Opens and closes doors! Forwards to AI code.
 	AIShiftClick()

code/datums/spells/wizard.dm

@@ -27,7 +27,7 @@
 	icon_power_button = "spell_missile"
 
 /obj/effect/proc_holder/spell/wizard/targeted/inflict_handler/magic_missile
-	amt_weakened = 5
+	amt_weakened = 3
 	amt_dam_fire = 10
 
 /obj/effect/proc_holder/spell/wizard/noclothes
@@ -119,7 +119,7 @@
 
 
 	smoke_spread = 1
-	smoke_amt = 10
+	smoke_amt = 1
 
 	inner_tele_radius = 0
 	outer_tele_radius = 6
@@ -268,7 +268,7 @@
 	icon_power_button = "spell_fireball"
 
 /obj/effect/proc_holder/spell/wizard/turf/fireball/cast(var/turf/T)
-	explosion(T, -1, 0, 2, 0)
+	explosion(T, -1, 0, 2, 3, 0)
 
 
 /obj/effect/proc_holder/spell/wizard/targeted/inflict_handler/fireball
@@ -277,5 +277,5 @@
 
 /obj/effect/proc_holder/spell/wizard/targeted/explosion/fireball
 	ex_severe = -1
-	ex_heavy = 0
-	ex_light = 2
+	ex_heavy = -1
+	ex_light = 2

code/datums/wires/airlock.dm

@@ -34,12 +34,13 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
 /datum/wires/airlock/GetInteractWindow()
 	var/obj/machinery/door/airlock/A = holder
 	. += ..()
-	. += text("<br>\n[]<br>\n[]<br>\n[]<br>\n[]<br>\n[]<br>\n[]", (A.locked ? "The door bolts have fallen!" : "The door bolts look up."),
+	. += text("<br>\n[]<br>\n[]<br>\n[]<br>\n[]<br>\n[]<br>\n[]<br>\n[]", (A.locked ? "The door bolts have fallen!" : "The door bolts look up."),
 	(A.lights ? "The door bolt lights are on." : "The door bolt lights are off!"),
 	((A.arePowerSystemsOn() && !(A.stat & NOPOWER)) ? "The test light is on." : "The test light is off!"),
 	(A.aiControlDisabled==0 ? "The 'AI control allowed' light is on." : "The 'AI control allowed' light is off."),
 	(A.safe==0 ? "The 'Check Wiring' light is on." : "The 'Check Wiring' light is off."),
-	(A.normalspeed==0 ? "The 'Check Timing Mechanism' light is on." : "The 'Check Timing Mechanism' light is off."))
+	(A.normalspeed==0 ? "The 'Check Timing Mechanism' light is on." : "The 'Check Timing Mechanism' light is off."),
+	(A.emergency==0 ? "The emergency lights are off." : "The emergency lights are on."))
 
 
 /datum/wires/airlock/UpdateCut(var/index, var/mended)
@@ -123,9 +124,12 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
 	var/obj/machinery/door/airlock/A = holder
 	switch(index)
 		if(AIRLOCK_WIRE_IDSCAN)
-			//Sending a pulse through this flashes the red light on the door (if the door has power).
+			//Sending a pulse through this disables emergency access and flashes the red light on the door (if the door has power).
 			if((A.arePowerSystemsOn()) && (!(A.stat & NOPOWER)))
 				A.door_animate("deny")
+				if(A.emergency)
+					A.emergency = 0
+					A.update_icon()
 		if(AIRLOCK_WIRE_MAIN_POWER1 || AIRLOCK_WIRE_MAIN_POWER2)
 			//Sending a pulse through either one causes a breaker to trip, disabling the door for 10 seconds if backup power is connected, or 1 minute if not (or until backup power comes back on, whichever is shorter).
 			A.loseMainPower()

code/defines/obj/weapon.dm

@@ -550,7 +550,7 @@
 	throwforce = 5.0
 	sharp = 1
 	edge = 1
-	throw_speed = 1
+	throw_speed = 2
 	throw_range = 3
 	w_class = 4.0
 	flags = FPRINT | TABLEPASS | NOSHIELD
@@ -594,6 +594,7 @@
 	desc = "Special mechanical module made to store, sort, and apply standard machine parts."
 	icon_state = "RPED"
 	item_state = "RPED"
+	icon_override = 'icons/mob/in-hand/tools.dmi'
 	w_class = 5
 	can_hold = list("/obj/item/weapon/stock_parts","/obj/item/weapon/cell")
 	storage_slots = 50

code/game/area/Space Station 13 areas.dm

@@ -56,6 +56,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	var/list/all_doors = list()		//Added by Strumpetplaya - Alarm Change - Contains a list of doors adjacent to this area
 	var/air_doors_activated = 0
 
+	var/tele_proof = 0
+
 /*Adding a wizard area teleport list because motherfucking lag -- Urist*/
 /*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/
 var/list/teleportlocs = list()
@@ -238,14 +240,14 @@ var/list/ghostteleportlocs = list()
 /area/shuttle/gamma/space
 	icon_state = "shuttle"
 	name = "\improper Gamma Shuttle Space"
-	requires_power = 1
+	requires_power = 0
 	luminosity = 0
 	lighting_use_dynamic = 1
 
 /area/shuttle/gamma/station
 	icon_state = "shuttle"
 	name = "\improper Gamma Shuttle Station"
-	requires_power = 1
+	requires_power = 0
 	luminosity = 0
 	lighting_use_dynamic = 1
 
@@ -468,6 +470,12 @@ var/list/ghostteleportlocs = list()
 	name = "\improper Syndicate Elite Squad"
 	icon_state = "syndie-elite"
 
+/area/syndicate_depot
+	name = "\improper Suspicious Supply Depot"
+	icon_state = "red"
+	tele_proof = 1
+	requires_power = 0
+
 //EXTRA
 
 /area/asteroid					// -- TLE
@@ -654,27 +662,27 @@ var/list/ghostteleportlocs = list()
 	name = "\improper Aft Starboard Solars Landing Area"
 	icon_state = "southeast"
 	requires_power = 0
-	
+
 /area/xenos_station/east
 	name = "\improper East Landing Area"
 	icon_state = "east"
 	requires_power = 0
-	
+
 /area/xenos_station/west
 	name = "\improper West Landing Area"
 	icon_state = "west"
 	requires_power = 0
-	
+
 /area/xenos_station/researchoutpost
 	name = "\improper Research Outpost Landing Area"
 	icon_state = "north"
 	requires_power = 0
-	
+
 /area/xenos_station/miningoutpost
 	name = "\improper Mining Outpost Landing Area"
 	icon_state = "south"
-	requires_power = 0	
-	
+	requires_power = 0
+
 //PRISON
 /area/prison
 	name = "\improper Prison Station"
@@ -994,7 +1002,7 @@ var/list/ghostteleportlocs = list()
 /area/blueshield
 	name = "\improper Blueshield's Office"
 	icon_state = "blueold"
-	
+
 /area/centcomdocks
 	name = "\improper Central Command Docks"
 	icon_state = "centcom"
@@ -1583,6 +1591,14 @@ area/security/podbay
 	name = "\improper Vault"
 	icon_state = "nuke_storage"
 
+/area/security/customs
+	name = "\improper Customs"
+	icon_state = "checkpoint1"
+
+/area/security/customs2
+	name = "\improper Customs"
+	icon_state = "security"	
+	
 /area/security/checkpoint
 	name = "\improper Security Checkpoint"
 	icon_state = "checkpoint1"

code/game/gamemodes/events/power_failure.dm

@@ -6,6 +6,7 @@
 			M << sound('sound/AI/poweroff.ogg')
 
 	var/list/skipped_areas = list(/area/turret_protected/ai)
+	var/list/skipped_areas_apc = list(/area/engine/engineering)
 
 	for(var/obj/machinery/power/smes/S in machines)
 		var/area/current_area = get_area(S)
@@ -19,18 +20,25 @@
 
 
 	for(var/obj/machinery/power/apc/C in world)
-		if(C.cell && C.z == 1)
+		var/area/current_area = get_area(C)
+		if(current_area.type in skipped_areas_apc || C.z != 1)
+			continue
+		if(C.cell)
 			C.cell.charge = 0
 
 /proc/power_restore(var/announce = 1)
 	var/list/skipped_areas = list(/area/turret_protected/ai)
+	var/list/skipped_areas_apc = list(/area/engine/engineering)
 
 	if(announce)
 		command_alert("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal")
 		for(var/mob/M in player_list)
 			M << sound('sound/AI/poweron.ogg')
 	for(var/obj/machinery/power/apc/C in machines)
-		if(C.cell && C.z == 1)
+		var/area/current_area = get_area(C)
+		if(current_area.type in skipped_areas_apc || C.z != 1)
+			continue
+		if(C.cell)
 			C.cell.charge = C.cell.maxcharge
 	for(var/obj/machinery/power/smes/S in machines)
 		var/area/current_area = get_area(S)

code/game/gamemodes/wizard/spellbook.dm

@@ -373,7 +373,7 @@
 
 /obj/item/weapon/spellbook/oneuse/fireball/recoil(mob/user as mob)
 	..()
-	explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
+	explosion(user.loc, -1, 0, 2, 3, 0)
 	del(src)
 
 /obj/item/weapon/spellbook/oneuse/smoke

code/game/jobs/job/medical.dm

@@ -48,7 +48,7 @@
 	selection_color = "#ffeef0"
 	access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
 	minimal_access = list(access_medical, access_morgue, access_surgery, access_maint_tunnels)
-	alt_titles = list("Surgeon","Nurse","Mortician")
+	alt_titles = list("Surgeon","Nurse","Coroner")
 	minimal_player_age = 3
 
 	equip(var/mob/living/carbon/human/H)
@@ -60,10 +60,11 @@
 			if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		if (H.mind.role_alt_title)
 			switch(H.mind.role_alt_title)
-				if("Mortician")
+				if("Coroner")
 					H.equip_or_collect(new /obj/item/clothing/under/rank/medical/mortician(H), slot_w_uniform)
 					H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/mortician(H), slot_wear_suit)
 					if(H.backbag != 1)
+						H.equip_or_collect(new /obj/item/clothing/head/surgery/black(H.back), slot_in_backpack)					
 						H.equip_or_collect(new /obj/item/weapon/autopsy_scanner(H.back), slot_in_backpack)
 						H.equip_or_collect(new /obj/item/device/mass_spectrometer(H.back), slot_in_backpack)
 						H.equip_or_collect(new /obj/item/weapon/storage/box/bodybags(H.back), slot_in_backpack)

code/game/jobs/job/silicon.dm

@@ -20,7 +20,7 @@
 	flag = CYBORG
 	department_flag = ENGSEC
 	total_positions = 0
-	spawn_positions = 2
+	spawn_positions = 1
 	supervisors = "your laws and the AI"	//Nodrak
 	selection_color = "#ddffdd"
 	minimal_player_age = 21

code/game/machinery/bots/bots.dm

@@ -414,13 +414,13 @@ obj/machinery/bot/proc/bot_move(var/dest, var/move_speed)
 
 obj/machinery/bot/proc/bot_step(var/dest)
 	if(path && path.len > 1)
-		step_to(src, path[1])
+		step_towards(src, path[1])
 		if(get_turf(src) == path[1]) //Successful move
 			path -= path[1]
 		else
 			return 0
 	else if(path.len == 1)
-		step_to(src, dest)
+		step_towards(src, dest)
 		path = list()
 	return 1
 
@@ -777,7 +777,7 @@ obj/machinery/bot/proc/bot_summon()
 
 
 /obj/machinery/bot/Bump(M as mob|obj) //Leave no door unopened!
-	if((istype(M, /obj/machinery/door/airlock) ||  istype(M, /obj/machinery/door/window)) && (!isnull(botcard)))
+	if((istype(M, /obj/machinery/door/airlock) || istype(M, /obj/machinery/door/window)) && (!isnull(botcard)))
 		var/obj/machinery/door/D = M
 		if(D.check_access(botcard))
 			D.open()
@@ -786,4 +786,5 @@ obj/machinery/bot/proc/bot_summon()
 		var/mob/living/Mb = M
 		loc = Mb.loc
 		frustration = 0
-	return
+	return
+	

code/game/machinery/bots/ed209bot.dm

@@ -113,6 +113,7 @@
 	. = ..()
 	if (.)
 		return
+	usr.set_machine(src)
 	var/dat
 	dat += hack(user)
 	dat += text({"
@@ -400,25 +401,6 @@ Auto Patrol[]"},
 			return 1
 	return 0
 
-/obj/machinery/bot/ed209/Bump(M as mob|obj) //Leave no door unopened!
-	if ((istype(M, /obj/machinery/door)) && (!isnull(botcard)))
-		var/obj/machinery/door/D = M
-		if (!istype(D, /obj/machinery/door/firedoor) && D.check_access(botcard))
-			D.open()
-			frustration = 0
-	else if ((istype(M, /mob/living/)) && (!anchored))
-		loc = M:loc
-		frustration = 0
-	return
-
-/* terrible
-/obj/machinery/bot/ed209/Bumped(atom/movable/M as mob|obj)
-	spawn(0)
-		if (M)
-			var/turf/T = get_turf(src)
-			M:loc = T
-*/
-
 /obj/machinery/bot/ed209/explode()
 	walk_to(src,0)
 	visible_message("<span class='userdanger'>[src] blows apart!</span>")

code/game/machinery/bots/medbot.dm

@@ -136,6 +136,7 @@
 	. = ..()
 	if (.)
 		return
+	usr.set_machine(src)
 	var/dat
 	dat += hack(user)
 	dat += "<TT><B>Medical Unit Controls v1.1</B></TT><BR><BR>"

code/game/machinery/doors/airlock.dm

@@ -435,13 +435,14 @@ About the new airlock wires panel:
 
 /obj/machinery/door/airlock/update_icon()
 	if(overlays) overlays.Cut()
+	overlays = list()
+	if(emergency) overlays += image('icons/obj/doors/doorint.dmi', "elights")
 	if(density)
 		if(locked && lights)
 			icon_state = "door_locked"
 		else
 			icon_state = "door_closed"
 		if(p_open || welded || frozen)
-			overlays = list()
 			if(p_open)
 				overlays += image(icon, "panel_open")
 			if(welded)
@@ -508,6 +509,11 @@ About the new airlock wires panel:
 	else
 		t1 += text("IdScan enabled. <A href='?src=\ref[];aiDisable=1'>Disable?</a><br>\n", src)
 
+	if(src.emergency)
+		t1 += text("Emergency Access Override is enabled. <A href='?src=\ref[];aiDisable=11'>Disable?</a><br>\n", src)
+	else
+		t1 += text("Emergency Access Override is disabled. <A href='?src=\ref[];aiEnable=11'>Enable?</a><br>\n", src)		
+		
 	if(src.isWireCut(AIRLOCK_WIRE_MAIN_POWER1))
 		t1 += text("Main Power Input wire is cut.<br>\n")
 	if(src.isWireCut(AIRLOCK_WIRE_MAIN_POWER2))
@@ -686,8 +692,9 @@ About the new airlock wires panel:
 	return 1
 
 /obj/machinery/door/airlock/Topic(href, href_list, var/nowindow = 0)
-	// If you add an if(..()) check you must first remove the var/nowindow parameter.
-	// Otherwise it will runtime with this kind of error: null.Topic()
+		//AI
+		//aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 8 door safties, 9 door speed, 11 emergency access
+		//aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door,  8 door safties, 9 door speed, 11 emergency access
 	if(!nowindow)
 		..()
 	if(usr.stat || usr.restrained()|| usr.small)
@@ -826,6 +833,13 @@ About the new airlock wires panel:
 						usr << "The door bolt lights have been disabled."
 					else
 						usr << "The door bolt lights are already disabled!"
+				if(11)
+					// Emergency access
+					if (src.emergency)
+						emergency = 0
+					else
+						usr << text("Emergency access is already disabled!")
+
 
 		else if(href_list["aiEnable"])
 			var/code = text2num(href_list["aiEnable"])
@@ -917,6 +931,13 @@ About the new airlock wires panel:
 						usr << "The door bolt lights have been enabled"
 					else
 						usr << "The door bolt lights are already enabled!"
+				if(11)
+					// Emergency access
+					if (!src.emergency)
+						emergency = 1
+					else
+						usr << text("Emergency access is already enabled!")
+
 
 	add_fingerprint(usr)
 	update_icon()
@@ -1209,3 +1230,8 @@ About the new airlock wires panel:
 			return
 		else
 			return
+			
+
+/obj/machinery/door/airlock/CanAStarPass(var/obj/item/weapon/card/id/ID)
+//Airlock is passable if it is open (!density), bot has access, and is not bolted shut)
+	return !density || (check_access(ID) && !locked)

code/game/machinery/doors/door.dm

@@ -18,6 +18,7 @@
 	var/glass = 0
 	var/normalspeed = 1
 	var/heat_proof = 0 // For glass airlocks/opacity firedoors
+	var/emergency = 0
 	var/air_properties_vary_with_direction = 0
 
 	//Multi-tile doors
@@ -68,7 +69,7 @@
 
 	if(istype(AM, /obj/machinery/bot))
 		var/obj/machinery/bot/bot = AM
-		if(src.check_access(bot.botcard))
+		if(src.check_access(bot.botcard) || emergency == 1)
 			if(density)
 				open()
 		return
@@ -76,7 +77,7 @@
 	if(istype(AM, /obj/mecha))
 		var/obj/mecha/mecha = AM
 		if(density)
-			if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access)))
+			if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access) || emergency == 1))
 				open()
 			else
 				flick("door_deny", src)
@@ -101,7 +102,7 @@
 
 //used in the AStar algorithm to determinate if the turf the door is on is passable
 /obj/machinery/door/proc/CanAStarPass(var/obj/item/weapon/card/id/ID)
-	return !density || check_access(ID)
+	return !density
 
 /obj/machinery/door/proc/bumpopen(mob/user as mob)
 	if(operating)	return
@@ -113,8 +114,10 @@
 		user = null
 
 	if(density)
-		if(allowed(user))	open()
-		else				flick("door_deny", src)
+		if(allowed(user) || src.emergency == 1)	
+			open()
+		else				
+			flick("door_deny", src)
 	return
 
 /obj/machinery/door/meteorhit(obj/M as obj)
@@ -153,7 +156,7 @@
 		open()
 		operating = -1
 		return 1
-	if(src.allowed(user))
+	if(src.allowed(user) || src.emergency == 1)
 		if(src.density)
 			open()
 		else

code/game/machinery/doors/firedoor.dm

@@ -468,7 +468,3 @@
 /obj/machinery/door/firedoor/multi_tile/triple
 	icon = 'icons/obj/doors/DoorHazard3x1.dmi'
 	width = 3
-
-//used in the AStar algorithm to determinate if the turf the door is on is passable
-/obj/machinery/door/firedoor/CanAStarPass()
-	return !density

code/game/machinery/kitchen/processor.dm

@@ -56,8 +56,20 @@
 
 
 		slime
+			process(loc, what)
+				var/mob/living/carbon/slime/S = what
+				var/C = S.cores
+				if(S.stat != DEAD)
+					S.loc = loc
+					S.visible_message("<span class='notice'>[C] crawls free of the processor!</span>")
+					return
+				for(var/i = 1, i <= C, i++)
+					new S.coretype(loc)
+					feedback_add_details("slime_core_harvested","[replacetext(S.colour," ","_")]")
+				..()
+
 			input = /mob/living/carbon/slime
-			output = /obj/item/weapon/reagent_containers/glass/beaker/slime
+			output = null
 
 		monkey
 			process(loc, what)

code/game/machinery/turrets.dm

@@ -190,13 +190,13 @@
 						targeting_active = 1
 						target()
 						targeting_active = 0
-					
+
 		if(prob(15))
 			if(prob(50))
 				playsound(get_turf(src), 'sound/effects/turret/move1.wav', 60, 1)
 			else
 				playsound(get_turf(src), 'sound/effects/turret/move2.wav', 60, 1)
-				
+
 	else if(!isPopping())//else, pop down
 		if(!isDown())
 			popDown()
@@ -487,14 +487,15 @@
 
 /obj/machinery/gun_turret //related to turrets but work way differentely because of being mounted on a moving ship.
 	name = "machine gun turret"
-	desc = "Syndicate defense turret. It really packs a bunch."
+	desc = "Syndicate heavy defense turret. It really packs a bunch."
 	density = 1
 	anchored = 1
 	var/state = 0 //Like stat on mobs, 0 is alive, 1 is damaged, 2 is dead
-	var/list/faction = list("syndicate")
+	var/faction = "syndicate"
 	var/atom/cur_target = null
 	var/scan_range = 9 //You will never see them coming
 	var/health = 200 //Because it lacks a cover, and is mostly to keep people from touching the syndie shuttle.
+	var/bullet_type = /obj/item/projectile/bullet
 	icon = 'icons/obj/turrets.dmi'
 	icon_state = "syndieturret0"
 
@@ -622,11 +623,27 @@
 		return
 	if (targloc == curloc)
 		return
-	playsound(get_turf(src), 'sound/weapons/Gunshot.ogg', 60, 1)
-	var/obj/item/projectile/A = new /obj/item/projectile/bullet(curloc)
+	playsound(get_turf(src), 'sound/weapons/Gunshot3.ogg', 60, 1)
+	var/obj/item/projectile/A = new bullet_type(curloc)
 	A.current = curloc
 	A.yo = targloc.y - curloc.y
 	A.xo = targloc.x - curloc.x
 	spawn(0)
 		A.process()
 	return
+
+
+/obj/machinery/gun_turret/interior
+	name = "machine gun turret (.45)"
+	desc = "Syndicate interior defense turret chambered for .45 rounds. Designed to down intruders without damaging the hull."
+	bullet_type = /obj/item/projectile/bullet/midbullet
+
+/obj/machinery/gun_turret/exterior
+	name = "machine gun turret (7.62)"
+	desc = "Syndicate exterior defense turret chambered for 7.62 rounds. Designed to down intruders with heavy calliber bullets."
+	bullet_type = /obj/item/projectile/bullet
+
+/obj/machinery/gun_turret/grenade
+	name = "mounted grenade launcher (40mm)"
+	desc = "Syndicate 40mm grenade launcher defense turret. If you've had this much time to look at it, you're probably already dead."
+	bullet_type = /obj/item/projectile/bullet/a40mm

code/game/machinery/washing_machine.dm

@@ -263,6 +263,9 @@
 		if ( istype(W,/obj/item/clothing/head/helmet ) )
 			user << "This item does not fit."
 			return
+		if ( istype(W,/obj/item/clothing/gloves/furgloves ) )
+			user << "This item does not fit."
+			return			
 
 		if(contents.len < 5)
 			if ( state in list(1, 3) )

code/game/objects/items/weapons/RCD.dm

@@ -6,7 +6,7 @@ RCD
 */
 /obj/item/weapon/rcd
 	name = "rapid-construction-device (RCD)"
-	desc = "A device used to rapidly build walls/floor."
+	desc = "A device used to rapidly build and deconstruct walls and floors."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "rcd"
 	opacity = 0
@@ -18,7 +18,7 @@ RCD
 	throw_speed = 3
 	throw_range = 5
 	w_class = 3.0
-	m_amt = 30000
+	m_amt = 100000
 	origin_tech = "engineering=4;materials=2"
 	var/datum/effect/effect/system/spark_spread/spark_system
 	var/matter = 0
@@ -29,7 +29,7 @@ RCD
 
 
 	New()
-		desc = "A RCD. It currently holds [matter]/30 matter-units."
+		desc = "A RCD. It currently holds [matter]/100 matter-units."
 		src.spark_system = new /datum/effect/effect/system/spark_spread
 		spark_system.set_up(5, 0, src)
 		spark_system.attach(src)
@@ -39,15 +39,15 @@ RCD
 	attackby(obj/item/weapon/W, mob/user)
 		..()
 		if(istype(W, /obj/item/weapon/rcd_ammo))
-			if((matter + 10) > 30)
+			if((matter + 20) > 100)
 				user << "<span class='notice'>The RCD cant hold any more matter-units.</span>"
 				return
 			user.drop_item()
 			del(W)
-			matter += 10
+			matter += 20
 			playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
-			user << "<span class='notice'>The RCD now holds [matter]/30 matter-units.</span>"
-			desc = "A RCD. It currently holds [matter]/30 matter-units."
+			user << "<span class='notice'>The RCD now holds [matter]/100 matter-units.</span>"
+			desc = "A RCD. It currently holds [matter]/100 matter-units."
 			return
 
 
@@ -148,11 +148,11 @@ RCD
 					return 0
 
 				if(istype(A, /obj/machinery/door/airlock))
-					if(checkResource(10, user))
+					if(checkResource(20, user))
 						user << "Deconstructing Airlock..."
 						playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
 						if(do_after(user, 50))
-							if(!useResource(10, user)) return 0
+							if(!useResource(20, user)) return 0
 							activate()
 							del(A)
 							return 1
@@ -166,7 +166,7 @@ RCD
 	if(matter < amount)
 		return 0
 	matter -= amount
-	desc = "A RCD. It currently holds [matter]/30 matter-units."
+	desc = "A RCD. It currently holds [matter]/100 matter-units."
 	return 1
 
 /obj/item/weapon/rcd/proc/checkResource(var/amount, var/mob/user)
@@ -174,17 +174,17 @@ RCD
 /obj/item/weapon/rcd/borg/useResource(var/amount, var/mob/user)
 	if(!isrobot(user))
 		return 0
-	return user:cell:use(amount * 30)
+	return user:cell:use(amount * 160)
 
 /obj/item/weapon/rcd/borg/checkResource(var/amount, var/mob/user)
 	if(!isrobot(user))
 		return 0
-	return user:cell:charge >= (amount * 30)
+	return user:cell:charge >= (amount * 160)
 
 /obj/item/weapon/rcd/borg/New()
 	..()
-	desc = "A device used to rapidly build walls/floor."
-	canRwall = 0
+	desc = "A device used to rapidly build and deconstruct walls and floors."
+	canRwall = 1
 
 /obj/item/weapon/rcd_ammo
 	name = "compressed matter cartridge"

code/game/objects/items/weapons/melee/energy.dm

@@ -50,8 +50,8 @@
 	edge = 1
 
 /obj/item/weapon/melee/energy/sword/cyborg
-	var/hitcost = 500	
-	
+	var/hitcost = 500
+
 /obj/item/weapon/melee/energy/sword/cyborg/attack(mob/M, var/mob/living/silicon/robot/R)
 	if(R.cell)
 		var/obj/item/weapon/cell/C = R.cell
@@ -62,7 +62,7 @@
 		//C.use(hitcost)
 		..()
 	return
-	
+
 /obj/item/weapon/melee/energy/sword/pirate
 	name = "energy cutlass"
 	desc = "Arrrr matey."
@@ -72,7 +72,7 @@
 	name = "energy blade"
 	desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal."
 	icon_state = "blade"
-	force = 70.0//Normal attacks deal very high damage.
+	force = 30.0 //Normal attacks deal esword damage
 	sharp = 1
 	edge = 1
 	throwforce = 1//Throwing or dropping the item deletes it.

code/game/objects/items/weapons/storage/firstaid.dm

@@ -12,6 +12,7 @@
 	name = "first-aid kit"
 	desc = "It's an emergency medical kit for those serious boo-boos."
 	icon_state = "firstaid"
+	icon_override = 'icons/mob/in-hand/medkits.dmi'	
 	throw_speed = 2
 	throw_range = 8
 	var/empty = 0

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -33,22 +33,24 @@
 	active = !active
 	if (active)
 		force = 30
+		throwforce = 20
 		if(istype(src,/obj/item/weapon/melee/energy/sword/pirate))
 			icon_state = "cutlass1"
 		else
 			icon_state = "sword[blade_color]"
 		w_class = 4
-		playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
+		playsound(user, 'sound/weapons/saberon.ogg', 35, 1)
 		hitsound = 'sound/weapons/blade1.ogg'
 		user << "\blue [src] is now active."
 	else
 		force = 3
+		throwforce = 5.0
 		if(istype(src,/obj/item/weapon/melee/energy/sword/pirate))
 			icon_state = "cutlass0"
 		else
 			icon_state = "sword0"
 		w_class = 2
-		playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
+		playsound(user, 'sound/weapons/saberoff.ogg', 35, 1)
 		hitsound = "swing_hit"
 		user << "\blue [src] can now be concealed."
 	if(istype(user,/mob/living/carbon/human))

code/game/objects/items/weapons/tools.dm

@@ -443,8 +443,8 @@
  */
 
 /obj/item/weapon/crowbar
-	name = "crowbar"
-	desc = "Used to hit floors"
+	name = "pocket crowbar"
+	desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "crowbar"
 	flags = FPRINT | TABLEPASS| CONDUCT
@@ -462,6 +462,16 @@
 	icon_state = "red_crowbar"
 	item_state = "crowbar_red"
 
+/obj/item/weapon/crowbar/large
+	name = "crowbar"
+	desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big."
+	force = 12
+	w_class = 3
+	throw_speed = 3
+	throw_range = 3
+	m_amt = 66
+	icon_state = "crowbar_large"
+
 /obj/item/weapon/weldingtool/attack(mob/M as mob, mob/user as mob)
 	if(hasorgans(M))
 

code/game/objects/items/weapons/twohanded.dm

@@ -158,12 +158,13 @@ obj/item/weapon/twohanded/
 	name = "fire axe"
 	desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
 	force = 5
+	throwforce = 15
 	sharp = 1
 	edge = 1
 	w_class = 4.0
 	slot_flags = SLOT_BACK
-	force_unwielded = 10
-	force_wielded = 40
+	force_unwielded = 5
+	force_wielded = 24
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 
@@ -203,7 +204,7 @@ obj/item/weapon/twohanded/
 	throw_range = 5
 	w_class = 2.0
 	force_unwielded = 3
-	force_wielded = 30
+	force_wielded = 34
 	wieldsound = 'sound/weapons/saberon.ogg'
 	unwieldsound = 'sound/weapons/saberoff.ogg'
 	flags = FPRINT | TABLEPASS | NOSHIELD
@@ -287,8 +288,9 @@ obj/item/weapon/twohanded/
 	w_class = 4.0
 	slot_flags = SLOT_BACK
 	force_unwielded = 10
-	force_wielded = 13
-	throwforce = 15
+	force_wielded = 18 // Was 13, Buffed - RR
+	throwforce = 20
+	throw_speed = 3
 	flags = FPRINT | TABLEPASS | NOSHIELD
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
 

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -23,7 +23,7 @@
 		new /obj/item/blueprints(src)
 		new /obj/item/clothing/under/rank/chief_engineer(src)
 		new /obj/item/clothing/head/hardhat/white(src)
-		new /obj/item/clothing/head/welding(src)
+		new /obj/item/clothing/glasses/welding/superior(src)
 		new /obj/item/clothing/gloves/yellow(src)
 		new /obj/item/clothing/shoes/brown(src)
 		new /obj/item/weapon/cartridge/ce(src)

code/game/objects/structures/window.dm

@@ -18,7 +18,7 @@ var/global/wcColored
 		wcColored = 1
 
 	var/list/wcBarAreas = list(/area/crew_quarters/bar)
-	var/list/wcBrigAreas = list(/area/security,/area/security/main,/area/security/lobby,/area/security/brig,/area/security/permabrig,/area/security/prison,/area/security/prison/cell_block/A,/area/security/prison/cell_block/B,/area/security/prison/cell_block/C,/area/security/execution,/area/security/processing,/area/security/interrogation,/area/security/interrogationobs,/area/security/evidence,/area/security/prisonlockers,/area/security/medbay,/area/security/processing,/area/security/warden,/area/security/armoury,/area/security/securearmoury,/area/security/armoury/gamma,/area/security/securehallway,/area/security/hos,/area/security/podbay,/area/security/detectives_office,/area/security/range,/area/security/nuke_storage,/area/security/checkpoint,/area/security/checkpoint2,/area/security/checkpoint2,/area/security/checkpoint/supply,/area/security/checkpoint/engineering,/area/security/checkpoint/medical,/area/security/checkpoint/science,/area/security/vacantoffice,/area/security/vacantoffice2,/area/prison,/area/prison/arrival_airlock,/area/prison/control,/area/prison/crew_quarters,/area/prison/rec_room,/area/prison/closet,/area/prison/hallway/fore,/area/prison/hallway/aft,/area/prison/hallway/port,/area/prison/hallway/starboard,/area/prison/morgue,/area/prison/medical_research,/area/prison/medical,/area/prison/solar,/area/prison/podbay,/area/prison/solar_control,/area/prison/solitary,/area/prison/cell_block,/area/prison/cell_block/A,/area/prison/cell_block/B,/area/prison/cell_block/C,/area/shuttle/gamma/space,/area/shuttle/gamma/station)
+	var/list/wcBrigAreas = list(/area/security,/area/security/main,/area/security/lobby,/area/security/brig,/area/security/permabrig,/area/security/prison,/area/security/prison/cell_block/A,/area/security/prison/cell_block/B,/area/security/prison/cell_block/C,/area/security/execution,/area/security/processing,/area/security/interrogation,/area/security/interrogationobs,/area/security/evidence,/area/security/prisonlockers,/area/security/medbay,/area/security/processing,/area/security/warden,/area/security/armoury,/area/security/securearmoury,/area/security/armoury/gamma,/area/security/securehallway,/area/security/hos,/area/security/podbay,/area/security/detectives_office,/area/security/range,/area/security/nuke_storage,/area/security/customs,/area/security/customs2,/area/security/checkpoint,/area/security/checkpoint2,/area/security/checkpoint2,/area/security/checkpoint/supply,/area/security/checkpoint/engineering,/area/security/checkpoint/medical,/area/security/checkpoint/science,/area/security/vacantoffice,/area/security/vacantoffice2,/area/prison,/area/prison/arrival_airlock,/area/prison/control,/area/prison/crew_quarters,/area/prison/rec_room,/area/prison/closet,/area/prison/hallway/fore,/area/prison/hallway/aft,/area/prison/hallway/port,/area/prison/hallway/starboard,/area/prison/morgue,/area/prison/medical_research,/area/prison/medical,/area/prison/solar,/area/prison/podbay,/area/prison/solar_control,/area/prison/solitary,/area/prison/cell_block,/area/prison/cell_block/A,/area/prison/cell_block/B,/area/prison/cell_block/C,/area/shuttle/gamma/space,/area/shuttle/gamma/station)
 
 	var/newcolor
 	for(var/A in wcBarAreas)

code/game/turfs/simulated/floor_types.dm

@@ -226,17 +226,17 @@
 	name = "snow"
 	icon = 'icons/turf/snow.dmi'
 	icon_state = "snow"
-
-/turf/simulated/floor/plating/snow/concrete
-	name = "concrete"
-	icon = 'icons/turf/floors.dmi'
-	icon_state = "concrete"
-
-
-
+	
 /turf/simulated/floor/plating/snow/ex_act(severity)
 	return
+	
+/turf/simulated/floor/snow
+	name = "snow"
+	icon = 'icons/turf/snow.dmi'
+	icon_state = "snow"
 
+/turf/simulated/floor/snow/ex_act(severity)
+	return
 
 /turf/simulated/shuttle/plating/vox
 	oxygen=0 // BIRDS HATE OXYGEN FOR SOME REASON

code/game/turfs/unsimulated.dm

@@ -15,7 +15,6 @@
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "concrete"
 
-
 /turf/unsimulated/floor/plating/snow/ex_act(severity)
 	return
 

code/game/vehicles/spacepods/spacepod.dm

@@ -397,6 +397,10 @@
 		else
 			usr << "\red <B>The [src.name]'s doors are locked.</B>"
 			return
+
+	if(src.occupant2)
+		usr << "\red <B>The spacepod is full! Are you going to sit on [src.occupant2.name]'s lap?</b>"
+		return
 /*
 	if (usr.abiotic())
 		usr << "\blue <B>Subject cannot have abiotic items on.</B>"

code/modules/clothing/head/jobs.dm

@@ -117,5 +117,5 @@
 	icon_state = "surgcap_green"
 
 /obj/item/clothing/head/surgery/black
-	desc = "A cap morticians wear during autopsies. Keeps their hair from falling into the cadavers.  It is as dark than the mortician's humor."
+	desc = "A cap coroners wear during autopsies. Keeps their hair from falling into the cadavers.  It is as dark than the coroner's humor."
 	icon_state = "surgcap_black"

code/modules/clothing/suits/labcoat.dm

@@ -5,7 +5,7 @@
 	item_state = "labcoat"
 	blood_overlay_type = "coat"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-	allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen)
+	allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
 	species_fit = list("Vox")
 	sprite_sheets = list(
@@ -132,7 +132,7 @@
 		)
 		
 /obj/item/clothing/suit/storage/labcoat/mortician
-	name = "Mortician Labcoat"
+	name = "Coroner Labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a black stripe on the shoulder."
 	icon_state = "labcoat_mort_open"
 	species_fit = list("Vox")

code/modules/clothing/under/jobs/medsci.dm

@@ -177,7 +177,7 @@
 		)
 
 /obj/item/clothing/under/rank/medical/mortician
-	name = "mortician's scrubs"
+	name = "coroner's scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is as dark as an emo's poetry."
 	icon_state = "scrubsblack"
 	_color = "scrubsblack"

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

@@ -208,6 +208,41 @@
 		see_invisible = 45
 		nightvision = 0
 		usr.hud_used.nightvisionicon.icon_state = "nightvision0"
+		
+
+/mob/living/carbon/alien/assess_threat(var/obj/machinery/bot/secbot/judgebot, var/lasercolor)
+	if(judgebot.emagged == 2)
+		return 10 //Everyone is a criminal!
+	var/threatcount = 0
+
+	//Securitrons can't identify aliens
+	if(!lasercolor && judgebot.idcheck)
+		threatcount += 4
+
+	//Lasertag bullshit
+	if(lasercolor)
+		if(lasercolor == "b")//Lasertag turrets target the opposing team, how great is that? -Sieve
+			if((istype(r_hand,/obj/item/weapon/gun/energy/laser/redtag)) || (istype(l_hand,/obj/item/weapon/gun/energy/laser/redtag)))
+				threatcount += 4
+
+		if(lasercolor == "r")
+			if((istype(r_hand,/obj/item/weapon/gun/energy/laser/bluetag)) || (istype(l_hand,/obj/item/weapon/gun/energy/laser/bluetag)))
+				threatcount += 4
+
+		return threatcount
+
+	//Check for weapons
+	if(judgebot.weaponscheck)
+		if(judgebot.check_for_weapons(l_hand))
+			threatcount += 4
+		if(judgebot.check_for_weapons(r_hand))
+			threatcount += 4
+
+	//Loyalty implants imply trustworthyness
+	if(isloyal(src))
+		threatcount -= 1
+
+	return threatcount
 
 /*----------------------------------------
 Proc: AddInfectionImages()

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

@@ -861,6 +861,9 @@
 								if(istype(usr,/mob/living/silicon/robot))
 									var/mob/living/silicon/robot/U = usr
 									R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]<BR>[t1]")
+								if(istype(usr,/mob/living/silicon/ai))
+									var/mob/living/silicon/ai/U = usr
+									R.fields[text("com_[counter]")] = text("Made by [U.name] (artificial intelligence) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]<BR>[t1]")
 
 	if (href_list["medical"])
 		if(hasHUD(usr,"medical"))

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

@@ -139,13 +139,16 @@
 			playsound(loc, attack.attack_sound, 25, 1, -1)
 
 			visible_message("\red <B>[M] [pick(attack.attack_verb)]ed [src]!</B>")
-			//Rearranged, so claws don't increase weaken chance.
-			if(damage >= 5 && prob(50))
-				visible_message("\red <B>[M] has weakened [src]!</B>")
-				apply_effect(2, WEAKEN, armor_block)
 
 			damage += attack.damage
-			apply_damage(damage, BRUTE, affecting, armor_block, sharp=attack.sharp, edge=attack.edge)
+			apply_damage(damage, BRUTE, affecting, armor_block, sharp=attack.sharp, edge=attack.edge) //moving this back here means Armalis are going to knock you down  70% of the time, but they're pure adminbus anyway.
+			if((stat != DEAD) && damage >= 9)
+				visible_message("<span class='danger'>[M] has weakened [src]!</span>", \
+								"<span class='userdanger'>[M] has weakened [src]!</span>")
+				apply_effect(4, WEAKEN, armor_block)
+				forcesay(hit_appends)
+			else if(lying)
+				forcesay(hit_appends)
 
 
 		if("disarm")

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

@@ -20,7 +20,6 @@
 				dead_mob_list -= src
 				respawnable_list -= src
 				living_mob_list += src
-				mob_list += src
 				stat = CONSCIOUS
 				ear_deaf = 0
 	return

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

@@ -42,7 +42,7 @@
 	var/burn_mod = null     // Burn damage reduction/malus.
 
 	// For grays
-	var/max_hurt_damage = 5 // Max melee damage dealt + 5 if hulk
+	var/max_hurt_damage = 9 // Max melee damage dealt + 5 if hulk
 	var/list/default_mutations = list()
 	var/list/default_blocks = list() // Don't touch.
 	var/list/default_block_names = list() // Use this instead, using the names from setupgame.dm
@@ -636,16 +636,14 @@
 
 /datum/unarmed_attack/diona
 	attack_verb = list("lash", "bludgeon")
-	damage = 5
 
 /datum/unarmed_attack/claws
 	attack_verb = list("scratch", "claw")
 	attack_sound = 'sound/weapons/slice.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'
-	damage = 5
 	sharp = 1
 	edge = 1
 
 /datum/unarmed_attack/claws/armalis
 	attack_verb = list("slash", "claw")
-	damage = 10	//they're huge! they should do a little more damage, i'd even go for 15-20 maybe...
+	damage = 6	//they're huge! they should do a little more damage, i'd even go for 15-20 maybe...

code/modules/mob/living/living.dm

@@ -322,6 +322,7 @@
 	on_fire = 0
 	suiciding = 0
 	buckled = initial(src.buckled)
+	
 	if(iscarbon(src))
 		var/mob/living/carbon/C = src
 		C.handcuffed = initial(C.handcuffed)
@@ -335,6 +336,9 @@
 	if(stat == 2)
 		dead_mob_list -= src
 		living_mob_list += src
+		tod = null
+		timeofdeath = 0
+
 	stat = CONSCIOUS
 	update_fire()
 	regenerate_icons()

code/modules/mob/living/say.dm

@@ -187,6 +187,7 @@ var/list/department_radio_keys = list(
 
 	if(traumatic_shock > 61 && prob(50))
 		message_mode = null //people in shock will have a high chance of not being able to speak on radio; needed since people don't instantly pass out at 100 damage.
+		src << "<span class='warning'>You try to use your radio, but you are in too much pain.</span>"
 
 	message = capitalize(message)
 

code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -257,6 +257,8 @@
 			stored_comms["glass"]++
 			stored_comms["glass"]++
 			stored_comms["glass"]++
+		else if (istype(W,/obj/item/weapon/light/tube) || istype(W,/obj/item/weapon/light/bulb))
+			stored_comms["glass"]++
 		else
 			continue
 

code/modules/organs/organ_external.dm

@@ -84,9 +84,9 @@
 
 		if(istype(owner,/mob/living/carbon/human))
 			var/mob/living/carbon/human/H = owner
-			if(H.species && H.species.flags & IS_SYNTHETIC)
-				brmod = H.species.brute_mod
-				bumod = H.species.burn_mod
+			if(H.species && H.species.flags & IS_SYNTHETIC) // No need for this - the modifer is being applied in the species' code already. Leaving it in, in case it ever changes.
+				brmod = 1 //H.species.brute_mod
+				bumod = 1 //H.species.burn_mod
 
 		brute *= brmod //~2/3 damage for ROBOLIMBS
 		burn *= bumod //~2/3 damage for ROBOLIMBS
@@ -137,9 +137,8 @@
 				burn = max(0, burn - can_inflict)
 		//If there are still hurties to dispense
 		if (burn || brute)
-			if (status & ORGAN_ROBOT)
-				if(body_part != UPPER_TORSO && body_part != LOWER_TORSO)          // as below, getting hit on the chest shouldn't gib you even if you've got a robotic chest
-					droplimb(1) //Robot limbs just kinda fail at full damage.
+			if (status & ORGAN_ROBOT && body_part != UPPER_TORSO && body_part != LOWER_TORSO)
+				droplimb(1) //Robot limbs just kinda fail at full damage.
 			else
 				//List organs we can pass it to
 				var/list/datum/organ/external/possible_points = list()

code/modules/projectiles/guns/magic/wand.dm

@@ -131,6 +131,6 @@
 
 /obj/item/weapon/gun/magic/wand/fireball/zap_self(mob/living/user as mob)
 	if(alert(user, "Zapping yourself with a wand of fireball is probably a bad idea, do it anyway?",, "Yes", "No") == "Yes" && charges && user.get_active_hand() == src && isliving(user))
-		explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
+		explosion(user.loc, -1, 0, 2, 3, 0)
 		charges--
 		..()

code/modules/projectiles/projectile/magic.dm

@@ -24,7 +24,7 @@
 
 /obj/item/projectile/magic/fireball/on_hit(var/target)
 	var/turf/T = get_turf(target)
-	explosion(T, -1, 0, 2, 3, 0, flame_range = 2)
+	explosion(T, -1, 0, 2, 3, 0)
 
 /obj/item/projectile/magic/resurrection
 	name = "bolt of resurrection"

code/modules/security levels/keycard authentication.dm

@@ -160,16 +160,19 @@
 var/global/maint_all_access = 0
 
 /proc/make_maint_all_access()
-	maint_all_access = 1
+	for(var/area/maintenance/A in world)
+		for(var/obj/machinery/door/airlock/D in A)
+			D.emergency = 1
+			D.update_icon(0)
 	world << "<font size=4 color='red'>Attention!</font>"
 	world << "<font color='red'>The maintenance access requirement has been revoked on all airlocks.</font>"
-
+	maint_all_access = 1
+	
 /proc/revoke_maint_all_access()
-	maint_all_access = 0
+	for(var/area/maintenance/A in world)
+		for(var/obj/machinery/door/airlock/D in A)
+			D.emergency = 0
+			D.update_icon(0)
 	world << "<font size=4 color='red'>Attention!</font>"
 	world << "<font color='red'>The maintenance access requirement has been readded on all maintenance airlocks.</font>"
-
-/obj/machinery/door/airlock/allowed(mob/M)
-	if(maint_all_access && src.check_access_list(list(access_maint_tunnels)))
-		return 1
-	return ..(M)
+	maint_all_access = 0

code/modules/telesci/telesci_computer.dm

@@ -297,6 +297,21 @@
 			telefail()
 			temp_msg = "ERROR! Sector is less than 1, <BR>greater than [src.emagged ? "7" : "6"], or equal to 2."
 			return
+
+
+	var/truePower = Clamp(power + power_off, 1, 1000)
+	var/trueRotation = rotation + rotation_off
+	var/trueAngle = Clamp(angle, 1, 90)
+
+	var/datum/projectile_data/proj_data = projectile_trajectory(telepad.x, telepad.y, trueRotation, trueAngle, truePower)
+	var/turf/target = locate(Clamp(round(proj_data.dest_x, 1), 1, world.maxx), Clamp(round(proj_data.dest_y, 1), 1, world.maxy), z_co)
+	var/area/A = get_area(target)
+
+	if(A.tele_proof == 1)
+		telefail()
+		temp_msg = "ERROR! Target destination unreachable due to interference."
+		return
+
 	if(teles_left > 0)
 		doteleport(user)
 	else

data/mode.txt

@@ -1 +1 @@
-secret
+extended