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/paperwork/pen.dm

@@ -1,3 +1,14 @@
+/* Pens!
+ * Contains:
+ *		Pens
+ *		Sleepy Pens
+ *		Parapens
+ */
+
+
+/*
+ * Pens
+ */
 /obj/item/weapon/pen
 	desc = "It's a normal black ink pen."
 	name = "pen"
@@ -32,4 +43,69 @@
 /obj/item/weapon/pen/invisble
 	desc = "It's an invisble pen marker."
 	icon_state = "pen"
-	colour = "white"
+	colour = "white"
+
+
+/obj/item/weapon/pen/attack(mob/M as mob, mob/user as mob)
+	if(!ismob(M))
+		return
+	user << "\red You stab [M] with the pen."
+	M << "\red You feel a tiny prick!"
+	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been stabbed with [src.name]  by [user.name] ([user.ckey])</font>")
+	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to stab [M.name] ([M.ckey])</font>")
+
+	log_attack("<font color='red'>[user.name] ([user.ckey]) Used the [src.name] to stab [M.name] ([M.ckey])</font>")
+	return
+
+/*
+ * Sleepy Pens
+ */
+/obj/item/weapon/pen/sleepypen
+	origin_tech = "syndicate=5"
+
+/obj/item/weapon/pen/sleepypen/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+	return
+
+/obj/item/weapon/pen/sleepypen/New()
+	var/datum/reagents/R = new/datum/reagents(30) //Used to be 300
+	reagents = R
+	R.my_atom = src
+	R.add_reagent("chloralhydrate", 22)	//Used to be 100 sleep toxin//30 Chloral seems to be fatal, reducing it to 22./N
+	..()
+	return
+
+/obj/item/weapon/pen/sleepypen/attack(mob/M as mob, mob/user as mob)
+	if(!(istype(M,/mob)))
+		return
+	..()
+	if(reagents.total_volume)
+		if(M.reagents) reagents.trans_to(M, 50) //used to be 150
+	return
+
+
+/*
+ * Parapens
+ */
+
+/obj/item/weapon/pen/paralysis/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+	return
+
+/obj/item/weapon/pen/paralysis/attack(mob/M as mob, mob/user as mob)
+	if(!(istype(M,/mob)))
+		return
+	..()
+	if(reagents.total_volume)
+		if(M.reagents) reagents.trans_to(M, 50)
+	return
+
+/obj/item/weapon/pen/paralysis/New()
+	var/datum/reagents/R = new/datum/reagents(50)
+	reagents = R
+	R.my_atom = src
+	R.add_reagent("zombiepowder", 10)
+	R.add_reagent("impedrezene", 25)
+	R.add_reagent("cryptobiolin", 15)
+	..()
+	return

code/modules/paperwork/stamps.dm

@@ -52,4 +52,8 @@
 /obj/item/weapon/stamp/clown
 	name = "clown's rubber stamp"
 	icon_state = "stamp-clown"
-	color = "clown"
+	color = "clown"
+
+
+/obj/item/weapon/stamp/attack_paw(mob/user as mob)
+	return src.attack_hand(user)