Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro

code/modules/food/recipes_microwave.dm

@@ -166,11 +166,7 @@ I said no!
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
 	proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked)
-		being_cooked.warm = 1
-		being_cooked.reagents.add_reagent("tricordrazine", 5)
-		being_cooked.bitesize = 6
-		being_cooked.name = "Warm " + being_cooked.name
-		being_cooked.cooltime()
+		being_cooked.heat()
 	make_food(var/obj/container as obj)
 		var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = ..(container)
 		warm_up(being_cooked)

code/modules/mob/mob.dm

@@ -792,7 +792,7 @@ note dizziness decrements automatically in the mob's Life() proc.
 /mob/Stat()
 	..()
 
-	if(statpanel("Status"))	//not looking at that panel
+	if(statpanel("MC"))	//not looking at that panel
 
 		if(client && client.holder)
 			stat(null,"Location:\t([x], [y], [z])")
@@ -808,6 +808,7 @@ note dizziness decrements automatically in the mob's Life() proc.
 				stat(null,"Obj-[master_controller.objects_cost]\t#[processing_objects.len]")
 				stat(null,"Net-[master_controller.networks_cost]\tPnet-[master_controller.powernets_cost]")
 				stat(null,"NanoUI-[master_controller.nano_cost]\t#[nanomanager.processing_uis.len]")
+				stat(null,"Events-[master_controller.events_cost]\t#[event_manager.active_events.len]")
 				stat(null,"Tick-[master_controller.ticker_cost]\tALL-[master_controller.total_cost]")
 			else
 				stat(null,"MasterController-ERROR")
@@ -1210,4 +1211,4 @@ mob/proc/yank_out_object()
 /mob/verb/westfaceperm()
 	set hidden = 1
 	facing_dir = null
-	set_face_dir(WEST)
+	set_face_dir(WEST)

code/modules/paperwork/pen.dm

@@ -137,3 +137,33 @@
 
 /obj/item/weapon/pen/chameleon/get_signature(var/mob/user)
 	return signature ? signature : "Anonymous"
+
+/obj/item/weapon/pen/chameleon/verb/set_colour()
+	set name = "Change Pen Colour"
+	set category = "Object"
+
+	var/list/possible_colours = list ("Yellow", "Green", "Pink", "Blue", "Orange", "Cyan", "Red", "Invisible", "Black")
+	var/selected_type = input("Pick new colour.", "Pen Colour", null, null) as null|anything in possible_colours
+
+	if(selected_type)
+		switch(selected_type)
+			if("Yellow")
+				colour = COLOR_YELLOW
+			if("Green")
+				colour = COLOR_GREEN
+			if("Pink")
+				colour = COLOR_PINK
+			if("Blue")
+				colour = COLOR_BLUE
+			if("Orange")
+				colour = COLOR_ORANGE
+			if("Cyan")
+				colour = COLOR_CYAN
+			if("Red")
+				colour = COLOR_RED
+			if("Invisible")
+				colour = COLOR_WHITE
+			else
+				colour = COLOR_BLACK
+		usr << "<span class='info'>You select the [lowertext(selected_type)] ink container.</span>"
+

code/modules/projectiles/ammunition/boxes.dm

@@ -66,8 +66,10 @@
 	max_ammo = 10
 	multiple_sprites = 1
 
-/obj/item/ammo_magazine/mc9mm/empty
-	max_ammo = 0
+/obj/item/ammo_magazine/mc9mm/empty/New()
+	..()
+	stored_ammo = list()
+	update_icon()
 
 /obj/item/ammo_magazine/c9mm
 	name = "Ammunition Box (9mm)"

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

@@ -85,7 +85,7 @@
 	origin_tech = "combat=2;materials=2;syndicate=2"
 	ammo_type = "/obj/item/ammo_casing/c9mm"
 	load_method = MAGAZINE
