Organs:

Moved into their own folder and got split into three files. Damage zones have been regrouped slightly to make it easier to deal with them. Currently the organ groups are head, l/r leg, l/r arm, and head. Attacking: Armor is properly checked. Currently aiming for the chest gives a higher chance to stun whereas the head will stun for longer. Stungloves/Disarm now show up in the attack log. Stungloves ignore intent. Silicon: AI units can now move between cams that are not on the ss13 network. Cyborg's alert screen should not longer pop up every time they get an alert if they have opened it once during the round. Robot vision now uses the standard amount of energy. Gamemodes: Added Deuryn's unrev message. Runes can only be examined if you are close to them. Moved the Loyalty implants to the HoS' locker at the request of HerpA. Nuke agents now come with explosive implants that will activate upon death. Projectiles: Once again went though the gun code and cleaned things up, it is much better now. Bullet_act fixed up and most mobs now use the one in living, just overload it if they need to do something diff. Freeze /caplaser/xbow no longer have an infinite loop. Shotguns have to be pumped manually. Went though the latest runtime log. Power cells now use return on their give/use procs Assemblies have been reworked and are nearly finished, just need to finish up the special assembly code, redo the signalers, and add one or two new assembly items. Laying down will now only take 3 ticks to get up, from 5. You can no longer punch people on the spawn screen. This is a big one and was cleared by two heads, TK will only allow you to pick up items. If you have an item in your hand it will act normal. This revision got much larger than originally intended my tests show everything is working fine, but you never know. Ill likely do more mob teaks in the next few days. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2333 316c924e-a436-60f5-8080-3fe189b3f50e
2026-01-14 19:34:03 +00:00 · 2011-10-08 10:38:01 +00:00
parent ad80137505
commit 62e28c2abf
148 changed files with 6638 additions and 8653 deletions
--- a/code/game/objects/bombspawner.dm
+++ b/code/game/objects/bombspawner.dm
@@ -138,19 +138,17 @@
 			var/obj/item/weapon/tank/plasma/PT = new(V)
 			var/obj/item/weapon/tank/oxygen/OT = new(V)

-			var/obj/item/device/radio/signaler/S = new(V)
+			var/obj/item/device/assembly/signaler/S = new(V)

 			V.tank_one = PT
 			V.tank_two = OT
 			V.attached_device = S

 			S.holder = V
-			S.Secure()
+			S.toggle_secure()
 			PT.master = V
 			OT.master = V

-			S.b_stat = 0
-
 			PT.air_contents.temperature = btemp1 + T0C
 			OT.air_contents.temperature = btemp2 + T0C

@@ -163,14 +161,14 @@
 			var/obj/item/weapon/tank/plasma/PT = new(V)
 			var/obj/item/weapon/tank/oxygen/OT = new(V)

-			var/obj/item/device/prox_sensor/P = new(V)
+			var/obj/item/device/assembly/prox_sensor/P = new(V)

 			V.tank_one = PT
 			V.tank_two = OT
 			V.attached_device = P

 			P.holder = V
-			P.Secure()
+			P.toggle_secure()
 			PT.master = V
 			OT.master = V

@@ -187,14 +185,14 @@
 			var/obj/item/weapon/tank/plasma/PT = new(V)
 			var/obj/item/weapon/tank/oxygen/OT = new(V)

-			var/obj/item/device/timer/T = new(V)
+			var/obj/item/device/assembly/timer/T = new(V)

 			V.tank_one = PT
 			V.tank_two = OT
 			V.attached_device = T

 			T.holder = V
-			T.Secure()
+			T.toggle_secure()
 			PT.master = V
 			OT.master = V
 			T.time = 30
--- a/code/game/objects/closets/nuclear.dm
+++ b/code/game/objects/closets/nuclear.dm
@@ -6,9 +6,9 @@
 	new /obj/item/ammo_magazine/c45( src )
 	new /obj/item/weapon/storage/handcuff_kit( src )
 	new /obj/item/weapon/storage/flashbang_kit( src )
