Merge tgstation13 r4570 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/defines/procs/helpers.dm
	code/defines/turf.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/master_controller.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/item.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/wires.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/unused/toilets.dm
	html/changelog.html
	icons/effects/alert.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/projectiles/guns/energy/special.dm

@@ -28,7 +28,7 @@
 
 obj/item/weapon/gun/energy/staff
 	name = "staff of change"
-	desc = "an artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
+	desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
 	icon = 'icons/obj/gun.dmi'
 	icon_state = "staffofchange"
 	item_state = "staffofchange"
@@ -66,7 +66,7 @@ obj/item/weapon/gun/energy/staff
 	name = "floral somatoray"
 	desc = "A tool that discharges controlled radiation which induces mutation in plant cells."
 	icon_state = "floramut100"
-	item_state = "gun"
+	item_state = "obj/item/gun.dmi"
 	fire_sound = 'sound/effects/stealthoff.ogg'
 	charge_cost = 100
 	projectile_type = "/obj/item/projectile/energy/floramut"
@@ -109,4 +109,45 @@ obj/item/weapon/gun/energy/staff
 				projectile_type = "/obj/item/projectile/energy/floramut"
 				modifystate = "floramut"
 		update_icon()
-		return
+		return
+
+/obj/item/weapon/gun/energy/meteorgun
+	name = "meteor gun"
+	desc = "For the love of god, make sure you're aiming this the right way!"
+	icon_state = "riotgun"
+	item_state = "c20r"
+	w_class = 4
+	projectile_type = "/obj/item/projectile/meteor"
+	charge_cost = 100
+	cell_type = "/obj/item/weapon/cell/potato"
+	clumsy_check = 0 //Admin spawn only, might as well let clowns use it.
+	var/charge_tick = 0
+	var/recharge_time = 5 //Time it takes for shots to recharge (in ticks)
+
+	New()
+		..()
+		processing_objects.Add(src)
+
+
+	Del()
+		processing_objects.Remove(src)
+		..()
+
+	process()
+		charge_tick++
+		if(charge_tick < recharge_time) return 0
+		charge_tick = 0
+		if(!power_supply) return 0
+		power_supply.give(100)
+
+	update_icon()
+		return
+
+
+/obj/item/weapon/gun/energy/meteorgun/pen
+	name = "meteor pen"
+	desc = "The pen is mightier than the sword."
+	icon = 'icons/obj/bureaucracy.dmi'
+	icon_state = "pen"
+	item_state = "pen"
+	w_class = 1

code/modules/projectiles/guns/energy/stun.dm

@@ -17,7 +17,7 @@
 	projectile_type = "/obj/item/projectile/energy/electrode"
 	cell_type = "/obj/item/weapon/cell/secborg"
 	var/charge_tick = 0
-	var/recharge_time = 10 //Time it takes for shots to recharge (in seconds)
+	var/recharge_time = 10 //Time it takes for shots to recharge (in ticks)
 
 	New()
 		..()
@@ -28,7 +28,7 @@
 		processing_objects.Remove(src)
 		..()
 
-	process() //Every [recharge_time] seconds, recharge a shot for the cyborg
+	process() //Every [recharge_time] ticks, recharge a shot for the cyborg
 		charge_tick++
 		if(charge_tick < recharge_time) return 0
 		charge_tick = 0

code/modules/projectiles/guns/projectile/revolver.dm

@@ -105,6 +105,10 @@
 
 /obj/item/weapon/gun/projectile/russian/attack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj)
 
+	if(!loaded.len)
+		user.visible_message("\red *click*", "\red *click*")
+		return
+
 	if(isliving(target) && isliving(user))
 		if(target == user)
 			var/datum/organ/external/affecting = user.zone_sel.selecting

code/modules/projectiles/projectile/special.dm

@@ -39,6 +39,36 @@
 			M.bodytemperature = temperature
 		return 1
 
+/obj/item/projectile/meteor
+	name = "meteor"
+	icon = 'icons/obj/meteor.dmi'
+	icon_state = "smallf"
+	damage = 0
+	damage_type = BRUTE
+	nodamage = 1
+	flag = "bullet"
+
+	Bump(atom/A as mob|obj|turf|area)
+		if(A == firer)
+			loc = A.loc
+			return
+
+		sleep(-1) //Might not be important enough for a sleep(-1) but the sleep/spawn itself is necessary thanks to explosions and metoerhits
+
+		if(src)//Do not add to this if() statement, otherwise the meteor won't delete them
+			if(A)
+
+				A.meteorhit(src)
+				playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1)
+
+				for(var/mob/M in range(10, src))
+					if(!M.stat && !istype(M, /mob/living/silicon/ai))\
+						shake_camera(M, 3, 1)
+				del(src)
+				return 1
+		else
+			return 0
+
 /obj/item/projectile/energy/floramut
 	name = "alpha somatoray"
 	icon_state = "energy"
@@ -50,7 +80,7 @@
 	on_hit(var/atom/target, var/blocked = 0)
 		var/mob/living/M = target
 		if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //Plantmen possibly get mutated and damaged by the rays.
-			var/mob/living/L as mob
+			var/mob/living/L = target
 			if(prob(15))
 				L.apply_effect((rand(30,80)),IRRADIATE)
 				L.Weaken(5)