Merge branch 'master' into SyndicateStuff

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

@@ -19,7 +19,7 @@
 	var/safety = 1 //if you can zap people with the defibs on harm mode
 	var/powered = 0 //if there's a cell in the defib with enough power for a revive, blocks paddles from reviving otherwise
 	var/obj/item/weapon/twohanded/shockpaddles/paddles
-	var/obj/item/weapon/stock_parts/cell/high/bcell = null
+	var/obj/item/weapon/stock_parts/cell/high/cell
 	var/combat = 0 //can we revive through space suits?
 	var/grab_ghost = FALSE // Do we pull the ghost back into their body?
 
@@ -29,10 +29,13 @@
 	update_icon()
 	return
 
+/obj/item/weapon/defibrillator/get_cell()
+	return cell
+
 /obj/item/weapon/defibrillator/loaded/Initialize() //starts with hicap
 	. = ..()
 	paddles = make_paddles()
-	bcell = new(src)
+	cell = new(src)
 	update_icon()
 	return
 
@@ -42,8 +45,8 @@
 	update_charge()
 
 /obj/item/weapon/defibrillator/proc/update_power()
-	if(bcell)
-		if(bcell.charge < paddles.revivecost)
+	if(cell)
+		if(cell.charge < paddles.revivecost)
 			powered = 0
 		else
 			powered = 1
@@ -56,21 +59,21 @@
 		add_overlay("[initial(icon_state)]-paddles")
 	if(powered)
 		add_overlay("[initial(icon_state)]-powered")
-	if(!bcell)
+	if(!cell)
 		add_overlay("[initial(icon_state)]-nocell")
 	if(!safety)
 		add_overlay("[initial(icon_state)]-emagged")
 
 /obj/item/weapon/defibrillator/proc/update_charge()
 	if(powered) //so it doesn't show charge if it's unpowered
-		if(bcell)
-			var/ratio = bcell.charge / bcell.maxcharge
+		if(cell)
+			var/ratio = cell.charge / cell.maxcharge
 			ratio = Ceiling(ratio*4) * 25
 			add_overlay("[initial(icon_state)]-charge[ratio]")
 
 /obj/item/weapon/defibrillator/CheckParts(list/parts_list)
 	..()
-	bcell = locate(/obj/item/weapon/stock_parts/cell) in contents
+	cell = locate(/obj/item/weapon/stock_parts/cell) in contents
 	update_icon()
 
 /obj/item/weapon/defibrillator/ui_action_click()
@@ -105,7 +108,7 @@
 		toggle_paddles()
 	else if(istype(W, /obj/item/weapon/stock_parts/cell))
 		var/obj/item/weapon/stock_parts/cell/C = W
-		if(bcell)
+		if(cell)
 			to_chat(user, "<span class='notice'>[src] already has a cell.</span>")
 		else
 			if(C.maxcharge < paddles.revivecost)
@@ -113,15 +116,15 @@
 				return
 			if(!user.transferItemToLoc(W, src))
 				return
-			bcell = W
+			cell = W
 			to_chat(user, "<span class='notice'>You install a cell in [src].</span>")
 			update_icon()
 
 	else if(istype(W, /obj/item/weapon/screwdriver))
-		if(bcell)
-			bcell.updateicon()
-			bcell.loc = get_turf(src.loc)
-			bcell = null
+		if(cell)
+			cell.update_icon()
+			cell.loc = get_turf(src.loc)
+			cell = null
 			to_chat(user, "<span class='notice'>You remove the cell from [src].</span>")
 			update_icon()
 	else
@@ -136,7 +139,7 @@
 		to_chat(user, "<span class='notice'>You silently enable [src]'s safety protocols with the cryptographic sequencer.")
 
 /obj/item/weapon/defibrillator/emp_act(severity)
-	if(bcell)
+	if(cell)
 		deductcharge(1000 / severity)
 	if(safety)
 		safety = 0
@@ -200,11 +203,11 @@
 	update_icon()
 
 /obj/item/weapon/defibrillator/proc/deductcharge(chrgdeductamt)
-	if(bcell)
-		if(bcell.charge < (paddles.revivecost+chrgdeductamt))
+	if(cell)
+		if(cell.charge < (paddles.revivecost+chrgdeductamt))
 			powered = 0
 			update_icon()
-		if(bcell.use(chrgdeductamt))
+		if(cell.use(chrgdeductamt))
 			update_icon()
 			return 1
 		else
@@ -213,8 +216,8 @@
 
 /obj/item/weapon/defibrillator/proc/cooldowncheck(mob/user)
 	spawn(50)
-		if(bcell)
-			if(bcell.charge >= paddles.revivecost)
+		if(cell)
+			if(cell.charge >= paddles.revivecost)
 				user.visible_message("<span class='notice'>[src] beeps: Unit ready.</span>")
 				playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50, 0)
 			else
@@ -240,7 +243,7 @@
 /obj/item/weapon/defibrillator/compact/loaded/Initialize()
 	. = ..()
 	paddles = make_paddles()
-	bcell = new(src)
+	cell = new(src)
 	update_icon()
 
 /obj/item/weapon/defibrillator/compact/combat
@@ -252,7 +255,7 @@
 /obj/item/weapon/defibrillator/compact/combat/loaded/Initialize()
 	. = ..()
 	paddles = make_paddles()