-	new /obj/item/weapon/gun/energy( src )
-	new /obj/item/weapon/gun/energy( src )
-	new /obj/item/weapon/gun/energy( src )
+	new /obj/item/weapon/gun/energy/gun( src )
+	new /obj/item/weapon/gun/energy/gun( src )
+	new /obj/item/weapon/gun/energy/gun( src )
 	new /obj/item/weapon/pinpointer( src )
 	new /obj/item/weapon/pinpointer( src )
 	new /obj/item/weapon/pinpointer( src )
--- a/code/game/objects/closets/secure/medical.dm
+++ b/code/game/objects/closets/secure/medical.dm
@@ -98,7 +98,7 @@
 	New()
 		..()
 		sleep(2)
-		new /obj/item/device/radio/signaler(src)
+		new /obj/item/device/assembly/signaler(src)
 		new /obj/item/device/radio/electropack(src)
 		new /obj/item/device/radio/electropack(src)
 		new /obj/item/device/radio/electropack(src)
--- a/code/game/objects/closets/secure/personal.dm
+++ b/code/game/objects/closets/secure/personal.dm
@@ -4,8 +4,6 @@
 /obj/structure/secure_closet/personal/New()
 	..()
 	spawn(2)
-		new /obj/item/device/radio/signaler( src )
-		new /obj/item/weapon/pen( src )
 		new /obj/item/weapon/storage/backpack( src )
 		new /obj/item/device/radio/headset( src )
 	return
@@ -24,25 +22,19 @@
 			src.MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet
 		user.drop_item()
 		if (W) W.loc = src.loc
-	else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
-		if(istype(W, /obj/item/device/pda))
-			var/obj/item/device/pda/pda = W
-			W = pda.id
+	else if(istype(W, /obj/item/weapon/card/id))
 		if(src.broken)
 			user << "\red It appears to be broken."
 			return
 		var/obj/item/weapon/card/id/I = W
-		if (src.allowed(user) || !src.registered || (istype(I) && (src.registered == I.registered)))
+		if(!I || !I.registered)	return
+		if(src.allowed(user) || !src.registered || (istype(I) && (src.registered == I.registered)))
 			//they can open all lockers, or nobody owns this, or they own this locker
 			src.locked = !( src.locked )
-			for(var/mob/O in viewers(user, 3))
-				if ((O.client && !( O.blinded )))
-					O << text("\blue The locker has been []locked by [].", (src.locked ? null : "un"), user)
-			if(src.locked)
-				src.icon_state = src.icon_locked
-			else
-				src.icon_state = src.icon_closed
-			if (!src.registered)
+			if(src.locked)	src.icon_state = src.icon_locked
+			else	src.icon_state = src.icon_closed
+
+			if(!src.registered)
 				src.registered = I.registered
 				src.desc = "Owned by [I.registered]."
 		else
@@ -60,9 +52,6 @@
 			playsound(src.loc, "sparks", 50, 1)
 			for(var/mob/O in viewers(user, 3))
 				O.show_message(text("\blue The locker has been sliced open by [] with an energy blade!", user), 1, text("\red You hear metal being sliced and sparks flying."), 2)
-		else
-			for(var/mob/O in viewers(user, 3))
-				O.show_message(text("\blue The locker has been broken by [] with an electromagnetic card!", user), 1, text("You hear a faint electrical spark."), 2)
 	else
 		user << "\red Access Denied"
 	return
--- a/code/game/objects/closets/secure/security.dm
+++ b/code/game/objects/closets/secure/security.dm
@@ -15,7 +15,7 @@
 		new /obj/item/clothing/shoes/brown( src )
 		new /obj/item/device/radio/headset/heads/captain( src )
 		new /obj/item/weapon/reagent_containers/food/drinks/flask(src)
-		new /obj/item/weapon/gun/energy( src )
+		new /obj/item/weapon/gun/energy/gun( src )
 		return


@@ -35,7 +35,7 @@
 		new /obj/item/clothing/shoes/brown(src)
 		new /obj/item/weapon/storage/id_kit(src)
 		new /obj/item/weapon/storage/id_kit( src )
-		new /obj/item/weapon/gun/energy(src)
+		new /obj/item/weapon/gun/energy/gun(src)
 		new /obj/item/device/flash(src)
 		new /obj/item/clothing/glasses/sunglasses(src)
 		return
