Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

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

@@ -165,10 +165,12 @@
 			P.loc = usr
 			usr.r_hand = P
 			P.layer = 20
+			P.plane = HUD_PLANE
 		else if(!usr.l_hand)
 			P.loc = usr
 			usr.l_hand = P
 			P.layer = 20
+			P.plane = HUD_PLANE
 
 	if(istype(usr,/mob/living/carbon/human))
 		usr:update_inv_l_hand()

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

@@ -27,35 +27,34 @@ effective or pretty fucking useless.
 	origin_tech = "magnets=3;combat=3;syndicate=3"
 
 	var/times_used = 0 //Number of times it's been used.
-	var/max_uses = 2
+	var/max_uses = 5
 
-
-/obj/item/device/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0)
-	if(!user) 	return
+/obj/item/device/batterer/examine(mob/user)
+	..(user)
 	if(times_used >= max_uses)
-		to_chat(user, "\red The mind batterer has been burnt out!")
+		to_chat(user, "<span class='notice'>[src] is out of charge.</span>")
+	if(times_used < max_uses)
+		to_chat(user, "<span class='notice'>[src] has [max_uses-times_used] charges left.</span>")
+
+/obj/item/device/batterer/attack_self(mob/living/carbon/user, flag = 0, emp = 0)
+	if(!user)
+		return
+	if(times_used >= max_uses)
+		to_chat(user, "<span class='danger'>The mind batterer has been burnt out!</span>")
 		return
 
-	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used [src] to knock down people in the area.</font>")
 
-	for(var/mob/living/carbon/human/M in orange(10, user))
-		spawn()
-			if(prob(50))
+	for(var/mob/living/carbon/human/M in oview(7, user))
+		if(prob(50))
+			M.Weaken(rand(4,7))
+			add_logs(M, user, "stunned", src)
+			to_chat(M, "<span class='danger'>You feel a tremendous, paralyzing wave flood your mind.</span>")
+		else
+			to_chat(M, "<span class='danger'>You feel a sudden, electric jolt travel through your head.</span>")
 
-				M.Weaken(rand(10,20))
-				if(prob(25))
-					M.Stun(rand(5,10))
-				to_chat(M, "\red <b>You feel a tremendous, paralyzing wave flood your mind.</b>")
-				if(!iscarbon(user))
-					M.LAssailant = null
-				else
-					M.LAssailant = user
-			else
-				to_chat(M, "\red <b>You feel a sudden, electric jolt travel through your head.</b>")
-
-	playsound(src.loc, 'sound/misc/interference.ogg', 50, 1)
-	to_chat(user, "\blue You trigger [src].")
-	times_used += 1
+	playsound(loc, 'sound/misc/interference.ogg', 50, 1)
+	times_used++
+	to_chat(user, "<span class='notice'>You trigger [src]. It has [max_uses-times_used] charges left.</span>")
 	if(times_used >= max_uses)
 		icon_state = "battererburnt"
 

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

@@ -9,6 +9,7 @@
 	var/mob/attacher = null
 	var/valve_open = 0
 	var/toggle = 1
+	origin_tech = "materials=1;engineering=1"
 
 /obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D)
 
@@ -187,7 +188,7 @@
 			attacher_name = "[key_name_admin(attacher)]"
 
 		var/mob/mob = get_mob_by_key(src.fingerprintslast)
-		
+
 		bombers += "Bomb valve opened at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]"
 		message_admins("Bomb valve opened at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a> with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name_admin(mob)]")
 		log_game("Bomb valve opened at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]")

code/game/objects/items/latexballoon.dm

@@ -1,38 +1,45 @@
 /obj/item/latexballon
-	name = "Latex glove"
+	name = "latex glove"
 	desc = "" //todo
 	icon_state = "latexballon"
 	item_state = "lgloves"
 	force = 0
 	throwforce = 0
-	w_class = 1.0
+	w_class = 1
 	throw_speed = 1
-	throw_range = 15
+	throw_range = 7
 	var/state
 	var/datum/gas_mixture/air_contents = null
 
-/obj/item/latexballon/proc/blow(obj/item/weapon/tank/tank)
-	if (icon_state == "latexballon_bursted")
+/obj/item/latexballon/proc/blow(obj/item/weapon/tank/tank, mob/user)
+	if(icon_state == "latexballon_bursted")
 		return
-	src.air_contents = tank.remove_air_volume(3)
 	icon_state = "latexballon_blow"
 	item_state = "latexballon"
+	user.update_inv_r_hand()
+	user.update_inv_l_hand()
+	to_chat(user, "<span class='notice'>You blow up [src] with [tank].</span>")
+	air_contents = tank.remove_air_volume(3)
 
 /obj/item/latexballon/proc/burst()
-	if (!air_contents)
+	if(!air_contents || icon_state != "latexballon_blow")
 		return
 	playsound(src, 'sound/weapons/Gunshot.ogg', 100, 1)
 	icon_state = "latexballon_bursted"
 	item_state = "lgloves"
+	if(isliving(loc))
+		var/mob/living/user = loc
+		user.update_inv_r_hand()
+		user.update_inv_l_hand()
 	loc.assume_air(air_contents)
 
 /obj/item/latexballon/ex_act(severity)
 	burst()
 	switch(severity)
-		if (1)
+		if(1)
 			qdel(src)
-		if (2)
-			if (prob(50))
+		if(2)
+			if(prob(50))
 				qdel(src)
 
 /obj/item/latexballon/bullet_act()
@@ -43,6 +50,10 @@
 		burst()
 	return
 
-/obj/item/latexballon/attackby(obj/item/W as obj, mob/user as mob, params)
-	if (can_puncture(W))
+/obj/item/latexballon/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/weapon/tank))
+		var/obj/item/weapon/tank/T = W
+		blow(T, user)
+		return
+	if(is_sharp(W) || is_hot(W) || can_puncture(W))
 		burst()

code/game/objects/items/policetape.dm

@@ -147,17 +147,14 @@ var/list/tape_roll_applications = list()
 			tape_roll_applications[F] |= direction
 		return
 
-/obj/item/tape/Bumped(M as mob)
-	if(src.allowed(M))
-		var/turf/T = get_turf(src)
-		M:loc = T
-
 /obj/item/tape/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	if(!density) return 1
 	if(air_group || (height==0)) return 1
 
 	if ((mover.pass_flags & PASSTABLE || istype(mover, /obj/effect/meteor) || mover.throwing == 1) )
 		return 1