-	mag_type = /obj/item/ammo_magazine/mc9mm/empty
+	mag_type = /obj/item/ammo_magazine/mc9mm
 
 /obj/item/weapon/gun/projectile/pistol/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
 	..()

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -696,6 +696,23 @@
 		reagents.add_reagent("protein", 6)
 		bitesize = 2
 
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket
+	name = "\improper Sin-pocket"
+	desc = "The food of choice for the veteran. Do <B>NOT</B> overconsume."
+	filling_color = "#6D6D00"
+	heated_reagents = list("doctorsdelight" = 5, "hyperzine" = 0.75, "synaptizine" = 0.25)
+	var/has_been_heated = 0
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket/attack_self(mob/user)
+	if(has_been_heated)
+		user << "<span class='notice'>The heating chemicals have already been spent.</span>"
+		return
+	has_been_heated = 1
+	user.visible_message("<span class='notice'>[user] crushes \the [src] package.</span>", "You crush \the [src] package and feel a comfortable heat build up.")
+	spawn(200)
+		user << "You think \the [src] is ready to eat about now."
+		heat()
+
 /obj/item/weapon/reagent_containers/food/snacks/donkpocket
 	name = "Donk-pocket"
 	desc = "The food of choice for the seasoned traitor."
@@ -708,12 +725,22 @@
 		reagents.add_reagent("protein", 2)
 
 	var/warm = 0
-	proc/cooltime() //Not working, derp?
+	var/list/heated_reagents = list("tricordrazine" = 5)
+	proc/heat()
+		warm = 1
+		for(var/reagent in heated_reagents)
+			reagents.add_reagent(reagent, heated_reagents[reagent])
+		bitesize = 6
+		name = "Warm " + name
+		cooltime()
+
+	proc/cooltime()
 		if (src.warm)
-			spawn( 4200 )
+			spawn(4200)
 				src.warm = 0
-				src.reagents.del_reagent("tricordrazine")
-				src.name = "donk-pocket"
+				for(var/reagent in heated_reagents)
+					src.reagents.del_reagent(reagent)
+				src.name = initial(name)
 		return
 
 /obj/item/weapon/reagent_containers/food/snacks/brainburger

code/modules/reagents/reagent_containers/pill.dm

@@ -190,6 +190,38 @@
 		..()
 		reagents.add_reagent("dexalin", 15)
 
+/obj/item/weapon/reagent_containers/pill/dexalin_plus
+	name = "Dexalin Plus pill"
+	desc = "Used to treat extreme oxygen deprivation."
+	icon_state = "pill8"
+	New()
+		..()
+		reagents.add_reagent("dexalin", 15)
+
+/obj/item/weapon/reagent_containers/pill/dermaline
+	name = "Dermaline pill"
+	desc = "Used to treat burn wounds."
+	icon_state = "pill12"
+	New()
+		..()
+		reagents.add_reagent("dermaline", 15)
+
+/obj/item/weapon/reagent_containers/pill/dylovene
+	name = "Dylovene pill"
+	desc = "A broad-spectrum anti-toxin."
+	icon_state = "pill13"
+	New()
+		..()
+		reagents.add_reagent("anti_toxin", 15)
+
+/obj/item/weapon/reagent_containers/pill/inaprovaline
+	name = "Inaprovaline pill"
+	desc = "Used to stabilize patients."
+	icon_state = "pill20"
+	New()
+		..()
+		reagents.add_reagent("inaprovaline", 30)
+
 /obj/item/weapon/reagent_containers/pill/bicaridine
 	name = "Bicaridine pill"
 	desc = "Used to treat physical injuries."
@@ -216,3 +248,11 @@
 		reagents.add_reagent("impedrezene", 10)
 		reagents.add_reagent("synaptizine", 5)
 		reagents.add_reagent("hyperzine", 5)
+
+ /obj/item/weapon/reagent_containers/pill/spaceacillin
+	name = "Spaceacillin"
+	desc = "Contains antiviral agents."
+	icon_state = "pill19"
+	New()
+		..()
+		reagents.add_reagent("spaceacillin", 15)