@@ -55,10 +55,11 @@
 		new /obj/item/clothing/head/helmet(src)
 		new /obj/item/device/radio/headset/heads/hos(src)
 		new /obj/item/weapon/shield/riot(src)
-		new /obj/item/weapon/gun/energy(src)
+		new /obj/item/weapon/gun/energy/gun(src)
 		new /obj/item/device/flash(src)
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)
 		new /obj/item/weapon/storage/flashbang_kit(src)
+		new /obj/item/weapon/storage/lockbox/loyalty()
 		new /obj/item/weapon/melee/baton(src)
 		return

--- a/code/game/objects/devices/scanners.dm
+++ b/code/game/objects/devices/scanners.dm
@@ -103,10 +103,12 @@ MASS SPECTROMETER

 /obj/item/device/detective_scanner/attack(mob/living/carbon/human/M as mob, mob/user as mob)

-	if (!istype(M))
+	if (!ishuman(M))
 		user << "\red [M] is not humas and cannot have the fingerprints."
+		return 0
 	if (( !( istype(M.dna, /datum/dna) ) || M.gloves) )
 		user << "\blue No fingerprints found on [M]"
+		return 0
 	else
 		if ((src.amount < 1 && src.printing))
 			user << text("\blue Fingerprints scanned on [M]. Need more cards to print.")
--- a/code/game/objects/effect_system.dm
+++ b/code/game/objects/effect_system.dm
@@ -335,8 +335,7 @@ steam.start() -- spawns the effect
 	if(air_group || (height==0)) return 1
 	if(istype(mover, /obj/item/projectile/beam))
 		var/obj/item/projectile/beam/B = mover
-		B.damage = 10//testing, will just hardcode for now
-		B.mobdamage = new/list(BRUTE = 0 , BURN = 10, TOX = 0, OXY = 0, CLONE = 0)
+		B.damage = (B.damage/2)
 	return 1


--- a/code/game/objects/items/clothing/powerarmor.dm
+++ b/code/game/objects/items/clothing/powerarmor.dm
@@ -8,12 +8,12 @@
 	protective_temperature = 1000
 	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
-	armor = list(melee = 40, bullet = 30, laser = 20, taser = 15, bomb = 25, bio = 10, rad = 10)
+	armor = list(melee = 40, bullet = 30, laser = 20,energy = 15, bomb = 25, bio = 10, rad = 10)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/gun,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
 	slowdown = 9
 	var/fuel = 0

-	var/list/togglearmor = list(melee = 90, bullet = 70, laser = 60, taser = 40, bomb = 75, bio = 75, rad = 75)
+	var/list/togglearmor = list(melee = 90, bullet = 70, laser = 60,energy = 40, bomb = 75, bio = 75, rad = 75)
 	var/active = 0

 	var/helmrequired = 1
@@ -199,7 +199,7 @@
 	flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH
 	see_face = 0.0
 	item_state = "swat"
-	armor = list(melee = 40, bullet = 30, laser = 20, taser = 15, bomb = 25, bio = 10, rad = 10)
+	armor = list(melee = 40, bullet = 30, laser = 20,energy = 15, bomb = 25, bio = 10, rad = 10)
 	var/obj/item/clothing/suit/powered/parent

 	proc/atmotoggle()
@@ -237,7 +237,7 @@
 	desc = "Not for rookies."
 	flags = FPRINT | TABLEPASS
 	item_state = "swat"
-	armor = list(melee = 40, bullet = 30, laser = 20, taser = 15, bomb = 25, bio = 10, rad = 10)
+	armor = list(melee = 40, bullet = 30, laser = 20,energy = 15, bomb = 25, bio = 10, rad = 10)

 /obj/item/clothing/shoes/powered
 	name = "Powered armor"
@@ -245,7 +245,7 @@
 	desc = "Not for rookies."
 	flags = FPRINT | TABLEPASS
 	item_state = "swat"
-	armor = list(melee = 40, bullet = 30, laser = 20, taser = 15, bomb = 25, bio = 10, rad = 10)
+	armor = list(melee = 40, bullet = 30, laser = 20,energy = 15, bomb = 25, bio = 10, rad = 10)


 obj/item/clothing/suit/powered/spawnable/badmin