-	bcell = new /obj/item/weapon/stock_parts/cell/infinite(src)
+	cell = new /obj/item/weapon/stock_parts/cell/infinite(src)
 	update_icon()
 
 /obj/item/weapon/defibrillator/compact/combat/loaded/attackby(obj/item/weapon/W, mob/user, params)

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

@@ -0,0 +1,183 @@
+/obj/item/weapon/inducer
+	name = "inducer"
+	desc = "A tool for inductively charging internal power cells."
+	icon = 'icons/obj/tools.dmi'
+	icon_state = "inducer-engi"
+	item_state = "inducer-engi"
+	origin_tech = "engineering=4;magnets=4;powerstorage=4"
+	force = 7
+	var/powertransfer = 1000
+	var/opened = FALSE
+	var/cell_type = /obj/item/weapon/stock_parts/cell/high
+	var/obj/item/weapon/stock_parts/cell/cell
+	var/recharging = FALSE
+
+/obj/item/weapon/inducer/Initialize()
+	. = ..()
+	if(!cell && cell_type)
+		cell = new cell_type
+
+/obj/item/weapon/inducer/proc/induce(obj/item/weapon/stock_parts/cell/target, coefficient)
+	var/totransfer = min(cell.charge,(powertransfer * coefficient))
+	var/transferred = target.give(totransfer)
+	cell.use(transferred)
+	cell.update_icon()
+	target.update_icon()
+
+/obj/item/weapon/inducer/get_cell()
+	return cell
+
+/obj/item/weapon/inducer/emp_act(severity)
+	..()
+	if(cell)
+		cell.emp_act()
+
+/obj/item/weapon/inducer/attack_obj(obj/O, mob/living/carbon/user)
+	if(user.a_intent == INTENT_HARM)
+		return ..()
+
+	if(cantbeused(user))
+		return
+
+	if(recharge(O, user))
+		return
+
+	return ..()
+
+/obj/item/weapon/inducer/proc/cantbeused(mob/user)
+	if(!user.IsAdvancedToolUser())
+		to_chat(user, "<span class='warning'>You don't have the dexterity to use \the [src]!</span>")
+		return TRUE
+
+	if(!cell)
+		to_chat(user, "<span class='warning'>\The [src] doesn't have a power cell installed!</span>")
+		return TRUE
+
+	if(!cell.charge)
+		to_chat(user, "<span class='warning'>\The [src]'s battery is dead!</span>")
+		return TRUE
+	return FALSE
+
+
+/obj/item/weapon/inducer/attackby(obj/item/weapon/W, mob/user)
+	if(istype(W,/obj/item/weapon/screwdriver))
+		playsound(src, W.usesound, 50, 1)
+		if(!opened)
+			to_chat(user, "<span class='notice'>You unscrew the battery compartment.</span>")
+			opened = TRUE
+			update_icon()
+			return
+		else
+			to_chat(user, "<span class='notice'>You close the battery compartment.</span>")
+			opened = FALSE
+			update_icon()
+			return
+	if(istype(W,/obj/item/weapon/stock_parts/cell))
+		if(opened)
+			if(!cell)
+				if(!user.transferItemToLoc(W, src))
+					return
+				to_chat(user, "<span class='notice'>You insert \the [W] into \the [src].</span>")
+				cell = W
+				update_icon()
+				return
+			else
+				to_chat(user, "<span class='notice'>\The [src] already has \a [cell] installed!</span>")
+				return
+
+	if(cantbeused(user))
+		return
+
+	if(recharge(W, user))
+		return
+
+	return ..()
+
+/obj/item/weapon/inducer/proc/recharge(atom/movable/A, mob/user)
+	if(recharging)
+		return TRUE
+	else
+		recharging = TRUE
+	var/obj/item/weapon/stock_parts/cell/C = A.get_cell()
+	var/obj/item/weapon/gun/energy/E
+	var/obj/O
+	var/coefficient = 1
+	if(istype(A, /obj/item/weapon/gun/energy))
+		coefficient = 0.075 // 14 loops to recharge an egun from 0-1000
+		E = A
+	if(istype(A, /obj))
+		O = A
+	if(C)
+		if(C.charge >= C.maxcharge)
+			to_chat(user, "<span class='notice'>\The [A] is fully charged!</span>")
+			recharging = FALSE
+			return TRUE
+		user.visible_message("[user] starts recharging \the [A] with \the [src]","<span class='notice'>You start recharging [A] with \the [src]</span>")
+		while(C.charge < C.maxcharge)
+			if(E)
+				E.chambered = null  // Prevents someone from firing continuously while recharging the gun.
+			if(do_after(user, 10, target = user) && cell.charge)
+				induce(C, coefficient)
+				do_sparks(1, FALSE, A)
+				if(O)
+					O.update_icon()
+			else
+				break
+		if(E)
+			E.recharge_newshot() //We're done charging, so we'll let someone fire it now.
+		user.visible_message("[user] recharged \the [A]!","<span class='notice'>You recharged \the [A]!</span>")
+		recharging = FALSE
+		return TRUE
+
+
+/obj/item/weapon/inducer/attack(mob/M, mob/user)
+	if(user.a_intent == INTENT_HARM)
+		return ..()
+
+	if(cantbeused(user))
+		return
+
+	if(recharge(M, user))
+		return
+	return ..()
+
+
+/obj/item/weapon/inducer/attack_self(mob/user)
+	if(opened && cell)
+		user.visible_message("[user] removes \the [cell] from \the [src]!","<span class='notice'>You remove \the [cell].</span>")
+		cell.update_icon()
+		user.put_in_hands(cell)
+		cell = null
+		update_icon()
+
+
+/obj/item/weapon/inducer/examine(mob/living/M)
+	..()
+	if(cell)
+		to_chat(M, "<span class='notice'>It's display shows: [cell.charge]W</span>")
+	else
+		to_chat(M,"<span class='notice'>It's display is dark.</span>")
+	if(opened)
+		to_chat(M,"<span class='notice'>It's battery compartment is open.</span>")
+
+/obj/item/weapon/inducer/update_icon()
+	cut_overlays()
+	if(opened)
+		if(!cell)
+			add_overlay("inducer-nobat")
+		else
+			add_overlay("inducer-bat")
+
+/obj/item/weapon/inducer/sci
+	icon_state = "inducer-sci"
+	item_state = "inducer-sci"
+	desc = "A tool for inductively charging internal power cells. This one has a science color scheme, and is less potent than it's engineering counterpart."
+	cell_type = null
+	powertransfer = 500
+	opened = TRUE
+
+/obj/item/weapon/inducer/sci/Initialize()
+	. = ..()
+	update_icon()
+
+

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

