Merge branch 'master' into computer_tweaks

# Conflicts:
#	code/game/jobs/job/ship_crew.dm

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

@@ -12,7 +12,7 @@
 	. = ..()
 	if(force || !istype(H) || slot != slot_wear_suit)
 		return
-	if(H.species.get_bodytype() in list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_UNATHI)) //gtfo stinky bugs
+	if(H.species.get_bodytype() in list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_SKRELL, BODYTYPE_UNATHI)) //gtfo stinky bugs
 		return
 	else
 		return FALSE

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

@@ -10,6 +10,7 @@
 
 	var/list/decals = list(
 		"quarter-turf" =      list("path" = /obj/effect/floor_decal/corner, "precise" = 1, "coloured" = 1),
+		"full quarter-turf" = list("path" = /obj/effect/floor_decal/corner_full, "precise" = 1, "coloured" = 1),
 		"hazard stripes" =    list("path" = /obj/effect/floor_decal/industrial/warning),
 		"corner, hazard" =    list("path" = /obj/effect/floor_decal/industrial/warning/corner),
 		"hatched marking" =   list("path" = /obj/effect/floor_decal/industrial/hatch, "coloured" = 1),

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

@@ -67,12 +67,12 @@
 		<br><small><i>This document serves as a notice and permits the sanctioned arrest of
 		the denoted employee of the NanoTrasen Civilian Branch of Operation by the
 		Security Department of the denoted facility. </br>
-		In accordance with Corporate Regulation, the denoted employee must be presented with signed and stamped or
-		digitally autorized warrant before the actions entailed can be conducted legally. </br>
-		The Suspect/Department staff is expected to offer full co-operation.</br>
+		In accordance with Corporate Regulations, the denoted employee must be presented with a signed and stamped or
+		digitally authorized warrant before the actions entailed can be conducted legally. </br>
+		The Suspect/Department staff are expected to offer full co-operation.</br>
 		In the event of the Suspect attempting to resist or flee, resisting arrest charges need to be applied !</br>
 		In the event of staff attempting to interfere with a lawful arrest, they are to be detained as an accomplice !</br>
-		In the event of no warrant being displayed <b>prior</b> to the arrest, security personell performing the arrest are subject to illegal detention charges !
+		In the event of no warrant being displayed <b>prior</b> to the arrest, security personnel performing the arrest are subject to illegal detention charges !
 		</i></small>
 		<br>
 		<br><b>Suspect's name: </b>
@@ -104,11 +104,11 @@
 		the Suspect's person/belongings/premises and/or Department for any items and materials
 		that could be connected to the suspected regulation violation described below,
 		pending an investigation in progress. </br>
-		The Security Officer(s) are obligated to remove any and all such items from the Suspects posession
+		The Security Officer(s) are obligated to remove any and all such items from the Suspect's posession
 		and/or Department and file it as evidence. </br>
-		In accordance with Corporate Regulation, the denoted employee must be presented with signed and stamped or
-		digitally autorized warrant before the actions entailed can be conducted legally. </br>
-		The Suspect/Department staff is expected to offer full co-operation.</br>
+		In accordance with Corporate Regulations, the denoted employee must be presented with a signed and stamped or
+		digitally authorized warrant before the actions entailed can be conducted legally. </br>
+		The Suspect/Department staff are expected to offer full co-operation.</br>
 		In the event of the Suspect/Department staff attempting	to resist/impede this search or flee, they must be taken into custody immediately! </br>
 		All confiscated items must be filed and taken to Evidence!</small></i></br>
 		<br><b>Suspect's/location name: </b>

code/game/objects/items/devices/lighting/lamp.dm

@@ -63,3 +63,10 @@
 
 /obj/item/device/flashlight/lamp/lava/yellow
 	light_color = COLOR_YELLOW
+
+/obj/item/device/flashlight/lamp/stage
+	name = "stage lamp"
+	desc = "A portable, beautiful and flashy stage light!"
+	light_color = COLOR_ORANGE
+	icon_state = "stage"
+	item_state = "stage"

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

@@ -113,3 +113,9 @@
 	desc = "Something that should not exist."
 	icon_state = "megaphone_clown"
 	item_state = "megaphone_clown"
+
+/obj/item/device/megaphone/stagemicrophone
+	name = "dazzling stage microphone"
+	desc = "A glamorous looking stage microphone, complete with running lights and holographic effects around it."
+	icon_state = "stagemicrophone"
+	item_state = "stagemicrophone"

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

@@ -75,7 +75,7 @@
 	name = "voidsuit kit"
 	icon = 'icons/obj/device.dmi'
 	icon_state = "modkit"
-	desc = "A simple cardboard box containing the requisition forms, permits, and decal kits a Himean voidsuit."
+	desc = "A simple cardboard box containing the requisition forms, permits, and decal kits for a Himean voidsuit."
 	desc_info = "In order to convert a voidsuit simply click on voidsuit or helmet with this item\
 	The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit\
 	or else it will be deleted."
@@ -119,7 +119,7 @@
 		var/obj/item/P = new voidsuit_product(get_turf(W))
 
 		if(!reconverting)
-			to_chat(user, SPAN_NOTICE("Your permit for a [P] has been processed. Enjoy!"))
+			to_chat(user, SPAN_NOTICE("Your permit for [P] has been processed. Enjoy!"))
 		else
 			to_chat(user, SPAN_NOTICE("Your voidsuit part has been reconverted into [P]."))