--- a/code/game/objects/items/clothing/powerarmorcomponents.dm
+++ b/code/game/objects/items/clothing/powerarmorcomponents.dm
@@ -90,7 +90,7 @@
 /obj/item/powerarmor/reactive
 	name = "Adminbus power armor reactive plating"
 	desc = "Made with the rare Badminium molecule."
-	var/list/togglearmor = list(melee = 250, bullet = 100, laser = 100, taser = 100, bomb = 100, bio = 100, rad = 100)
+	var/list/togglearmor = list(melee = 250, bullet = 100, laser = 100,energy = 100, bomb = 100, bio = 100, rad = 100)
 	 //Good lord an active energy axe does 150 damage a swing? Anyway, barring var editing, this armor loadout should be impervious to anything. Enjoy, badmins~ --NEO

 	toggle(sudden = 0)
@@ -116,7 +116,7 @@
 	centcomm
 		name = "CentComm power armor reactive plating"
 		desc = "Pretty effective against everything, not perfect though."
-		togglearmor = list(melee = 90, bullet = 70, laser = 60, taser = 40, bomb = 75, bio = 75, rad = 75)
+		togglearmor = list(melee = 90, bullet = 70, laser = 60,energy = 40, bomb = 75, bio = 75, rad = 75)
 		slowdown = 2


@@ -149,24 +149,20 @@
 				parent.gas_transfer_coefficient = 1
 				parent.permeability_coefficient = 1
 				parent.heat_transfer_coefficient = 1
-				parent.radiation_protection = 0
 				parent.flags &= ~SUITSPACE
 				if(parent.helmrequired)
 					parent.helm.gas_transfer_coefficient = 1
 					parent.helm.permeability_coefficient = 1
 					parent.helm.heat_transfer_coefficient = 1
-					parent.helm.radiation_protection = 0
 					parent.helm.flags &= ~HEADSPACE
 				if(parent.glovesrequired)
 					parent.gloves.gas_transfer_coefficient = 1
 					parent.gloves.permeability_coefficient = 1
 					parent.gloves.heat_transfer_coefficient = 1
-					parent.gloves.radiation_protection = 0
 				if(parent.shoesrequired)
 					parent.shoes.gas_transfer_coefficient = 1
 					parent.shoes.permeability_coefficient = 1
 					parent.shoes.heat_transfer_coefficient = 1
-					parent.shoes.radiation_protection = 0
 				sealed = 0

 			if(0)
@@ -174,24 +170,20 @@
 				parent.gas_transfer_coefficient = 0.01
 				parent.permeability_coefficient = 0.02
 				parent.heat_transfer_coefficient = 0.02
-				parent.radiation_protection = 0.75
 				parent.flags |= SUITSPACE
 				if(parent.helmrequired)
 					parent.helm.gas_transfer_coefficient = 0.01
 					parent.helm.permeability_coefficient = 0.02
 					parent.helm.heat_transfer_coefficient = 0.02
-					parent.helm.radiation_protection = 0.75
 					parent.helm.flags |= HEADSPACE
 				if(parent.glovesrequired)
 					parent.gloves.gas_transfer_coefficient = 0.01
 					parent.gloves.permeability_coefficient = 0.02
 					parent.gloves.heat_transfer_coefficient = 0.02
-					parent.gloves.radiation_protection = 0.75
 				if(parent.shoesrequired)
 					parent.shoes.gas_transfer_coefficient = 0.01
 					parent.shoes.permeability_coefficient = 0.02
 					parent.shoes.heat_transfer_coefficient = 0.02
-					parent.shoes.radiation_protection = 0.75
 				sealed = 1

 	adminbus
@@ -221,7 +213,6 @@
 					parent.helm.gas_transfer_coefficient = 0.01
 					parent.helm.permeability_coefficient = 0.02
 					parent.helm.heat_transfer_coefficient = 0.02
-					parent.helm.radiation_protection = 0.75
 					parent.helm.flags |= HEADSPACE
 					user << "\blue Helmet atmospheric seals engaged."
 					if(manual)