@@ -317,42 +317,42 @@
 		revealed = 1
 
 /obj/item/weapon/storage/backpack/dufflebag
-	name = "dufflebag"
-	desc = "A large dufflebag for holding extra things."
+	name = "dufflebag"
+	desc = "A large dufflebag for holding extra things."
 	icon_state = "duffle"
 	item_state = "duffle"
 	slowdown = 1
 	max_combined_w_class = 30
 
 /obj/item/weapon/storage/backpack/dufflebag/captain
-	name = "captain's dufflebag"
-	desc = "A large dufflebag for holding extra captainly goods."
+	name = "captain's dufflebag"
+	desc = "A large dufflebag for holding extra captainly goods."
 	icon_state = "duffle-captain"
 	item_state = "duffle-captain"
 	resistance_flags = 0
 
 /obj/item/weapon/storage/backpack/dufflebag/med
-	name = "medical dufflebag"
-	desc = "A large dufflebag for holding extra medical supplies."
+	name = "medical dufflebag"
+	desc = "A large dufflebag for holding extra medical supplies."
 	icon_state = "duffle-med"
 	item_state = "duffle-med"
 
 /obj/item/weapon/storage/backpack/dufflebag/sec
-	name = "security dufflebag"
-	desc = "A large dufflebag for holding extra security supplies and ammunition."
+	name = "security dufflebag"
+	desc = "A large dufflebag for holding extra security supplies and ammunition."
 	icon_state = "duffle-sec"
 	item_state = "duffle-sec"
 
 /obj/item/weapon/storage/backpack/dufflebag/engineering
-	name = "industrial dufflebag"
-	desc = "A large dufflebag for holding extra tools and supplies."
+	name = "industrial dufflebag"
+	desc = "A large dufflebag for holding extra tools and supplies."
 	icon_state = "duffle-eng"
 	item_state = "duffle-eng"
 	resistance_flags = 0
 
 /obj/item/weapon/storage/backpack/dufflebag/drone
-	name = "drone dufflebag"
-	desc = "A large dufflebag for holding tools and hats."
+	name = "drone dufflebag"
+	desc = "A large dufflebag for holding tools and hats."
 	icon_state = "duffle-drone"
 	item_state = "duffle-drone"
 	resistance_flags = FIRE_PROOF
@@ -367,8 +367,8 @@
 	new /obj/item/device/multitool(src)
 
 /obj/item/weapon/storage/backpack/dufflebag/clown
-	name = "clown's dufflebag"
-	desc = "A large dufflebag for holding lots of funny gags!"
+	name = "clown's dufflebag"
+	desc = "A large dufflebag for holding lots of funny gags!"
 	icon_state = "duffle-clown"
 	item_state = "duffle-clown"
 
@@ -377,8 +377,8 @@
 		new /obj/item/weapon/reagent_containers/food/snacks/pie/cream(src)
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie
-	name = "suspicious looking dufflebag"
-	desc = "A large dufflebag for holding extra tactical supplies."
+	name = "suspicious looking dufflebag"
+	desc = "A large dufflebag for holding extra tactical supplies."
 	icon_state = "duffle-syndie"
 	item_state = "duffle-syndie"
 	origin_tech = "syndicate=1"
@@ -386,14 +386,14 @@
 	slowdown = 0
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/med
-	name = "medical dufflebag"
-	desc = "A large dufflebag for holding extra tactical medical supplies."
+	name = "medical dufflebag"
+	desc = "A large dufflebag for holding extra tactical medical supplies."
 	icon_state = "duffle-syndiemed"
 	item_state = "duffle-syndiemed"
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/surgery
-	name = "surgery dufflebag"
-	desc = "A suspicious looking dufflebag for holding surgery tools."
+	name = "surgery dufflebag"
+	desc = "A suspicious looking dufflebag for holding surgery tools."
 	icon_state = "duffle-syndiemed"
 	item_state = "duffle-syndiemed"
 