+	else if(ismob(mover) && allowed(mover))
+		return 1
 	else
 		return 0
 

code/game/objects/items/robot/robot_upgrades.dm

@@ -125,13 +125,13 @@
 		to_chat(usr, "This robot has had its disabler removed!")
 		return 0
 
-	if(T.recharge_time <= 2)
+	if(T.charge_delay <= 2)
 		to_chat(R, "Maximum cooling achieved for this hardpoint!")
 		to_chat(usr, "There's no room for another cooling unit!")
 		return 0
 
 	else
-		T.recharge_time = max(2 , T.recharge_time - 4)
+		T.charge_delay = max(2 , T.charge_delay - 4)
 
 	return 1
 
@@ -214,4 +214,4 @@
 		return 0
 
 	R.emagged = 1
-	return 1
+	return 1

code/game/objects/items/shooting_range.dm

@@ -114,7 +114,7 @@
 			bmark.pixel_x--
 			bmark.pixel_y--
 
-			if(Proj.damage >= 20 || istype(Proj, /obj/item/projectile/practice))
+			if(Proj.damage >= 20 || istype(Proj, /obj/item/projectile/beam/practice))
 				bmark.icon_state = "scorch"
 				bmark.dir = pick(NORTH,SOUTH,EAST,WEST) // random scorch design
 
@@ -178,4 +178,4 @@
 		b2y1 = pixel_y + pick(1,1,1,1,2,2,3,3,4)
 		b2y2 = pixel_y - pick(1,1,1,1,2,2,3,3,4)
 
-		Target.bulletholes.Add(src)
+		Target.bulletholes.Add(src)

code/game/objects/items/stacks/rods.dm

@@ -80,7 +80,7 @@
 			return
 		to_chat(usr, "\blue Assembling grille...")
 
-		if (!do_after(usr, 10, target = src))
+		if (!do_after(usr, 10, target = user))
 			return
 
 		var /obj/structure/grille/F = new /obj/structure/grille/ ( usr.loc )

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -145,7 +145,6 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
-	new/datum/stack_recipe("crossbow frame", /obj/item/weapon/crossbowframe, 5, time = 25, one_per_turf = 0, on_floor = 0), \
 	new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("easel", /obj/structure/easel, 3, one_per_turf = 1, on_floor = 1), \

code/game/objects/items/stacks/stack.dm

@@ -130,7 +130,7 @@
 			return
 		if (R.time)
 			to_chat(usr, "\blue Building [R.title] ...")
-			if (!do_after(usr, R.time, target = src))
+			if (!do_after(usr, R.time, target = usr))
 				return
 		if (src.amount < R.req_amount*multiplier)
 			return
@@ -194,20 +194,24 @@
 /obj/item/stack/proc/get_max_amount()
 	return max_amount
 
+/obj/item/stack/proc/split(mob/user, amt)
+	var/obj/item/stack/F = new type(user, amt)
+	F.copy_evidences(src)
+	if(isliving(user))
+		add_fingerprint(user)
+		F.add_fingerprint(user)
+	use(amt)
+	return F
+
 /obj/item/stack/attack_hand(mob/user as mob)
 	if (user.get_inactive_hand() == src)
-		var/obj/item/stack/F = new src.type( user, 1)
-		F.copy_evidences(src)
+		var/obj/item/stack/F = split(user, 1)
 		user.put_in_hands(F)
-		src.add_fingerprint(user)
-		F.add_fingerprint(user)
-		use(1)
-		if (src && usr.machine==src)
-			spawn(0) src.interact(usr)
+		if(src && usr.machine == src)
+			spawn(0)
+				interact(usr)
 	else
 		..()
-	update_icon()
-	return
 
 /obj/item/stack/attackby(obj/item/W as obj, mob/user as mob, params)
 	..()

code/game/objects/items/toys.dm

@@ -1318,7 +1318,7 @@ obj/item/toy/cards/deck/syndicate/black
 /obj/item/toy/russian_revolver
 	name = "russian revolver"
 	desc = "for fun and games!"
-	icon = 'icons/obj/gun.dmi'
+	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "detective_gold"
 	item_state = "gun"
 	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'

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

@@ -41,12 +41,11 @@
 	icon = 'icons/obj/chronos.dmi'
 	icon_state = "chronogun"
 	item_state = "chronogun"
-	w_class = 3.0
-	projectile_type = "/obj/item/projectile/energy/chrono_beam"
-	fire_sound = 'sound/weapons/Laser.ogg'
-	charge_cost = 0
-	fire_delay = 50
+	w_class = 3
 	flags = NODROP
+	ammo_type = list(/obj/item/ammo_casing/energy/chrono_beam)
+	can_charge = 0
+	fire_delay = 50
 	var/obj/item/weapon/chrono_eraser/TED = null
 	var/obj/effect/chrono_field/field = null
 	var/turf/startpos = null
@@ -60,12 +59,13 @@
 		qdel(src)
 
 /obj/item/weapon/gun/energy/chrono_gun/dropped()
+	..()
 	qdel(src)
 
 /obj/item/weapon/gun/energy/chrono_gun/update_icon()
 	return
 
-/obj/item/weapon/gun/energy/chrono_gun/Fire()
+/obj/item/weapon/gun/energy/chrono_gun/process_fire()
 	if(field)
 		field_disconnect(field)
 	..()
@@ -125,18 +125,23 @@
 	nodamage = 1
 	var/obj/item/weapon/gun/energy/chrono_gun/gun = null
 
-/obj/item/projectile/energy/chrono_beam/process()
+/obj/item/projectile/energy/chrono_beam/fire()
 	gun = firer.get_active_hand()
 	if(istype(gun))
 		return ..()
 	else
 		return 0
 
-/obj/item/projectile/energy/chrono_beam/on_hit(var/atom/target)
+/obj/item/projectile/energy/chrono_beam/on_hit(atom/target)
 	if(target && gun && isliving(target))
 		var/obj/effect/chrono_field/F = new(target.loc, target, gun)
 		gun.field_connect(F)
 
+/obj/item/ammo_casing/energy/chrono_beam
+	name = "eradication beam"
+	projectile_type = /obj/item/projectile/energy/chrono_beam
+	icon_state = "chronobolt"
+	e_cost = 0
 
 /obj/effect/chrono_field
 	name = "eradication field"