@@ -234,7 +225,6 @@
 					parent.helm.gas_transfer_coefficient = 1
 					parent.helm.permeability_coefficient = 1
 					parent.helm.heat_transfer_coefficient = 1
-					parent.helm.radiation_protection = 0
 					parent.helm.flags &= ~HEADSPACE
 					if(manual)
 						for (var/armorvar in helm.armor)
--- a/code/game/objects/items/item.dm
+++ b/code/game/objects/items/item.dm
@@ -307,146 +307,8 @@



-	if (istype(M, /mob/living/carbon/human))
-		var/mob/living/carbon/human/H = M
-		if (ishuman(user) || isrobot(user) || ismonkey(user) || isalien(user))
-			if (!( def_zone ))
-				var/mob/user2 = user
-				var/t = user2:zone_sel.selecting
-				if ((t in list( "eyes", "mouth" )))
-					t = "head"
-				def_zone = ran_zone(t)
-		var/datum/organ/external/affecting
-		if (H.organs[text("[]", def_zone)])
-			affecting = H.organs[text("[]", def_zone)]
-		var/hit_area = parse_zone(def_zone)
-
-		var/list/armor = H.getarmor(affecting, "melee")
-		//Grabbing the set of clothing that offers the best protective value against melee attacks to that area. --NEO
-
-		for(var/mob/O in viewers(M, null))
-			O.show_message(text("\red <B>[] has been attacked in the [] with [][] </B>", M, hit_area, src, (user ? text(" by [].", user) : ".")), 1)
-		if (istype(affecting, /datum/organ/external))
-			var/b_dam = (src.damtype == "brute" ? src.force : 0)
-			var/f_dam = (src.damtype == "fire" ? src.force : 0)
-			if (M.mutations & COLD_RESISTANCE)
-				f_dam = 0
-			if (def_zone == "head")
-				if (b_dam && prob(armor["armor"] - src.force))
-					if (prob(20))
-						affecting.take_damage(power, 0)
-					else
-						H.show_message("\red Your [armor["clothes"]] has protected you from a hit to the head.")
-					return
-				if ((b_dam && prob(src.force + affecting.brute_dam + affecting.burn_dam)))
-					var/time = rand(10, 120)
-					if (prob(90))
-						if (H.paralysis < time)
-							H.paralysis = time
-					else
-						if (H.weakened < time)
-							H.weakened = time
-					if(H.stat != 2)	H.stat = 1
-					for(var/mob/O in viewers(M, null))
-						O.show_message(text("\red <B>[] has been knocked unconscious!</B>", H), 1, "\red You hear someone fall.", 2)
-					if (prob(50))
-						if (/*ticker.mode.name == "revolution" && */ M != user)
-							ticker.mode.remove_revolutionary(H.mind)
-				if (b_dam && prob(25 + (b_dam * 2)))
-					src.add_blood(H)
-					if (prob(33))
-						var/turf/location = H.loc
-						if (istype(location, /turf/simulated))
-							location.add_blood(H)
-					if (H.wear_mask)
-						H.wear_mask.add_blood(H)
-					if (H.head)
-						H.head.add_blood(H)
-					if (H.glasses && prob(33))
-						H.glasses.add_blood(H)
-					if (istype(user, /mob/living/carbon/human))
-						var/mob/living/carbon/human/user2 = user
-						if (user2.gloves)
-							user2.gloves.add_blood(H)
-						else
-							user2.add_blood(H)
-						if (prob(15))
-							if (user2.wear_suit)
-								user2.wear_suit.add_blood(H)
-							else if (user2.w_uniform)
-								user2.w_uniform.add_blood(H)
-				affecting.take_damage(b_dam, f_dam)
-			else if (def_zone == "chest" || def_zone == "groin")
-				if (b_dam && prob(armor["armor"] - src.force))
-					H.show_message("\red Your [armor["clothes"]] has protected you from a hit to the [affecting.name].")
-					return
-				if (b_dam && ((istype(H.r_hand, /obj/item/weapon/shield/riot))) && prob(90 - src.force))
-					H.show_message("\red You have been protected from a hit to the [affecting.name].")
-					return
-				if (b_dam && ((istype(H.l_hand, /obj/item/weapon/shield/riot))) && prob(90 - src.force))
-					H.show_message("\red You have been protected from a hit to the [affecting.name].")
-					return
-				if ((b_dam && prob(src.force + affecting.brute_dam + affecting.burn_dam)))
-					if (prob(50))
-						if (H.weakened < 5)
-							H.weakened = 5
-						for(var/mob/O in viewers(H, null))
-							O.show_message(text("\red <B>[] has been knocked down!</B>", H), 1, "\red You hear someone fall.", 2)
-					else
-						if (H.stunned < 2)
-							H.stunned = 2
-						for(var/mob/O in viewers(H, null))
-							O.show_message(text("\red <B>[] has been stunned!</B>", H), 1)
-						if(H.stat != 2)	H.stat = 1
-				if (b_dam && prob(25 + (b_dam * 2)))
-					src.add_blood(H)
-					if (prob(33))
-						var/turf/location = H.loc
-						if (istype(location, /turf/simulated))
-							location.add_blood(H)
-					if (H.wear_suit)
-						H.wear_suit.add_blood(H)
-					if (H.w_uniform)
-						H.w_uniform.add_blood(H)
-					if (istype(user, /mob/living/carbon/human))
-						var/mob/living/carbon/human/user2 = user
-						if (user2.gloves)
-							user2.gloves.add_blood(H)
-						else
-							user2.add_blood(H)
-						if (prob(15))
-							if (user2.wear_suit)
-								user2.wear_suit.add_blood(H)
-							else if (user2.w_uniform)
-								user2.w_uniform.add_blood(H)
-				affecting.take_damage(b_dam, f_dam)
-			else
-				if (b_dam && prob(armor["armor"] - src.force))
-					H.show_message("\red Your [armor["clothes"]] has protected you from a hit to the [affecting.name].")
-					return
-				if (b_dam && prob(25 + (b_dam * 2)))
-					src.add_blood(H)
-					if (prob(33))
-						var/turf/location = H.loc
-						if (istype(location, /turf/simulated))
-							location.add_blood(H)
-					if (H.wear_suit)
-						H.wear_suit.add_blood(H)
-					if (H.w_uniform)
-						H.w_uniform.add_blood(H)
-					if (istype(user, /mob/living/carbon/human))
-						var/mob/living/carbon/human/user2 = user
-						if (user2.gloves)
-							user2.gloves.add_blood(H)
-						else
-							user2.add_blood(H)
-						if (prob(15))
-							if (user2.wear_suit)
-								user2.wear_suit.add_blood(H)
-							else if (user2.w_uniform)
-								user2.w_uniform.add_blood(H)
-				affecting.take_damage(b_dam, f_dam)
-		H.UpdateDamageIcon()                     ///Only reference I can find on the attack() proc actually changing mob icon -Agouri
+	if(istype(M, /mob/living/carbon/human))
+		M:attacked_by(src, user, def_zone)
 	else
 		switch(src.damtype)
 			if("brute")
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -45,11 +45,11 @@ BIKE HORN

 /obj/item/weapon/soap/afterattack(atom/target, mob/user as mob)
 	if(istype(target,/obj/effect/decal/cleanable))