@@ -410,13 +410,13 @@
 	new /obj/item/device/mmi/syndie(src)
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo
-	name = "ammunition dufflebag"
-	desc = "A large dufflebag for holding extra weapons ammunition and supplies."
+	name = "ammunition dufflebag"
+	desc = "A large dufflebag for holding extra weapons ammunition and supplies."
 	icon_state = "duffle-syndieammo"
 	item_state = "duffle-syndieammo"
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/shotgun
-	desc = "A large dufflebag, packed to the brim with Bulldog shotgun ammo."
+	desc = "A large dufflebag, packed to the brim with Bulldog shotgun ammo."
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/shotgun/PopulateContents()
 	for(var/i in 1 to 6)
@@ -426,14 +426,14 @@
 	new /obj/item/ammo_box/magazine/m12g/dragon(src)
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg
-	desc = "A large dufflebag, packed to the brim with C20r magazines."
+	desc = "A large dufflebag, packed to the brim with C20r magazines."
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg/PopulateContents()
 	for(var/i in 1 to 9)
 		new /obj/item/ammo_box/magazine/smgm45(src)
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/c20rbundle
-	desc = "A large dufflebag containing a C20r, some magazines, and a cheap looking suppressor."
+	desc = "A large dufflebag containing a C20r, some magazines, and a cheap looking suppressor."
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/c20rbundle/PopulateContents()
 	new /obj/item/ammo_box/magazine/smgm45(src)
@@ -442,7 +442,7 @@
 	new /obj/item/weapon/suppressor/specialoffer(src)
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/bulldogbundle
-	desc = "A large dufflebag containing a Bulldog, several drums, and a collapsed hardsuit."
+	desc = "A large dufflebag containing a Bulldog, several drums, and a collapsed hardsuit."
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/bulldogbundle/PopulateContents()
 	new /obj/item/ammo_box/magazine/m12g(src)
@@ -451,7 +451,7 @@
 	new /obj/item/clothing/glasses/thermal/syndi(src)
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle
-	desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots."
+	desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots."
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle/PopulateContents()
 	new /obj/item/clothing/shoes/magboots/syndie(src)
@@ -460,7 +460,7 @@
 	new /obj/item/ammo_box/foambox/riot(src)
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle
-	desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots."
+	desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots."
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle/PopulateContents()
 	new /obj/item/clothing/shoes/magboots/syndie(src)
@@ -469,7 +469,7 @@
 	new /obj/item/ammo_box/foambox/riot(src)
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/med/bioterrorbundle
-	desc = "A large dufflebag containing a deadly chemicals, a chemical spray, chemical grenade, a Donksoft assault rifle, riot grade darts, a minature syringe gun, and a box of syringes"
+	desc = "A large dufflebag containing a deadly chemicals, a chemical spray, chemical grenade, a Donksoft assault rifle, riot grade darts, a minature syringe gun, and a box of syringes"
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/med/bioterrorbundle/PopulateContents()
 	new /obj/item/weapon/reagent_containers/spray/chemsprayer/bioterror(src)
@@ -489,7 +489,7 @@
 		new /obj/item/weapon/grenade/plastic/x4(src)
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/firestarter
-	desc = "A large dufflebag containing New Russian pyro backpack sprayer, a pistol, a pipebomb, fireproof hardsuit, ammo, and other equipment."
+	desc = "A large dufflebag containing New Russian pyro backpack sprayer, a pistol, a pipebomb, fireproof hardsuit, ammo, and other equipment."
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/firestarter/PopulateContents()
 	new /obj/item/clothing/under/syndicate/soviet(src)

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

@@ -21,15 +21,15 @@
 	if(has_latches)
 		if(prob(10))
 			latches = "double_latch"
-			if(prob(1))
-				latches = "triple_latch"
+			if(prob(1))
+				latches = "triple_latch"
 	update_icon()
 
 /obj/item/weapon/storage/toolbox/update_icon()
 	..()
 	cut_overlays()
 	if(has_latches)
-		add_overlay(latches)
+		add_overlay(latches)
 
 
 /obj/item/weapon/storage/toolbox/suicide_act(mob/user)
@@ -140,10 +140,10 @@
 	max_combined_w_class = 28
 	storage_slots = 28
 	attack_verb = list("robusted", "crushed", "smashed")
-	var/proselytizer_type = /obj/item/clockwork/clockwork_proselytizer/scarab
+	var/fabricator_type = /obj/item/clockwork/replica_fabricator/scarab
 
 /obj/item/weapon/storage/toolbox/brass/prefilled/PopulateContents()
-	new proselytizer_type(src)
+	new fabricator_type(src)
 	new /obj/item/weapon/screwdriver/brass(src)
 	new /obj/item/weapon/wirecutters/brass(src)
 	new /obj/item/weapon/wrench/brass(src)
@@ -151,7 +151,7 @@
 	new /obj/item/weapon/weldingtool/experimental/brass(src)
 
 /obj/item/weapon/storage/toolbox/brass/prefilled/ratvar
-	var/slab_type = /obj/item/clockwork/slab
+	var/slab_type = /obj/item/clockwork/slab
 
 /obj/item/weapon/storage/toolbox/brass/prefilled/ratvar/PopulateContents()
 	..()