@@ -256,4 +261,4 @@
 
 
 #undef CHRONO_BEAM_RANGE
-#undef CHRONO_FRAME_COUNT
+#undef CHRONO_FRAME_COUNT

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

@@ -331,6 +331,8 @@
 			H.updatehealth() //forces health update before next life tick
 			playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
 			H.emote("gasp")
+			if(!H.heart_attack && (prob(10) || defib.combat)) // Your heart explodes.
+				H.heart_attack = 1
 			add_logs(M, user, "stunned", object="defibrillator")
 			defib.deductcharge(revivecost)
 			cooldown = 1
@@ -354,8 +356,8 @@
 					qdel(ghost)
 					ghost = null
 				var/tplus = world.time - H.timeofdeath
-				var/tlimit = 6000 //past this much time the patient is unrecoverable (in deciseconds)
-				var/tloss = 3000 //brain damage starts setting in on the patient after some time left rotting
+				var/tlimit = 1800 //past this much time the patient is unrecoverable (in deciseconds)
+				var/tloss = 600 //brain damage starts setting in on the patient after some time left rotting
 				var/total_burn	= 0
 				var/total_brute	= 0
 				if(do_after(user, 20, target = M)) //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total
@@ -368,8 +370,26 @@
 								update_icon()
 								return
 					if(H.heart_attack)
-						H.heart_attack = 0
-					if(H.stat == 2)
+						if(!H.get_int_organ(/obj/item/organ/internal/heart) && !H.get_int_organ(/obj/item/organ/internal/brain/slime)) //prevents defibing someone still alive suffering from a heart attack attack if they lack a heart
+							user.visible_message("<span class='boldnotice'>[defib] buzzes: Resuscitation failed - Failed to pick up any heart electrical activity.</span>")
+							playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
+							busy = 0
+							update_icon()
+							return
+						else
+							H.heart_attack = 0
+							user.visible_message("<span class='boldnotice'>[defib] pings: Cardiac arrhythmia corrected.</span>")
+							M.visible_message("<span class='warning'>[M]'s body convulses a bit.")
+							playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
+							playsound(get_turf(src), "bodyfall", 50, 1)
+							playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0)
+							defib.deductcharge(revivecost)
+							busy = 0
+							cooldown = 1
+							update_icon()
+							defib.cooldowncheck(user)
+							return
+					if(H.stat == DEAD)
 						var/health = H.health
 						M.visible_message("<span class='warning'>[M]'s body convulses a bit.")
 						playsound(get_turf(src), "bodyfall", 50, 1)
@@ -377,7 +397,7 @@
 						for(var/obj/item/organ/external/O in H.organs)
 							total_brute	+= O.brute_dam
 							total_burn	+= O.burn_dam
-						if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations))
+						if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations) && (H.get_int_organ(/obj/item/organ/internal/heart) || H.get_int_organ(/obj/item/organ/internal/brain/slime)))
 							tobehealed = min(health + threshold, 0) // It's HILARIOUS without this min statement, let me tell you
 							tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived
 							H.adjustOxyLoss(tobehealed)
@@ -452,6 +472,8 @@
 			H.adjustStaminaLoss(50)
 			H.Weaken(5)
 			H.updatehealth() //forces health update before next life tick
+			if(!H.heart_attack && prob(10)) // Your heart explodes.
+				H.heart_attack = 1
 			playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
 			H.emote("gasp")
 			add_logs(M, user, "stunned", object="defibrillator")
@@ -481,8 +503,8 @@
 					qdel(ghost)
 					ghost = null
 				var/tplus = world.time - H.timeofdeath
-				var/tlimit = 6000 //past this much time the patient is unrecoverable (in deciseconds)
-				var/tloss = 3000 //brain damage starts setting in on the patient after some time left rotting
+				var/tlimit = 1800 //past this much time the patient is unrecoverable (in deciseconds)
+				var/tloss = 600 //brain damage starts setting in on the patient after some time left rotting
 				var/total_burn	= 0
 				var/total_brute	= 0
 				if(do_after(user, 20, target = M)) //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total

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

@@ -90,7 +90,7 @@
 	item_state = "claymore"
 	name = "holy claymore"
 	desc = "A weapon fit for a crusade!"
-	w_class = 5
+	w_class = 4
 	slot_flags = SLOT_BACK|SLOT_BELT
 	sharp = 1
 	edge = 1
@@ -134,6 +134,13 @@
 	item_state = "katana"
 	slot_flags = SLOT_BELT | SLOT_BACK
 
+/obj/item/weapon/nullrod/claymore/multiverse
+	name = "extradimensional blade"
+	desc = "Once the harbringer of a interdimensional war, now a dormant souvenir. Still sharp though."
+	icon_state = "multiverse"
+	item_state = "multiverse"
+	slot_flags = SLOT_BELT
+
 /obj/item/weapon/nullrod/claymore/saber
 	name = "light energy sword"
 	hitsound = 'sound/weapons/blade1.ogg'
@@ -148,6 +155,12 @@
 	item_state = "swordred"
 	desc = "Woefully ineffective when used on steep terrain."
 
+/obj/item/weapon/nullrod/claymore/saber/pirate
+	name = "nautical energy sword"
+	icon_state = "cutlass1"
+	item_state = "cutlass1"
+	desc = "Convincing HR that your religion involved piracy was no mean feat."
+
 /obj/item/weapon/nullrod/sord
 	name = "\improper UNREAL SORD"
 	desc = "This thing is so unspeakably HOLY you are having a hard time even holding it."
@@ -179,6 +192,49 @@
 	desc = "Bad references are the DNA of the soul."
 	attack_verb = list("chopped", "sliced", "cut", "zandatsu'd")
 
