diff --git a/code/game/objects/items/weapons/courtroom.dm b/code/game/objects/items/weapons/courtroom.dm new file mode 100644 index 00000000000..925b3ec4fb1 --- /dev/null +++ b/code/game/objects/items/weapons/courtroom.dm @@ -0,0 +1,34 @@ +// 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.0 + throwforce = 6.0 + w_class = 2.0 + attack_verb = list("bashed", "battered", "judged", "whacked") + +/obj/item/weapon/gavelhammer/suicide_act(mob/user) + user.visible_message("[user] has sentenced \himself to death with the [src.name]! It looks like \he's trying to commit suicide.") + 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.0 + throwforce = 2.0 + w_class = 1.0 + +/obj/item/weapon/gavelblock/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/weapon/gavelhammer)) + playsound(loc, 'sound/items/gavel.ogg', 100, 1) + user.visible_message("[user] strikes \the [src] with \the [I].") + else + return \ No newline at end of file diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index ea4d43bf94b..f4b435f9ed1 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/maps/cyberiad.dmm b/maps/cyberiad.dmm index 25a4c278e27..e4c6e5cff47 100644 --- a/maps/cyberiad.dmm +++ b/maps/cyberiad.dmm @@ -1183,7 +1183,7 @@ "awM" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/light_switch{pixel_x = 27},/turf/simulated/floor/wood,/area/mimeoffice) "awN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "awO" = (/obj/structure/table/woodentable,/obj/machinery/photocopier/faxmachine{department = "Magistrate's Office"},/turf/simulated/floor/carpet,/area/magistrateoffice) -"awP" = (/obj/structure/table/woodentable,/obj/item/device/taperecorder{pixel_y = 0},/turf/simulated/floor/carpet,/area/magistrateoffice) +"awP" = (/obj/structure/table/woodentable,/obj/item/device/taperecorder{pixel_y = 0},/obj/item/device/megaphone,/turf/simulated/floor/carpet,/area/magistrateoffice) "awQ" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_pump,/obj/machinery/photocopier,/obj/machinery/light_switch{pixel_x = 0; pixel_y = 25},/turf/simulated/floor/carpet,/area/magistrateoffice) "awR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/carpet,/area/magistrateoffice) "awS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/poddoor/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "magistrate"; name = "Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/magistrateoffice) @@ -1307,7 +1307,7 @@ "azg" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/power/apc{cell_type = 5000; dir = 8; name = "Magistrate's Office APC"; pixel_x = -24; pixel_y = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/carpet,/area/magistrateoffice) "azh" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/carpet,/area/magistrateoffice) "azi" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{level = 1},/obj/structure/stool/bed/chair/comfy/black,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/carpet,/area/magistrateoffice) -"azj" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/structure/table/reinforced,/obj/item/device/megaphone,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/carpet,/area/magistrateoffice) +"azj" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/structure/table/reinforced,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/item/weapon/gavelblock,/obj/item/weapon/gavelhammer,/turf/simulated/floor/carpet,/area/magistrateoffice) "azk" = (/obj/structure/table/reinforced,/obj/machinery/photocopier/faxmachine{department = "Internal Affairs Office"},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/lawoffice) "azl" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/lawoffice) "azm" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/effect/landmark/start{name = "Internal Affairs Agent"},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/lawoffice) diff --git a/paradise.dme b/paradise.dme index d93e30ecb2c..962e092d630 100644 --- a/paradise.dme +++ b/paradise.dme @@ -633,6 +633,7 @@ #include "code\game\objects\items\weapons\cigs_lighters.dm" #include "code\game\objects\items\weapons\clown_items.dm" #include "code\game\objects\items\weapons\cosmetics.dm" +#include "code\game\objects\items\weapons\courtroom.dm" #include "code\game\objects\items\weapons\defib.dm" #include "code\game\objects\items\weapons\dice.dm" #include "code\game\objects\items\weapons\dna_injector.dm" diff --git a/sound/items/gavel.ogg b/sound/items/gavel.ogg new file mode 100644 index 00000000000..751eb0ea219 Binary files /dev/null and b/sound/items/gavel.ogg differ