@@ -159,7 +159,7 @@
 
 /obj/item/weapon/storage/toolbox/brass/prefilled/ratvar/admin
 	slab_type = /obj/item/clockwork/slab/debug
-	proselytizer_type = /obj/item/clockwork/clockwork_proselytizer/scarab/debug
+	fabricator_type = /obj/item/clockwork/replica_fabricator/scarab/debug
 
 
 /obj/item/weapon/storage/toolbox/artistic

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

@@ -13,7 +13,7 @@
 
 	var/stunforce = 7
 	var/status = 0
-	var/obj/item/weapon/stock_parts/cell/high/bcell = null
+	var/obj/item/weapon/stock_parts/cell/high/cell = null
 	var/hitcost = 1000
 	var/throw_hit_chance = 35
 
@@ -21,8 +21,8 @@
 	user.visible_message("<span class='suicide'>[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return (FIRELOSS)
 
-/obj/item/weapon/melee/baton/Initialize()
-	. = ..()
+/obj/item/weapon/melee/baton/Initialize()
+	. = ..()
 	update_icon()
 
 /obj/item/weapon/melee/baton/throw_impact(atom/hit_atom)
@@ -31,16 +31,16 @@
 	if(status && prob(throw_hit_chance) && iscarbon(hit_atom))
 		baton_stun(hit_atom)
 
-/obj/item/weapon/melee/baton/loaded/Initialize() //this one starts with a cell pre-installed.
-	bcell = new(src)
-	. = ..()
+/obj/item/weapon/melee/baton/loaded/Initialize() //this one starts with a cell pre-installed.
+	cell = new(src)
+	. = ..()
 
 /obj/item/weapon/melee/baton/proc/deductcharge(chrgdeductamt)
-	if(bcell)
+	if(cell)
 		//Note this value returned is significant, as it will determine
 		//if a stun is applied or not
-		. = bcell.use(chrgdeductamt)
-		if(status && bcell.charge < hitcost)
+		. = cell.use(chrgdeductamt)
+		if(status && cell.charge < hitcost)
 			//we're below minimum, turn off
 			status = 0
 			update_icon()
@@ -50,22 +50,22 @@
 /obj/item/weapon/melee/baton/update_icon()
 	if(status)
 		icon_state = "[initial(name)]_active"
-	else if(!bcell)
+	else if(!cell)
 		icon_state = "[initial(name)]_nocell"
 	else
 		icon_state = "[initial(name)]"
 
 /obj/item/weapon/melee/baton/examine(mob/user)
 	..()
-	if(bcell)
-		to_chat(user, "<span class='notice'>The baton is [round(bcell.percent())]% charged.</span>")
+	if(cell)
+		to_chat(user, "<span class='notice'>The baton is [round(cell.percent())]% charged.</span>")
 	else
-		to_chat(user, "<span class='warning'>The baton does not have a power source installed.</span>")
+		to_chat(user, "<span class='warning'>The baton does not have a power source installed.</span>")
 
 /obj/item/weapon/melee/baton/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/stock_parts/cell))
 		var/obj/item/weapon/stock_parts/cell/C = W
-		if(bcell)
+		if(cell)
 			to_chat(user, "<span class='notice'>[src] already has a cell.</span>")
 		else
 			if(C.maxcharge < hitcost)
@@ -73,15 +73,15 @@
 				return
 			if(!user.transferItemToLoc(W, src))
 				return
-			bcell = W
+			cell = W
 			to_chat(user, "<span class='notice'>You install a cell in [src].</span>")
 			update_icon()
 
 	else if(istype(W, /obj/item/weapon/screwdriver))
-		if(bcell)
-			bcell.updateicon()
-			bcell.loc = get_turf(src.loc)
-			bcell = null
+		if(cell)
+			cell.update_icon()
+			cell.forceMove(get_turf(src))
+			cell = null
 			to_chat(user, "<span class='notice'>You remove the cell from [src].</span>")
 			status = 0
 			update_icon()
@@ -89,13 +89,13 @@
 		return ..()
 
 /obj/item/weapon/melee/baton/attack_self(mob/user)
-	if(bcell && bcell.charge > hitcost)
+	if(cell && cell.charge > hitcost)
 		status = !status
 		to_chat(user, "<span class='notice'>[src] is now [status ? "on" : "off"].</span>")
 		playsound(loc, "sparks", 75, 1, -1)
 	else
 		status = 0
-		if(!bcell)
+		if(!cell)
 			to_chat(user, "<span class='warning'>[src] does not have a power source!</span>")
 		else
 			to_chat(user, "<span class='warning'>[src] is out of charge.</span>")
@@ -186,8 +186,8 @@
 	slot_flags = SLOT_BACK
 	var/obj/item/device/assembly/igniter/sparkler = 0
 
-/obj/item/weapon/melee/baton/cattleprod/Initialize()
-	. = ..()
+/obj/item/weapon/melee/baton/cattleprod/Initialize()
+	. = ..()
 	sparkler = new (src)
 
 /obj/item/weapon/melee/baton/cattleprod/baton_stun()

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

