Merge pull request MeteorsDetected#48 from animusdev/map

Map

baystation12.dme

@@ -558,6 +558,7 @@
 #include "code\game\mecha\working\ripley.dm"
 #include "code\game\mecha\working\working.dm"
 #include "code\game\objects\buckling.dm"
+#include "code\game\objects\courtroom.dm"
 #include "code\game\objects\cryo_spawner.dm"
 #include "code\game\objects\empulse.dm"
 #include "code\game\objects\explosion.dm"
@@ -1964,6 +1965,7 @@
 #include "interface\skin.dmf"
 #include "maps\CentComm.dmm"
 #include "maps\empty_space.dmm"
+#include "maps\exodus\1.station.dmm"
 #include "maps\exodus\1.station_ng.dmm"
 #include "maps\exodus\2.asteroid.dmm"
 #include "maps\exodus\3.satelite.dmm"

code/game/area/Space Station 13 areas.dm

@@ -1413,10 +1413,26 @@ area/crew_quarters/barman
 	name = "\improper Security - Brig"
 	icon_state = "brig"
 
+/area/security/processing
+	name = "\improper Security - Processing"
+	icon_state = "brig"
+
+/area/security/interrogation
+	name = "\improper Security - Interrogation"
+	icon_state = "security"
+
 /area/security/prison
 	name = "\improper Security - Prison Wing"
 	icon_state = "sec_prison"
 
+/area/security/prison/perma
+	name = "\improper Security - Permanent Confinement"
+	icon_state = "red"
+
+/area/security/prison/execution
+	name = "\improper Security - Execution Chamber"
+	icon_state = "exit"
+
 /area/security/warden
 	name = "\improper Security - Warden's Office"
 	icon_state = "Warden"

code/game/objects/courtroom.dm

@@ -0,0 +1,37 @@
+// Contains:
+// Gavel Hammer
+// Gavel Block
+
+/obj/item/weapon/gavelhammer
+	name = "gavel hammer"
+	desc = "Order, order! No bombs in my courthouse."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "gavelhammer"
+	force = 5
+	throwforce = 6
+	w_class = ITEM_SIZE_NORMAL
+	attack_verb = list("bashed", "battered", "judged", "whacked")
+
+/obj/item/weapon/gavelhammer/suicide_act(mob/user)
+	user.visible_message("<span class='danger'>[user] has sentenced \himself to death with \the [src]! It looks like \he's trying to commit suicide.</span>")
+	playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1)
+	return BRUTELOSS
+
+/obj/item/weapon/gavelblock
+	name = "gavel block"
+	desc = "Smack it with a gavel hammer when the assistants get rowdy."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "gavelblock"
+	force = 2
+	throwforce = 2
+	w_class = ITEM_SIZE_NORMAL
+	var/cooldown = 0
+
+/obj/item/weapon/gavelblock/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/weapon/gavelhammer))
+		if(cooldown < world.time - 8)
+			playsound(loc, 'sound/items/gavel.ogg', 100, 1)
+			user.visible_message("<span class='warning'>[user] strikes \the [src] with \the [I].</span>")
+			cooldown = world.time
+		return 1
+	return ..()

code/modules/mob/living/simple_animal/constructs/soulstone.dm

@@ -109,7 +109,7 @@
 
 
 ////////////////////////////Proc for moving soul in and out off stone//////////////////////////////////////
-/obj/item/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob).
+/obj/item/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob)
 	switch(choice)
 		if("VICTIM")
 			var/mob/living/carbon/human/T = target