-		del(target)
 		user << "\blue You scrub the [target.name] out."
+		del(target)
 	else
-		target.clean_blood()
 		user << "\blue You clean the [target.name]."
+		target.clean_blood()
 	return

 /obj/item/weapon/bikehorn/attack_self(mob/user as mob)
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -2,7 +2,7 @@
 	..()
 	weldtool = new/obj/item/weapon/weldingtool(src)
 	weldtool.status = 0
-	igniter = new/obj/item/device/igniter(src)
+	igniter = new/obj/item/device/assembly/igniter(src)
 	igniter.secured = 0
 	src.status = 1
 	update_icon()
@@ -31,7 +31,7 @@
 		operating = 0//cooldown
 		turf/previousturf = null
 		obj/item/weapon/weldingtool/weldtool = null
-		obj/item/device/igniter/igniter = null
+		obj/item/device/assembly/igniter/igniter = null
 		obj/item/weapon/tank/plasma/ptank = null


@@ -103,8 +103,8 @@
 			update_icon()
 			return

-		if(istype(W, /obj/item/device/igniter))
-			var/obj/item/device/igniter/I = W
+		if(isigniter(W))
+			var/obj/item/device/assembly/igniter/I = W
 			if(I.secured)	return 0
 			user.remove_from_mob(I)
 			I.loc = src