@@ -28,7 +28,7 @@
 
 /obj/item/weapon/melee/baton/cattleprod/attackby(obj/item/I, mob/user, params)//handles sticking a crystal onto a stunprod to make a teleprod
 	if(istype(I, /obj/item/weapon/ore/bluespace_crystal))
-		if(!bcell)
+		if(!cell)
 			var/obj/item/weapon/melee/baton/cattleprod/teleprod/S = new /obj/item/weapon/melee/baton/cattleprod/teleprod
 			remove_item_from_storage(user)
 			qdel(src)

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

@@ -66,6 +66,7 @@
 	materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
 	origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get
 	force = 8 //might or might not be too high, subject to change
+	w_class = WEIGHT_CLASS_SMALL
 	throwforce = 8
 	attack_verb = list("drilled", "screwed", "jabbed")
 	toolspeed = 0.25
@@ -188,6 +189,7 @@
 	materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
 	origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get
 	force = 8 //might or might not be too high, subject to change
+	w_class = WEIGHT_CLASS_SMALL
 	throwforce = 8
 	throw_speed = 2
 	throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far

code/game/objects/obj_defense.dm

@@ -259,3 +259,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
 		obj_break(damage_type)
 		return TRUE
 	return FALSE
+
+//returns how much the object blocks an explosion
+/obj/proc/GetExplosionBlock()
+	CRASH("Unimplemented GetExplosionBlock()")

code/game/objects/objs.dm

@@ -23,7 +23,7 @@
 
 	var/persistence_replacement //have something WAY too amazing to live to the next round? Set a new path here. Overuse of this var will make me upset.
 	var/unique_rename = FALSE // can you customize the description/name of the thing?
-
+
 	var/dangerous_possession = FALSE	//Admin possession yes/no
 
 /obj/vv_edit_var(vname, vval)
@@ -37,7 +37,7 @@
 	..()
 
 /obj/Initialize()
-	. = ..()
+	. = ..()
 	if (!armor)
 		armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
 	if(on_blueprints && isturf(loc))
@@ -182,7 +182,10 @@
 /obj/proc/check_uplink_validity()
 	return 1
 
-/obj/proc/on_mob_move(dir, mob)
+/obj/proc/on_mob_move(dir, mob, oldLoc)
+	return
+
+/obj/proc/on_mob_turn(dir, mob)
 	return
 
 /obj/vv_get_dropdown()
@@ -193,6 +196,6 @@
 	..()
 	if(unique_rename)
 		to_chat(user, "<span class='notice'>Use a pen on it to rename it or change its description.</span>")
-
-/obj/proc/gang_contraband_value()
-	return 0
+
+/obj/proc/gang_contraband_value()
+	return 0

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

@@ -26,6 +26,7 @@
 	new /obj/item/clothing/glasses/meson/engine(src)
 	new /obj/item/weapon/door_remote/chief_engineer(src)
 	new /obj/item/weapon/pipe_dispenser(src)
+	new /obj/item/weapon/inducer(src)
 
 /obj/structure/closet/secure_closet/engineering_electrical
 	name = "electrical supplies locker"
@@ -37,6 +38,8 @@
 	..()
 	new /obj/item/clothing/gloves/color/yellow(src)
 	new /obj/item/clothing/gloves/color/yellow(src)
+	new /obj/item/weapon/inducer(src)
+	new /obj/item/weapon/inducer(src)
 	for(var/i in 1 to 3)
 		new /obj/item/weapon/storage/toolbox/electrical(src)
 	for(var/i in 1 to 3)

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

@@ -84,6 +84,7 @@
 	new /obj/item/device/flashlight/seclite(src)
 	new /obj/item/weapon/pinpointer(src)
 	new /obj/item/clothing/under/rank/head_of_security/grey(src)
+	new /obj/item/clothing/under/rank/head_of_security/grey(src)
 	new /obj/item/weapon/storage/lockbox/secmedal(src)
 
 /obj/structure/closet/secure_closet/warden

code/game/objects/structures/grille.dm

@@ -248,6 +248,7 @@
 
 /obj/structure/grille/ratvar
 	icon_state = "ratvargrille"
+	name = "cog grille"
 	desc = "A strangely-shaped grille."
 	broken_type = /obj/structure/grille/ratvar/broken
 

code/game/objects/structures/lattice.dm

@@ -50,7 +50,7 @@
 		deconstruct()
 
 /obj/structure/lattice/clockwork
-	name = "clockwork lattice"
+	name = "cog lattice"
 	desc = "A lightweight support lattice. These hold the Justicar's station together."
 	icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi'
 

code/game/objects/structures/manned_turret.dm