+/obj/item/weapon/nullrod/scythe/talking
+	icon_state = "talking_sword"
+	item_state = "talking_sword"
+	name = "possessed blade"
+	desc = "When the station falls into chaos, it's nice to have a friend by your side."
+	attack_verb = list("chopped", "sliced", "cut")
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	var/possessed = FALSE
+
+/obj/item/weapon/nullrod/scythe/talking/attack_self(mob/living/user)
+	if(possessed)
+		return
+
+	to_chat(user, "You attempt to wake the spirit of the blade...")
+
+	possessed = TRUE
+
+	var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, 0, 100)
+	var/mob/dead/observer/theghost = null
+
+	if(candidates.len)
+		theghost = pick(candidates)
+		var/mob/living/simple_animal/shade/S = new(src)
+		S.real_name = name
+		S.name = name
+		S.ckey = theghost.ckey
+		var/input = stripped_input(S,"What are you named?", ,"", MAX_NAME_LEN)
+
+		if(src && input)
+			name = input
+			S.real_name = input
+			S.name = input
+	else
+		to_chat(user, "The blade is dormant. Maybe you can try again later.")
+		possessed = FALSE
+
+/obj/item/weapon/nullrod/scythe/talking/Destroy()
+	for(var/mob/living/simple_animal/shade/S in contents)
+		to_chat(S, "You were destroyed!")
+		S.ghostize()
+		qdel(S)
+	return ..()
+
 /obj/item/weapon/nullrod/hammmer
 	icon_state = "hammeron"
 	item_state = "hammeron"
@@ -326,3 +382,75 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharp = 1
 	edge = 1
+
+/obj/item/weapon/nullrod/rosary
+	icon_state = "rosary"
+	item_state = null
+	name = "prayer beads"
+	desc = "A set of prayer beads used by many of the more traditional religions in space.<br>Vampires and other unholy abominations have learned to fear these."
+	force = 0
+	throwforce = 0
+	var/praying = 0
+
+/obj/item/weapon/nullrod/rosary/New()
+	..()
+	processing_objects.Add(src)
+
+
+/obj/item/weapon/nullrod/rosary/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	if(!istype(M))
+		return ..()
+
+	if(!user.mind || user.mind.assigned_role != "Chaplain")
+		to_chat(user, "<span class='notice'>You are not close enough with [ticker.Bible_deity_name] to use [src].</span>")
+		return
+
+	if(praying)
+		to_chat(user, "<span class='notice'>You are already using [src].</span>")
+
+	user.visible_message("<span class='info'>[user] kneels[M == user ? null : " next to [M]"] and begins to utter a prayer to [ticker.Bible_deity_name].</span>", \
+		"<span class='info'>You kneel[M == user ? null : " next to [M]"] and begin a prayer to [ticker.Bible_deity_name].</span>")
+
+	praying = 1
+	if(do_after(user, 150, target = M))
+		if(istype(M, /mob/living/carbon/human)) // This probably should not work on vulps. They're unholy abominations.
+			var/mob/living/carbon/human/target = M
+
+			if(target.mind)
+				if(iscultist(target))
+					ticker.mode.remove_cultist(target.mind) // This proc will handle message generation.
+					praying = 0
+					return
+
+				if(target.mind.vampire && !target.mind.vampire.get_ability(/datum/vampire_passive/full)) // Getting a full prayer off on a vampire will interrupt their powers for a large duration.
+					target.mind.vampire.nullified = max(120, target.mind.vampire.nullified + 120)
+					to_chat(target, "<span class='userdanger'>[user]'s prayer to [ticker.Bible_deity_name] has interfered with your power!</span>")
+					praying = 0
+					return
+
+			if(prob(25))
+				to_chat(target, "<span class='notice'>[user]'s prayer to [ticker.Bible_deity_name] has eased your pain!</span>")
+				target.adjustToxLoss(-5)
+				target.adjustOxyLoss(-5)
+				target.adjustBruteLoss(-5)
+				target.adjustFireLoss(-5)
+
+			praying = 0
+
+	else
+		to_chat(user, "<span class='notice'>Your prayer to [ticker.Bible_deity_name] was interrupted.</span>")
+		praying = 0
+
+/obj/item/weapon/nullrod/rosary/process()
+	if(istype(loc, /mob/living/carbon/human))
+		var/mob/living/carbon/human/holder = loc
+
+		if(src == holder.l_hand || src == holder.r_hand) // Holding this in your hand will
+			for(var/mob/living/carbon/human/M in range(5))
+				if(M.mind.vampire && !M.mind.vampire.get_ability(/datum/vampire_passive/full))
+					M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
+					if(prob(10))
+						to_chat(M, "<span class='userdanger'>Being in the presence of [holder]'s [src] is interfering with your powers!</span>")
+
+
+

code/game/objects/items/weapons/implants/implant.dm

@@ -2,7 +2,7 @@
 	name = "implant"
 	icon = 'icons/obj/implants.dmi'
 	icon_state = "generic" //Shows up as the action button icon
-	action_button_is_hands_free = 1
+	action_button_custom_type = /datum/action/item_action/hands_free
 	origin_tech = "materials=2;biotech=3;programming=2"
 
 	var/activated = 1 //1 for implant types that can be activated, 0 for ones that are "always on" like loyalty implants

code/game/objects/items/weapons/implants/implant_traitor.dm

@@ -56,11 +56,11 @@
 			ticker.mode.traitors += H.mind
 			H.mind.special_role = "traitor"
 			to_chat(H, "<span class='warning'><B>You're now completely loyal to [user.name]!</B> You now must lay down your life to protect them and assist in their goals at any cost.</span>")
-			var/datum/objective/protect/p = new
-			p.owner = H.mind
-			p.target = user:mind
-			p.explanation_text = "Obey every order from and protect [user:real_name], the [user:mind:assigned_role=="MODE" ? (user:mind:special_role) : (user:mind:assigned_role)]."
-			H.mind.objectives += p
+			var/datum/objective/protect/mindslave/MS = new
+			MS.owner = H.mind
+			MS.target = user:mind
+			MS.explanation_text = "Obey every order from and protect [user:real_name], the [user:mind:assigned_role=="MODE" ? (user:mind:special_role) : (user:mind:assigned_role)]."
+			H.mind.objectives += MS
 			for(var/datum/objective/objective in H.mind.objectives)
 				to_chat(H, "<B>Objective #1</B>: [objective.explanation_text]")
 
@@ -71,10 +71,16 @@
 				var/datum/mindslaves/slaved = user.mind.som
 				H.mind.som = slaved
 				slaved.serv += H
-				slaved.add_serv_hud(user.mind,"syndicate")//handles master servent icons
-				slaved.add_serv_hud(H.mind,"mindslave")
+				slaved.add_serv_hud(user.mind, "master") //handles master servent icons
+				slaved.add_serv_hud(H.mind, "mindslave")
 
 			log_admin("[ckey(user.key)] has mind-slaved [ckey(H.key)].")
 			activated = 1
 			return 1