--- a/code/game/objects/items/weapons/guns_new.dm
+++ b/code/game/objects/items/weapons/guns_new.dm
@@ -1 +0,0 @@
-
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -110,7 +110,7 @@ Implant Specifics:<BR>"}

 	activate(var/cause)
 		if((!cause) || (!src.imp_in))	return 0
-		explosion(src, -1, 0, 1, 3, 0)//This might be a bit much, dono will have to see.
+		explosion(src, -1, 0, 2, 3, 0)//This might be a bit much, dono will have to see.
 		if(src.imp_in)
 			src.imp_in.gib()

--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -191,7 +191,7 @@ STUN BATON
 		user.weakened = max(3 * force, user.weakened)
 		if(ishuman(user))
 			var/mob/living/carbon/human/H = user
-			H.TakeDamage("head", 2 * force, 0)
+			H.apply_damage(2*force, BRUTE, "head")
 		else
 			user.take_organ_damage(2*force)
 		return
--- a/code/game/objects/toys.dm
+++ b/code/game/objects/toys.dm
@@ -167,24 +167,31 @@ CRAYONS
 	layer = 2.1
 	anchored = 1

-/obj/effect/decal/cleanable/crayon/New(location,main = "#FFFFFF",shade = "#000000",var/type = "rune")
-	..()
-	loc = location

-	name = type
-	desc = "A [type] drawn in crayon."
+	examine()
+		set src in view(2)
+		..()
+		return

-	switch(type)
-		if("rune")
-			type = "rune[rand(1,6)]"
-		if("graffiti")
-			type = pick("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa")

-	var/icon/mainOverlay = new/icon('crayondecal.dmi',"[type]",2.1)
-	var/icon/shadeOverlay = new/icon('crayondecal.dmi',"[type]s",2.1)
+	New(location,main = "#FFFFFF",shade = "#000000",var/type = "rune")
+		..()
+		loc = location

-	mainOverlay.Blend(main,ICON_ADD)
-	shadeOverlay.Blend(shade,ICON_ADD)
+		name = type
+		desc = "A [type] drawn in crayon."

-	overlays += mainOverlay
-	overlays += shadeOverlay
+		switch(type)
+			if("rune")
+				type = "rune[rand(1,6)]"
+			if("graffiti")
+				type = pick("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa")
+
+		var/icon/mainOverlay = new/icon('crayondecal.dmi',"[type]",2.1)
+		var/icon/shadeOverlay = new/icon('crayondecal.dmi',"[type]s",2.1)
+
+		mainOverlay.Blend(main,ICON_ADD)
+		shadeOverlay.Blend(shade,ICON_ADD)
+
+		overlays += mainOverlay
+		overlays += shadeOverlay
--- a/code/game/objects/transfer_valve.dm
+++ b/code/game/objects/transfer_valve.dm
@@ -35,19 +35,20 @@

 			update_icon()
 //TODO: Have this take an assemblyholder
-		else if(item.IsAssembly())
-			if(item:secured)
+		else if(isassembly(item))
+			var/obj/item/device/assembly/A = item
+			if(A.secured)
 				user << "\red The device is secured!"
 				return
 			if(attached_device)
 				user << "\red There is already an device attached to the valve, remove it first!"
 				return
 			user.remove_from_mob(item)
-			attached_device = item
-			item.loc = src
+			attached_device = A
+			A.loc = src
 			user << "\blue You attach the [item] to the valve controls and secure it!"
-			item:holder = src
-			item:Secure()
+			A.holder = src
+			A.toggle_secure()

 			bombers += "[key_name(user)] attached a [item] to a transfer valve."
 			message_admins("[key_name_admin(user)] attached a [item] to a transfer valve.")