@@ -0,0 +1,209 @@
+/////// MANNED TURRET ////////
+
+/obj/machinery/manned_turret
+	name = "machine gun turret"
+	desc = "While the trigger is held down, this gun will redistribute recoil to allow its user to easily shift targets."
+	icon = 'icons/obj/turrets.dmi'
+	icon_state = "machinegun"
+	can_buckle = TRUE
+	density = TRUE
+	max_integrity = 100
+	obj_integrity = 100
+	buckle_lying = FALSE
+	layer = ABOVE_MOB_LAYER
+	var/view_range = 10
+	var/cooldown = 0
+	var/projectile_type = /obj/item/projectile/bullet/weakbullet3
+	var/rate_of_fire = 1
+	var/number_of_shots = 40
+	var/cooldown_duration = 90
+	var/atom/target
+	var/turf/target_turf
+	var/warned = FALSE
+	var/list/calculated_projectile_vars
+
+/obj/machinery/manned_turret/Destroy()
+	target = null
+	target_turf = null
+	..()
+
+//BUCKLE HOOKS
+
+/obj/machinery/manned_turret/unbuckle_mob(mob/living/buckled_mob,force = FALSE)
+	playsound(src,'sound/mecha/mechmove01.ogg', 50, 1)
+	for(var/obj/item/I in buckled_mob.held_items)
+		if(istype(I, /obj/item/gun_control))
+			qdel(I)
+	if(istype(buckled_mob))
+		buckled_mob.pixel_x = 0
+		buckled_mob.pixel_y = 0
+		if(buckled_mob.client)
+			buckled_mob.reset_perspective()
+	anchored = FALSE
+	. = ..()
+	STOP_PROCESSING(SSfastprocess, src)
+
+/obj/machinery/manned_turret/user_buckle_mob(mob/living/M, mob/living/carbon/user)
+	if(user.incapacitated() || !istype(user))
+		return
+	M.forceMove(get_turf(src))
+	..()
+	for(var/V in M.held_items)
+		var/obj/item/I = V
+		if(istype(I))
+			if(M.dropItemToGround(I))
+				var/obj/item/gun_control/TC = new(src)
+				M.put_in_hands(TC)
+		else	//Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand
+			var/obj/item/gun_control/TC = new(src)
+			M.put_in_hands(TC)
+	M.pixel_y = 14
+	layer = ABOVE_MOB_LAYER
+	setDir(SOUTH)
+	playsound(src,'sound/mecha/mechmove01.ogg', 50, 1)
+	anchored = TRUE
+	if(user.client)
+		user.client.change_view(view_range)
+	START_PROCESSING(SSfastprocess, src)
+
+/obj/machinery/manned_turret/process()
+	if(!LAZYLEN(buckled_mobs))
+		return PROCESS_KILL
+	update_positioning()
+
+/obj/machinery/manned_turret/proc/update_positioning()
+	var/mob/living/controller = buckled_mobs[1]
+	if(!istype(controller))
+		return
+	var/client/C = controller.client
+	if(C)
+		var/atom/A = C.mouseObject
+		var/turf/T = get_turf(A)
+		if(istype(T))	//They're hovering over something in the map.
+			direction_track(controller, T)
+			calculated_projectile_vars = calculate_projectile_angle_and_pixel_offsets(controller, C.mouseParams)
+
+/obj/machinery/manned_turret/proc/direction_track(mob/user, atom/targeted)
+	setDir(get_dir(src,targeted))
+	user.setDir(dir)
+	switch(dir)
+		if(NORTH)
+			layer = BELOW_MOB_LAYER
+			user.pixel_x = 0
+			user.pixel_y = -14
+		if(NORTHEAST)
+			layer = BELOW_MOB_LAYER
+			user.pixel_x = -8
+			user.pixel_y = -4
+		if(EAST)
+			layer = ABOVE_MOB_LAYER
+			user.pixel_x = -14
+			user.pixel_y = 0
+		if(SOUTHEAST)
+			layer = BELOW_MOB_LAYER
+			user.pixel_x = -8
+			user.pixel_y = 4
+		if(SOUTH)
+			layer = ABOVE_MOB_LAYER
+			user.pixel_x = 0
+			user.pixel_y = 14
+		if(SOUTHWEST)
+			layer = BELOW_MOB_LAYER
+			user.pixel_x = 8
+			user.pixel_y = 4
+		if(WEST)
+			layer = ABOVE_MOB_LAYER
+			user.pixel_x = 14
+			user.pixel_y = 0
+		if(NORTHWEST)
+			layer = BELOW_MOB_LAYER
+			user.pixel_x = 8
+			user.pixel_y = -4
+
+/obj/machinery/manned_turret/proc/checkfire(atom/targeted_atom, mob/user)
+	target = targeted_atom
+	if(target == user || target == get_turf(src))
+		return
+	if(world.time < cooldown)
+		if(!warned && world.time > (cooldown - cooldown_duration + rate_of_fire*number_of_shots)) // To capture the window where one is done firing
+			warned = TRUE
+			playsound(src, 'sound/weapons/sear.ogg', 100, 1)
+		return
+	else
+		cooldown = world.time + cooldown_duration
+		warned = FALSE
+		volley(user)
+
+/obj/machinery/manned_turret/proc/volley(mob/user)
+	target_turf = get_turf(target)
+	for(var/i in 1 to number_of_shots)
+		addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper, user), i*rate_of_fire)
+
+/obj/machinery/manned_turret/proc/fire_helper(mob/user)
+	update_positioning()						//REFRESH MOUSE TRACKING!!
+	var/turf/targets_from = get_turf(src)
+	if(QDELETED(target))
+		target = target_turf
+	var/obj/item/projectile/P = new projectile_type(targets_from)
+	P.current = targets_from
+	P.starting = targets_from
+	P.firer = user
+	P.original = target
+	playsound(src, 'sound/weapons/Gunshot_smg.ogg', 75, 1)
+	P.xo = target.x - targets_from.x
+	P.yo = target.y - targets_from.y
+	P.Angle = calculated_projectile_vars[1] + rand(-9, 9)
+	P.p_x = calculated_projectile_vars[2]
+	P.p_y = calculated_projectile_vars[3]
+	P.fire()
+
+/obj/machinery/manned_turret/ultimate  // Admin-only proof of concept for autoclicker automatics
+	name = "Infinity Gun"
+	view_range = 12
+	projectile_type = /obj/item/projectile/bullet/weakbullet3
+
+/obj/machinery/manned_turret/ultimate/checkfire(atom/targeted_atom, mob/user)
+	target = targeted_atom
+	if(target == user || target == get_turf(src))
+		return
+	target_turf = get_turf(target)
+	fire_helper(user)
+
+/obj/item/gun_control
+	name = "turret controls"
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "offhand"
+	w_class = WEIGHT_CLASS_HUGE
+	flags = ABSTRACT | NODROP | NOBLUDGEON
+	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	var/obj/machinery/manned_turret/turret
+
+/obj/item/gun_control/Initialize()
+    . = ..()
+    turret = loc
+    if(!istype(turret))
+        return INITIALIZE_HINT_QDEL
+
+/obj/item/gun_control/Destroy()
+	turret = null
+	..()
+
+/obj/item/gun_control/CanItemAutoclick()
+	return TRUE
+
+/obj/item/gun_control/attack_obj(obj/O, mob/living/user)
+	user.changeNext_move(CLICK_CD_MELEE)
+	O.attacked_by(src, user)
+
+/obj/item/gun_control/attack(mob/living/M, mob/living/user)
+	user.lastattacked = M
+	M.lastattacker = user
+	M.attacked_by(src, user)
+	add_fingerprint(user)
+
+/obj/item/gun_control/afterattack(atom/targeted_atom, mob/user, flag, params)
+	..()
+	var/obj/machinery/manned_turret/E = user.buckled
+	E.calculated_projectile_vars = calculate_projectile_angle_and_pixel_offsets(user, params)
+	E.direction_track(user, targeted_atom)
+	E.checkfire(targeted_atom, user)