-		return 0
+		return 0
+
+/obj/item/weapon/implant/traitor/removed(mob/target)
+	if(..())
+		ticker.mode.remove_traitor_mind(target.mind)
+		return 1
+	return 0

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

@@ -1815,18 +1815,6 @@
 				</ol>
                 <br><br>
 
-                <h1><a name="atmos"><B>Atmospherics Technician</B></a></h1><BR>
-				<ol>
-					<li>Atmospheric Technicians are permitted to completely repipe the Atmospherics Piping Setup, provided they do not pump harmful gases into anywhere except the Turbine;</li>
-                    <li>Atmospheric Technicians are not permitted to create volatile mixes using Plasma and Oxygen, nor are they permitted to create any potentially harmful mixes with Carbon Dioxide and/or Nitrous Oxide. An exception is made when working with the Turbine;</li>
-                    <li>Atmospheric Technicians are permitted to cool Plasma and store it for later use in Radiation Collectors. Likewise, they are permitted to cool Nitrogen or Carbon Dioxide and store it for use as coolant for the Supermatter Engine;</li>
-                    <li>Atmospheric Technicians are not permitted to take the axe out of its case unless there is an immediate and urgent threat to their life or urgent access to crisis locations is necessary. The axe must be returned to the case afterwards, and the case locked;</li>
-                    <li>Atmospheric Technicians are not permitted to tamper with the default values on Air Alarms. They are, however, permitted to create small, acclimatized rooms for species that require special atmospheric conditions (such as Plasmamen and Vox), provided they receive express permission from the Chief Engineer;</li>
-                    <li>Atmospheric Technicians must periodically check on the Central Alarms Computer, in periods of, at most, thirty (30) minutes;</li>
-                    <li>Atmospheric Technicians must respond promptly to piping and station breaches. Failure to report within fifteen (15) minutes will be considered a breach of Standard Operating Procedure, unless there are no spare Atmospheric Technicians to report, or an Engineer has arrived on scene first. All Hazard Zones must be cordoned off with Engineering Tape, for the sake of everyone else</li>
-				</ol>
-                <br><br>
-
                 <h1><a name="sf"><B>Shaft Miner</B></a></h1><BR>
 				<ol>
 					<li>Shaft Miners are not permitted to bring Gibtonite aboard the station;</li>
@@ -2412,7 +2400,104 @@
                     <li>Demotion of Chief Engineer and reparation of Engine if no threat manifests.</li>
                 </ul>
                 <br><br>
