Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive

code/game/objects/items/bodybag.dm

@@ -111,4 +111,4 @@
 	foldedbag_path = /obj/item/bodybag/bluespace
 	density = 0
 	mob_storage_capacity = 15
-	max_mob_size = 2
+	max_mob_size = MOB_SIZE_LARGE

code/game/objects/items/devices/scanners.dm

@@ -196,11 +196,11 @@ MASS SPECTROMETER
 			if(H.reagents.reagent_list.len)
 				user.show_message("<span class='notice'>Subject contains the following reagents:</span>")
 				for(var/datum/reagent/R in H.reagents.reagent_list)
-					user.show_message("<span class='notice'>[R.volume]u of [R.name][R.overdosed == 1 ? "</span> - <span class = 'userdanger'>OVERDOSING</span>" : ".</span>"]")
+					user.show_message("<span class='notice'>[R.volume]u of [R.name][R.overdosed == 1 ? "</span> - <span class = 'boldannounce'>OVERDOSING</span>" : ".</span>"]")
 			else
 				user.show_message("<span class = 'notice'>Subject contains no reagents.</span>")
 			if(H.reagents.addiction_list.len)
-				user.show_message("<span class='userdanger'>Subject is addicted to the following reagents:</span>")
+				user.show_message("<span class='boldannounce'>Subject is addicted to the following reagents:</span>")
 				for(var/datum/reagent/R in H.reagents.addiction_list)
 					user.show_message("<span class='danger'>[R.name]</span>")
 			else

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

@@ -22,7 +22,6 @@
 	..()
 
 /obj/item/weapon/c4/suicide_act(var/mob/user)
-	. = BRUTELOSS
 	user.visible_message("<span class='suicide'>[user] activates the [src.name] and holds it above his head! It looks like \he's going out with a bang!</span>")
 	var/message_say = "FOR NO RAISIN!"
 	if(user.mind)
@@ -33,12 +32,15 @@
 			else if(role == "changeling")
 				message_say = "FOR THE HIVE!"
 			else if(role == "cultist")
-				message_say = "FOR NARSIE!"
+				message_say = "FOR NAR-SIE!"
+			else if(role == "revolutionary" || role == "head revolutionary")
+				message_say = "VIVA LA REVOLUTION!"
 	user.say(message_say)
 	target = user
 	message_admins("[key_name(user, user.client)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) suicided with [src.name] at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
+	sleep(10)
 	explode(get_turf(user))
-	return .
+	user.gib()
 
 /obj/item/weapon/c4/attackby(var/obj/item/I, var/mob/user, params)
 	if(istype(I, /obj/item/weapon/screwdriver))
@@ -94,4 +96,4 @@
 	qdel(src)
 
 /obj/item/weapon/c4/attack(mob/M as mob, mob/user as mob, def_zone)
-	return
+	return

code/game/objects/items/weapons/implants/implantchair.dm

@@ -107,10 +107,10 @@
 
 /obj/machinery/implantchair/put_mob(mob/living/carbon/M as mob)
 	if(!iscarbon(M))
-		usr << "<span class='userdanger'>The [src.name] cannot hold this!</span>"
+		usr << "<span class='warning'>The [src.name] cannot hold this!</span>"
 		return
 	if(src.occupant)
-		usr << "<span class='userdanger'>The [src.name] is already occupied!</span>"
+		usr << "<span class='warning'>The [src.name] is already occupied!</span>"
 		return
 	if(M.client)
 		M.client.perspective = EYE_PERSPECTIVE

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

@@ -14,7 +14,7 @@
 	var/wall_mounted = 0 //never solid (You can always pass over it)
 	var/health = 100
 	var/lastbang
-	var/max_mob_size = 1 //Biggest mob_size accepted by the container
+	var/max_mob_size = MOB_SIZE_HUMAN //Biggest mob_size accepted by the container
 	var/mob_storage_capacity = 3 // how many human sized mob/living can fit together inside a closet.
 	var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate
 							  //then open it in a populated area to crash clients.

code/game/objects/structures/kitchen_spike.dm

@@ -1,9 +1,11 @@
 
 #define SKINTYPE_MONKEY 1
 #define SKINTYPE_ALIEN 2
+#define SKINTYPE_BEAR 3
 
 #define MEATTYPE_MONKEY 1
 #define MEATTYPE_ALIEN 2
+#define MEATTYPE_BEAR 3
 
 //////Kitchen Spike
 
@@ -55,6 +57,20 @@
 			qdel(G)
 		else
 			user << "<span class='danger'>The spike already has something on it, finish collecting its meat first!</span>"
+	else if(istype(G.affecting, /mob/living/simple_animal/hostile/bear))
+		if(src.occupied == 0)
+			src.icon_state = "spikebloodybearz"
+			src.occupied = 1
+			src.meat = 5
+			src.meattype = MEATTYPE_BEAR
+			src.skin = 1
+			src.skintype = SKINTYPE_BEAR
+			for(var/mob/O in viewers(src, null))
+				O.show_message(text("<span class='danger'>[user] has forced [G.affecting] onto the spike, killing them instantly!</span>"))
+			qdel(G.affecting)
+			qdel(G)
+		else
+			user << "<span class='danger'>The spike already has something on it, finish collecting its meat first!</span>"
 	else
 		user << "<span class='danger'>They are too big for the spike, try something smaller!</span>"
 		return
@@ -98,9 +114,27 @@
 				usr << "You remove the last piece of meat from the alien!"
 				src.icon_state = "spike"
 				src.occupied = 0
+		else if(src.meattype == MEATTYPE_BEAR && src.skintype == SKINTYPE_BEAR)
+			if(src.skin >= 1)
+				src.skin--
+				new /obj/item/clothing/head/bearpelt(src.loc)
+				user << "You remove the hide from the bear!"
+			else if(src.meat > 1)
+				src.meat--
+				new /obj/item/weapon/reagent_containers/food/snacks/meat/bear(src.loc )
+				usr << "You remove some meat from the bear."
+			else if(src.meat == 1)
+				src.meat--
+				new /obj/item/weapon/reagent_containers/food/snacks/meat/bear(src.loc)
+				usr << "You remove the last piece of meat from the bear!"
+				src.icon_state = "spike"
+				src.occupied = 0
+
 
 #undef SKINTYPE_MONKEY
 #undef SKINTYPE_ALIEN
+#undef SKINTYPE_BEAR
 
 #undef MEATTYPE_MONKEY
 #undef MEATTYPE_ALIEN
+#undef MEATTYPE_BEAR