code/game/objects/structures/tables_racks.dm

@@ -195,7 +195,7 @@
 		check_break(M)
 
 /obj/structure/table/glass/proc/check_break(mob/living/M)
-	if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL)
+	if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & FLYING))
 		table_shatter(M)
 
 /obj/structure/table/glass/proc/table_shatter(mob/M)
@@ -271,20 +271,20 @@
 	frame = /obj/structure/table_frame
 	framestack = /obj/item/stack/rods
 	buildstack = /obj/item/stack/tile/carpet
-	canSmoothWith = list(/obj/structure/table/wood/fancy,/obj/structure/table/wood/fancy/black)
+	canSmoothWith = list(/obj/structure/table/wood/fancy,/obj/structure/table/wood/fancy/black)
 
 /obj/structure/table/wood/fancy/New()
 	icon = 'icons/obj/smooth_structures/fancy_table.dmi' //so that the tables place correctly in the map editor
 	..()
 
-/obj/structure/table/wood/fancy/black
-	icon_state = "fancy_table_black"
-	buildstack = /obj/item/stack/tile/carpet/black
-
-/obj/structure/table/wood/fancy/black/New()
-	..()
-	icon = 'icons/obj/smooth_structures/fancy_table_black.dmi'
-
+/obj/structure/table/wood/fancy/black
+	icon_state = "fancy_table_black"
+	buildstack = /obj/item/stack/tile/carpet/black
+
+/obj/structure/table/wood/fancy/black/New()
+	..()
+	icon = 'icons/obj/smooth_structures/fancy_table_black.dmi'
+
 /*
  * Reinforced tables
  */

code/game/objects/structures/watercloset.dm

@@ -480,8 +480,8 @@
 
 	if(istype(O, /obj/item/weapon/melee/baton))
 		var/obj/item/weapon/melee/baton/B = O
-		if(B.bcell)
-			if(B.bcell.charge > 0 && B.status == 1)
+		if(B.cell)
+			if(B.cell.charge > 0 && B.status == 1)
 				flick("baton_active", src)
 				var/stunforce = B.stunforce
 				user.Stun(stunforce)

code/game/objects/structures/window.dm

@@ -24,6 +24,7 @@
 	resistance_flags = ACID_PROOF
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 100)
 	CanAtmosPass = ATMOS_PASS_PROC
+	var/real_explosion_block	//ignore this, just use explosion_block
 
 /obj/structure/window/examine(mob/user)
 	..()
@@ -73,6 +74,10 @@
 	if(rods)
 		debris += new /obj/item/stack/rods(src, rods)
 
+	//windows only block while reinforced and fulltile, so we'll use the proc
+	real_explosion_block = explosion_block
+	explosion_block = EXPLOSION_BLOCK_PROC
+
 /obj/structure/window/rcd_vals(mob/user, obj/item/weapon/construction/rcd/the_rcd)
 	switch(the_rcd.mode)
 		if(RCD_DECONSTRUCT)
@@ -400,6 +405,10 @@
 
 	return 1
 
+/obj/structure/window/GetExplosionBlock()
+	return reinf && fulltile ? real_explosion_block : 0
+
+
 /obj/structure/window/unanchored
 	anchored = FALSE