-				
+
+				</body>
+				</html>
+
+		"}
+
+/obj/item/weapon/book/manual/sop_command
+	name = "Command Standard Operating Procedures"
+	desc = "A set of guidelines aiming at the safe conduct of all Command activities."
+	icon_state = "book4"
+	author = "Nanotrasen"
+	title = "Command Standard Operating Procedures"
+	dat = {"
+
+		<html>
+				<head>
+				<style>
+				h1 {font-size: 15px; margin: 15px 0px 5px;}
+				li {margin: 2px 0px 2px 15px;}
+				ul {list-style: none; margin: 5px; padding: 0px;}
+				ol {margin: 5px; padding: 0px 15px;}
+				</style>
+				</head>
+				<body>
+				<font face="Verdana" color=black>
+
+				<h1><a name="Contents">Contents</a></h1>
+				<ol>
+					<li><a href="#foreword">Foreword</a></li>
+					<li><a href="#cap">Captain</a></li>
+					<li><a href="#hop">Head of Personnel</a></li>
+					<li><a href="#ntrep">NanoTrasen Representative</a></li>
+					<li><a href="#bs">Blueshield Officer</a></li>
+                    <li><a href="#ai">AI</a></li>
+				</ol>
+				<br><BR>
+
+				<h1><a name="foreword"><U><B>FOREWORD</B></U></a></h1><BR>
+				Job SOP should not be a considered a checklist of conditions to fire someone over, and should not be rigidly followed to the letter in detriment of circumstances and context.
+				As always, SOP can be malleable if the situation so requires, and the decision to punish a crewmember for breaching it ultimately falls onto the relevant Head of Staff,
+				for Department Members, or Captain, for the Head of Staff.<BR><BR>
+
+				<h1><a name="cap"><B>Captain</B></a></h1><BR>
+				<ol>
+					<li>The Captain is not permitted to perform regular Security Duty. However, they may still assist Security if they are understaffed, or if they see a crime being committed. However, the Captain is not permitted to take items from the Armory under normal circumstances, unless authorized by the Head of Security. In addition, the Captain may not requisition weaponry for themselves from Cargo and/or Science, unless there's an immediate threat to station and/or crew;</li>
+					<li>If a Department lacks a Head of Staff, the Captain should make reasonable efforts to appoint an Acting Head of Staff, if there are available personnel to fill the position;</li>
+					<li>The Captain is to ensure that Space Law is being correctly applied. This should be done in cooperation with the Head of Security;</li>
+					<li>The Captain is not to leave the NSS Cyberiad unless given specific permission by Central Command, or it happens to be the end of the shift. This includes via space or via the Gateway. To do so is to be considered abandoning their posts and is grounds for termination;</li>
+					<li>The Captain must keep the Nuclear Authentication Disk on their person at all times or, failing that, in the possession of the Head of Security or Blueshield;</li>
+					<li>The Captain is to attempt to resolve every issue that arises in Command locally before contacting Central Command;</li>
+					<li>The Captain is not permitted to carry their Antique Laser Gun or Space Armor unless there's an immediate emergency that requires attending to;</li>
+					<li>The Captain, despite being in charge of the Cyberiad, is not independent from NanoTrasen. Any attempts to disregard general company policy are to be considered an instant condition for contract termination;</li>
+					<li>The Captain may only promote personnel to a Acting Head of Staff position if there is no assigned Head of Staff associated with the Department. Said Acting Head of Staff must be a member of the Department they are to lead. See below for more information on Chain of Command;</li>
+                    <li>The Captain may not fire any Head of Staff without reasonable justification (ie, incompetency, criminal activity, or otherwise any action that endangers/compromises the station and/or crew). The Captain may not fire any Central Command VIPs (ie, Blueshield, Magistrate, NanoTrasen Representative) without permission from Central Command, unless they are blatantly acting against the well-being and safety of the crew and station.</li>
+				</ol><BR>
+
+                <h1><a name="hop"><B>Head of Personnel</B></a></h1><BR>
+				<ol>
+					<li>The Head of Personnel may not transfer any personnel to another Department without authorization from the relevant Head of Staff. If no Head of Staff is available, the Head of Personnel may make a judgement call. This does not apply to Security, which always requires authorization from the Head of Security, or Genetics, which requires both Chief Medical Officer and Research Director approval. If there is no Head of Security active, no transfers are allowed to Security without authorization from the Captain;</li>
+					<li>The Head of Personnel may not give any personnel increased access without authorization from the relevant Head of Staff. This includes the Head of Personnel. In addition, the Head of Personnel may only give Captain-Level access to someone if they are the Acting Captain. This access is to be removed when a proper Captain arrives on the station;</li>
+					<li>The Head of Personnel may not increase any Job Openings unless the relevant Head of Staff approves;</li>
+					<li>The Head of Personnel may not fire any personnel without authorization from the relevant Head of Staff, unless other conditions apply (see Space Law and General Standard Operating Procedure);</li>
+					<li>The Head of Personnel may not promote any personnel to the following Jobs without authorization from Central Command: Barber, Brig Physician, NanoTrasen Representative, Blueshield, Security Pod Pilot, Mechanic and Magistrate; (This is due to them being karma locked. Do not promote people to these positions without approval from the Administrators);</li>
+					<li>The Head of Personnel is free to utilize paperwork at their discretion. However, during major station emergencies, expediency should take precedence over bureaucracy;</li>
+					<li>The Head of Personnel may not leave their office unmanned if there are personnel waiting in line. Failure to respond to personnel with a legitimate request within ten (10) minutes, either via radio or in person, is to be considered a breach of Standard Operating Procedure;</li>
+					<li>Despite nominally being in charge of Supply, the Head of Personnel should allow the Quartermaster to run the Department, unless they prove themselves to be incompetent/dangerous;</li>
+                    <li>The Head of Personnel is bound to the same rules regarding ordering Cargo Crates as the Quartermaster and Cargo Technicians. In addition, the Head of Personnel may not order unneeded, non-essential items against the wishes of Cargo;</li>
+                    <li>The Head of Personnel is not permitted to perform Security duty. The Head of Personnel is permitted to carry an Energy Gun, for self-defence only.</li>
+				</ol><BR>
+
+				<h1><a name="ntrep"><B>NanoTrasen Representative</B></a></h1><BR>
+				<ol>
+					<li>The NanoTrasen Representative is to ensure that every Department is following Standard Operating Procedure, up to and including the respective Head of Staff. If a Head of Staff is not available for a Department, the NanoTrasen Representative must ensure that the Captain appoints an Acting Head of Staff for said Department;</li>
+					<li>The NanoTrasen Representative must attempt to resolve any breach of Standard Operating Procedure locally before contacting Central Command. This is an imperative: Standard Operating Procedure should always be followed unless there is a very good reason not to;</li>
+					<li>The NanoTrasen Representative must, together with the Magistrate and Head of Security, ensure that Space Law is being followed and correctly applied;</li>
+					<li>The NanoTrasen Representative may not threaten the use of a fax in order to gain leverage over any personnel, up to and including Command. In addition they may not threaten to fire, or have Central Command, fire anyone, unless they actually possess a demotion note;</li>
+					<li>The NanoTrasen Representative is permitted to carry their Stun-Cane, or a Telescopic Baton if the Stun-Cane is lost.</li>
+				</ol><BR>
+
+                <h1><a name="bs"><B>Blueshield Officer</B></a></h1><BR>
+				<ol>
+					<li>The Blueshield may not conduct arrests under the same conditions as Security. However, they may apprehend any personnel that trespass on a Head of Staff Office or Command Area, any personnel that steal from those locations, or any personnel that steal from and/or injure any Head of Staff or Central Command VIP. However, all apprehended personnel are to be processed by Security personnel;</li>
+					<li>The Blueshield is to put the lives of Command over those of any other personnel, the Blueshield included. Their continued well-being is the Blueshield's top priority. This includes applying basic first aid and making sure they are revived if killed;</li>
+					<li>The Blueshield is to protect the lives of Command personnel, not follow their orders to a fault. The Blueshield is not to interfere with legal demotions or arrests. To do so is to place themselves under the Special Modifier Aiding and Abetting;</li>
+					<li>The Blueshield is not to apply Lethal Force unless there is a clear and present danger to their life, or to the life of a member of Command, and the assailant cannot be non-lethally detained.</li>
+				</ol><BR>
+
+	            <h1><a name="ai"><B>AI</B></a></h1><BR>
+				<b><i>The following are procedures for AI Maintenance:</i></b><br>
+				<ol>
+					<li>Only the Captain or Research Director may enter the AI Upload to perform Law Changes (see below), and only the Captain, Research Director or Chief Engineer may enter the AI Core to perform a Carding (see below);</li>
+					<li> No Law Changes are to be performed without approval from the Captain and Research Director. The only Lawsets to be used are those provided by NanoTrasen. Failure to legally perform a Law Change is to be considered Sabotage. Command must be informed prior to the Law Change, and all objections must be taken into consideration. If the number of Command personnel opposing the Law Change is greater than the number of Command personnel in favour, the Law Change is not to be done. If the Law Change is performed, the crew is to be immediately informed of the new Law(s);</li>
+                    <li>The AI may not be Carded unless it it clearly malfunctioning or subverted. However, any member of Command may card it if the AI agrees to it, either at the end of the shift, or due to external circumstances (such as massive damage to the AI Satellite);</li>
+                    <li>The AI Upload and Minisat Antechamber Turrets are to be kept on Non-Lethal in Code Green and Code Blue. The AI Core Turrets are to be kept on Lethal at all times. If a legal Law Change or Carding is occurring, the Turrets are to be disabled;</li>
+                    <li>If the AI Unit is not malfunctioning or subverted, any attempt at performing an illegal Carding or Law Change is to be responded to with non-lethal force. If the illegal attempts persist, and the perpetrator is demonstrably hostile, lethal force from Command/Security is permitted;</li>
+                    <li>Freeform Laws are only to be added if absolutely necessary due to external circumstances (such as major station emergencies). Adding unnecessary Freeform Laws is not permitted. Exception is made if the AI Unit and majority of Command agree to the Freeform Law that is proposed;</li>
+                    <li>Any use of the "Purge" Module is to be followed by the upload of a NanoTrasen-approved Lawset immediately. AI Units must be bound to a Lawset at all times.</li>
+				</ol><BR>
 				</body>
 				</html>
 

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

@@ -127,10 +127,16 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "red_phone"
 	flags = CONDUCT
-	force = 3.0
-	throwforce = 2.0
+	force = 3
+	throwforce = 2
 	throw_speed = 1
 	throw_range = 4
 	w_class = 2
 	attack_verb = list("called", "rang")
-	hitsound = 'sound/weapons/ring.ogg'
+	hitsound = 'sound/weapons/ring.ogg'
+	var/cooldown = 0
+
+/obj/item/weapon/phone/attack_self(mob/user)
+	if(cooldown < world.time - 20)
+		playsound(user.loc, 'sound/weapons/ring.ogg', 50, 1)
+		cooldown = world.time

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

@@ -128,7 +128,6 @@
 	materials = list()
 	minor_fault = 1
 
-
 /obj/item/weapon/stock_parts/cell/high/slime
 	name = "charged slime core"
 	desc = "A yellow slime core infused with plasma, it crackles with power."
@@ -138,6 +137,12 @@
 	materials = list()
 	self_recharge = 1 // Infused slime cores self-recharge, over time
 
+/obj/item/weapon/stock_parts/cell/pulse //200 pulse shots
+	name = "pulse rifle power cell"
+	maxcharge = 40000
+	rating = 3
+	chargerate = 1500
+
 /obj/item/weapon/stock_parts/cell/pulse/carbine
 	name = "pulse carbine power cell"
 	maxcharge = 4000
@@ -168,9 +173,3 @@
 
 /obj/item/weapon/stock_parts/cell/emproof/corrupt()
 	return
-
-/obj/item/weapon/stock_parts/cell/temperaturegun
-	name = "temperature gun cell"
-	desc = "A specially designed power cell for heating and cooling projectiles"
-	icon_state = "icell"
-	maxcharge = 900

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

@@ -131,7 +131,7 @@
 	name = "nano-manipulator"
 	desc = "A tiny little manipulator used in the construction of certain devices."
 	icon_state = "nano_mani"
-	origin_tech = "materials=3,programming=2"
+	origin_tech = "materials=3;programming=2"
 	rating = 2
 	materials = list(MAT_METAL=30)
 
@@ -173,7 +173,7 @@
 	name = "pico-manipulator"
 	desc = "A tiny little manipulator used in the construction of certain devices."
 	icon_state = "pico_mani"
-	origin_tech = "materials=5,programming=2"
+	origin_tech = "materials=5;programming=2"
 	rating = 3
 	materials = list(MAT_METAL=30)
 

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

@@ -135,6 +135,7 @@
 		affected_mob.adjustBruteLoss(-12)
 		affected_mob.adjustFireLoss(-12)
 		affected_mob.adjustToxLoss(-5)
+		affected_mob.setStaminaLoss(0)
 		var/status = CANSTUN | CANWEAKEN | CANPARALYSE
 		affected_mob.status_flags &= ~status
 		affected_mob.dizziness = max(0, affected_mob.dizziness-10)

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

@@ -6,8 +6,17 @@
 	item_state = "utility"
 	slot_flags = SLOT_BELT
 	attack_verb = list("whipped", "lashed", "disciplined")
+	var/use_item_overlays = 0 // Do we have overlays for items held inside the belt?
 
 
+/obj/item/weapon/storage/belt/update_icon()
+	if(use_item_overlays)
+		overlays.Cut()
+		for(var/obj/item/I in contents)
+			overlays += "[I.name]"
+
+	..()
+
 /obj/item/weapon/storage/belt/proc/can_use()
 	return is_equipped()
 
@@ -35,6 +44,7 @@
 	desc = "Can hold various tools."
 	icon_state = "utilitybelt"
 	item_state = "utility"
+	use_item_overlays = 1
 	can_hold = list(
 		"/obj/item/weapon/crowbar",
 		"/obj/item/weapon/screwdriver",
@@ -81,6 +91,7 @@
 	desc = "Can hold various medical equipment."
 	icon_state = "medicalbelt"
 	item_state = "medical"
+	use_item_overlays = 1
 	can_hold = list(
 		"/obj/item/device/healthanalyzer",
 		"/obj/item/weapon/dnainjector",
@@ -120,6 +131,7 @@
 	desc = "Can hold various botanical supplies."
 	icon_state = "botanybelt"
 	item_state = "botany"
+	use_item_overlays = 1
 	can_hold = list(
 		"/obj/item/device/analyzer/plant_analyzer",
 		"/obj/item/weapon/minihoe",
@@ -127,8 +139,8 @@
 		"/obj/item/weapon/reagent_containers/glass/fertilizer",
 		"/obj/item/weapon/reagent_containers/glass/bottle",
 		"/obj/item/weapon/plantspray",
-		"/obj/item/weapon/reagent_containers/syringe",
-		"/obj/item/weapon/reagent_containers/glass/beaker",
+//		"/obj/item/weapon/reagent_containers/syringe",
+//		"/obj/item/weapon/reagent_containers/glass/beaker",
 		"/obj/item/weapon/lighter/zippo",
 		"/obj/item/weapon/storage/fancy/cigarettes",
 		"obj/item/weapon/rollingpaperpack",
@@ -148,6 +160,7 @@
 	item_state = "security"//Could likely use a better one.
 	storage_slots = 5
 	max_w_class = 3
+	use_item_overlays = 1
 	can_hold = list(
 		"/obj/item/weapon/grenade/flashbang",
 		"/obj/item/weapon/grenade/chem_grenade/teargas",
@@ -185,6 +198,7 @@
 	icon_state = "soulstonebelt"
 	item_state = "soulstonebelt"
 	storage_slots = 6
+	use_item_overlays = 1
 	can_hold = list(
 		"/obj/item/device/soulstone"
 		)
@@ -230,6 +244,7 @@
 	item_state = "janibelt"
 	storage_slots = 6
 	max_w_class = 4 // Set to this so the  light replacer can fit.
+	use_item_overlays = 1
 	can_hold = list(
 		"/obj/item/weapon/grenade/chem_grenade/cleaner",
 		"/obj/item/device/lightreplacer",
@@ -300,6 +315,21 @@
 	new /obj/item/ammo_casing/shotgun/beanbag(src)
 	new /obj/item/ammo_casing/shotgun/beanbag(src)
 
+/obj/item/weapon/storage/belt/bandolier/update_icon()
+	..()
+	icon_state = "[initial(icon_state)]_[contents.len]"
+
+/obj/item/weapon/storage/belt/bandolier/attackby(obj/item/W, mob/user)
+	var/amount = contents.len
+	. = ..()
+	if(amount != contents.len)
+		update_icon()
+
+/obj/item/weapon/storage/belt/bandolier/remove_from_storage(obj/item/W as obj, atom/new_location)
+	..()
+	update_icon()
+
+
 /obj/item/weapon/storage/belt/holster
 	name = "shoulder holster"
 	desc = "A holster to conceal a carried handgun. WARNING: Badasses only."
@@ -318,6 +348,7 @@
 	icon_state = "soulstonebelt"
 	item_state = "soulstonebelt"
 	storage_slots = 6
+	use_item_overlays = 1
 	can_hold = list(
 		"/obj/item/weapon/gun/magic/wand"
 		)

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

@@ -20,34 +20,34 @@
 	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 		if (istype(W, /obj/item/weapon/card/id))
 			if(src.broken)
-				to_chat(user, "\red It appears to be broken.")
+				to_chat(user, "<span class='warning'>It appears to be broken.</span>")
 				return
 			if(src.allowed(user))
 				src.locked = !( src.locked )
 				if(src.locked)
 					src.icon_state = src.icon_locked
-					to_chat(user, "\red You lock the [src.name]!")
+					to_chat(user, "<span class='warning'>You lock the [src.name]!</span>")
 					return
 				else
 					src.icon_state = src.icon_closed
-					to_chat(user, "\red You unlock the [src.name]!")
+					to_chat(user, "<span class='warning'>You unlock the [src.name]!</span>")
 					origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D.
 					return
 			else
-				to_chat(user, "\red Access Denied")
+				to_chat(user, "<span class='warning'>Access Denied</span>")
 		else if((istype(W, /obj/item/weapon/card/emag) || istype(W, /obj/item/weapon/melee/energy/blade)) && !broken)
 			emag_act(user)
 			return
 		if(!locked)
 			..()
 		else
-			to_chat(user, "\red Its locked!")
+			to_chat(user, "<span class='warning'>It's locked!</span>")
 		return
 
 
 	show_to(mob/user as mob)
 		if(locked)
-			to_chat(user, "\red Its locked!")
+			to_chat(user, "<span class='warning'>It's locked!</span>")
 		else
 			..()
 		return

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

@@ -156,14 +156,19 @@
 // -----------------------------
 /obj/item/weapon/storage/secure/briefcase
 	name = "secure briefcase"
+	desc = "A large briefcase with a digital locking system."
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "secure"
 	item_state = "sec-case"
-	desc = "A large briefcase with a digital locking system."
+	flags = CONDUCT
+	hitsound = "swing_hit"
 	force = 8.0
-	throw_speed = 1
+	throw_speed = 2
 	throw_range = 4
 	w_class = 4.0
+	max_w_class = 3
+	max_combined_w_class = 21
+	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
 
 	New()
 		..()

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

@@ -151,6 +151,7 @@
 	for(var/obj/O in src.contents)
 		O.screen_loc = "[cx],[cy]"
 		O.layer = 20
+		O.plane = HUD_PLANE
 		cx++
 		if (cx > mx)
 			cx = tx
@@ -170,6 +171,7 @@
 			ND.sample_object.screen_loc = "[cx]:16,[cy]:16"
 			ND.sample_object.maptext = "<font color='white'>[(ND.number > 1)? "[ND.number]" : ""]</font>"
 			ND.sample_object.layer = 20
+			ND.sample_object.plane = HUD_PLANE
 			cx++
 			if (cx > (4+cols))
 				cx = 4
@@ -180,6 +182,7 @@
 			O.screen_loc = "[cx]:16,[cy]:16"
 			O.maptext = ""
 			O.layer = 20
+			O.plane = HUD_PLANE
 			cx++
 			if (cx > (4+cols))
 				cx = 4
@@ -337,8 +340,10 @@
 			W.dropped(usr)
 		if(ismob(new_location))
 			W.layer = 20
+			W.plane = HUD_PLANE
 		else
 			W.layer = initial(W.layer)
+			W.plane = initial(W.plane)
 		W.loc = new_location
 	else
 		W.loc = get_turf(src)
@@ -445,6 +450,7 @@
 	src.closer.master = src
 	src.closer.icon_state = "x"
 	src.closer.layer = 20
+	src.closer.plane = HUD_PLANE
 	orient2hud()
 	return
 

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

@@ -89,10 +89,6 @@
 	if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
 		atmosanalyzer_scan(air_contents, user)
 
-	else if (istype(W,/obj/item/latexballon))
-		var/obj/item/latexballon/LB = W
-		LB.blow(src)
-
 	if(istype(W, /obj/item/device/assembly_holder))
 		bomb_assemble(W,user)
 

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

@@ -222,6 +222,10 @@
 		icon_state = "dualsaber0"
 
 /obj/item/weapon/twohanded/dualsaber/attack(target as mob, mob/living/user as mob)
+	if(HULK in user.mutations)
+		to_chat(user, "<span class='warning'>You grip the blade too hard and accidentally close it!</span>")
+		unwield()
+		return
 	..()
 	if((CLUMSY in user.mutations) && (wielded) &&prob(40))
 		to_chat(user, "\red You twirl around a bit before losing your balance and impaling yourself on the [src].")
@@ -259,7 +263,10 @@
 	if(wielded)
 		return 1
 
-/obj/item/weapon/twohanded/dualsaber/wield()
+/obj/item/weapon/twohanded/dualsaber/wield(mob/living/carbon/M) //Specific wield () hulk checks due to reflection chance for balance issues and switches hitsounds.
+	if(HULK in M.mutations)
+		to_chat(M, "<span class='warning'>You lack the grace to wield this!</span>")
+		return
 	..()
 	hitsound = 'sound/weapons/blade1.ogg'