diff --git a/aurorastation.dme b/aurorastation.dme index 5c061d7053f..b49f1f24376 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -894,7 +894,6 @@ #include "code\game\objects\items\devices\laserpointer.dm" #include "code\game\objects\items\devices\lightmeter.dm" #include "code\game\objects\items\devices\lightreplacer.dm" -#include "code\game\objects\items\devices\litanybook.dm" #include "code\game\objects\items\devices\magnetic_lock.dm" #include "code\game\objects\items\devices\medicaltools.dm" #include "code\game\objects\items\devices\megaphone.dm" @@ -918,6 +917,7 @@ #include "code\game\objects\items\devices\transfer_valve.dm" #include "code\game\objects\items\devices\uplink.dm" #include "code\game\objects\items\devices\uplink_random_lists.dm" +#include "code\game\objects\items\devices\versebook.dm" #include "code\game\objects\items\devices\violin.dm" #include "code\game\objects\items\devices\whistle.dm" #include "code\game\objects\items\devices\drop_targeter\_droptargeter.dm" diff --git a/code/game/objects/items/devices/litanybook.dm b/code/game/objects/items/devices/litanybook.dm deleted file mode 100644 index 801a3db83dd..00000000000 --- a/code/game/objects/items/devices/litanybook.dm +++ /dev/null @@ -1,45 +0,0 @@ -/obj/item/device/litanybook - name = "\improper tribunal codex" - desc = "A holy text of the Moroz Holy Tribunal, the state religion of the Empire of Dominia." - desc_fluff = "An almost mandatory possession for any Dominian household, containing a list of edicts, litanies, and rituals." - contained_sprite = TRUE - icon = 'icons/obj/human_items.dmi' - icon_state = "dominiabook" - item_state = "dominiabook" - - drop_sound = 'sound/items/drop/book.ogg' - - pickup_sound = 'sound/items/pickup/book.ogg' - - var/list/randomquip = list() - -/obj/item/device/litanybook/Initialize() - . = ..() - randomquip = file2list("ingame_manuals/dominia.txt") - -/obj/item/device/litanybook/attack_self(mob/user) - user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - user.visible_message(SPAN_NOTICE("[user] begins to flip through [src].")) - playsound(loc, 'sound/bureaucracy/bookopen.ogg', 50, 1) - - var/q // recycled from tip of the day code. it just works!(TM) - var/quip // in actuality it randomly determines a value, then uses that value to select a particular line from the txt below - if(quip) - q = quip - else - if(randomquip.len) - q = pick(randomquip) - - if(do_after(user, 25)) - to_chat(user, "You notice a particular verse: [q]") - -/obj/item/device/litanybook/gadpathur - name = "\improper gadpathurian morale manual" - desc = "A popular Gadpathurian pocket guide, used to carry a fragment of the Commander's wisdom abroad." - desc_fluff = "Manufactured using recycled paper and canvas. The wisdom within the text is based on the collected speeches of Commander Patvardhan and her assorted councillors." - icon_state = "gadpathurbook" - item_state = "gadpathurbook" - -/obj/item/device/litanybook/gadpathur/Initialize() - . = ..() - randomquip = file2list("ingame_manuals/gadpathur.txt") \ No newline at end of file diff --git a/code/game/objects/items/devices/versebook.dm b/code/game/objects/items/devices/versebook.dm new file mode 100644 index 00000000000..a8cb2bc0bf4 --- /dev/null +++ b/code/game/objects/items/devices/versebook.dm @@ -0,0 +1,68 @@ +/obj/item/device/versebook + name = "\improper versebook" + desc = "If you see this, someone fucked up. Make a issue request." + desc_fluff = "No, seriously. Make a issue request" + contained_sprite = TRUE + icon = 'icons/obj/human_items.dmi' + icon_state = "dominiabook" + item_state = "dominiabook" + var/reading = FALSE + + drop_sound = 'sound/items/drop/book.ogg' + + pickup_sound = 'sound/items/pickup/book.ogg' + + var/list/randomquip = list() + +/obj/item/device/versebook/attack_self(mob/user) + if(!length(randomquip)) + return + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) + + if(reading) //So you can't read twice. + to_chat(user, SPAN_WARNING("You are already reading this book.")) + return + reading = TRUE //begin reading + + user.visible_message(SPAN_NOTICE("[user] begins to flip through [src].")) + playsound(loc, 'sound/bureaucracy/bookopen.ogg', 50, 1) + + var/q // recycled from tip of the day code. it just works!(TM) + q = pick(randomquip) + + if(do_after(user, 25)) + to_chat(user, "You notice a particular verse: [q]") + reading = FALSE + +/obj/item/device/versebook/tribunal + name = "\improper tribunal codex" + desc = "A holy text of the Moroz Holy Tribunal, the state religion of the Empire of Dominia." + desc_fluff = "An almost mandatory possession for any Dominian household, containing a list of edicts, litanies, and rituals." + icon_state = "dominiabook" + item_state = "dominiabook" + +/obj/item/device/versebook/tribunal/Initialize() + . = ..() + randomquip = file2list("ingame_manuals/dominia.txt") //Needs a .txt file, each line is a 'verse' the book will randomly choose to display to user. + +/obj/item/device/versebook/gadpathur + name = "\improper gadpathurian morale manual" + desc = "A popular Gadpathurian pocket guide, used to carry a fragment of the Commander's wisdom abroad." + desc_fluff = "Manufactured using recycled paper and canvas. The wisdom within the text is based on the collected speeches of Commander Patvardhan and her assorted councillors." + icon_state = "gadpathurbook" + item_state = "gadpathurbook" + +/obj/item/device/versebook/gadpathur/Initialize() + . = ..() + randomquip = file2list("ingame_manuals/gadpathur.txt") + +/obj/item/device/versebook/biesel + name = "\improper Constitution of The Federal Republic of Biesel" + desc = "A common possession by Biesel government officals, the printed text of the constitution for the Federal Republic of Biesel and the Corporate Reconstruction Zone, adopted in 2452." + desc_fluff = "This book has the Republic of Biesel's iconic symbol etched on the cover, the text within details the structure of the Federal Democracy the Republic is today." + icon_state = "bieselbook" + item_state = "bieselbook" + +/obj/item/device/versebook/biesel/Initialize() + . = ..() + randomquip = file2list("ingame_manuals/biesel.txt") \ No newline at end of file diff --git a/code/modules/background/citizenship/human.dm b/code/modules/background/citizenship/human.dm index 6eabae215a5..021b9475f5a 100644 --- a/code/modules/background/citizenship/human.dm +++ b/code/modules/background/citizenship/human.dm @@ -40,6 +40,7 @@ backpack_contents = list( /obj/item/storage/box/ceti_visa = 1, /obj/item/storage/box/tcfl_pamphlet = 1, + /obj/item/device/versebook/biesel = 1, //constitution /obj/item/stamp/biesel = 1, /obj/item/gun/energy/pistol = 1 ) diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index cff26b4a08a..3386a7bdedd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -327,7 +327,7 @@ /datum/gear/gadbook display_name = "gadpathurian morale manual" - path = /obj/item/device/litanybook/gadpathur + path = /obj/item/device/versebook/gadpathur origin_restriction = list(/decl/origin_item/origin/gadpathur) /datum/gear/aurora_miniature diff --git a/code/modules/client/preference_setup/loadout/loadout_religion.dm b/code/modules/client/preference_setup/loadout/loadout_religion.dm index 3648e72400d..b13c6fb88a6 100644 --- a/code/modules/client/preference_setup/loadout/loadout_religion.dm +++ b/code/modules/client/preference_setup/loadout/loadout_religion.dm @@ -152,5 +152,5 @@ /datum/gear/religion/dominia/codex display_name = "tribunal codex" - path = /obj/item/device/litanybook + path = /obj/item/device/versebook/tribunal culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi) \ No newline at end of file diff --git a/html/changelogs/Ben10083 - Constitution.yml b/html/changelogs/Ben10083 - Constitution.yml new file mode 100644 index 00000000000..aaa145b193f --- /dev/null +++ b/html/changelogs/Ben10083 - Constitution.yml @@ -0,0 +1,14 @@ +# Your name. +author: Ben10083 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added the constitution of the Republic of Biesel to the Biesel Consular's loadout." + - refactor: "litanybook objects now renamed to versebook." diff --git a/icons/obj/human_items.dmi b/icons/obj/human_items.dmi index d12824a225d..6120e6fff44 100644 Binary files a/icons/obj/human_items.dmi and b/icons/obj/human_items.dmi differ diff --git a/ingame_manuals/biesel.txt b/ingame_manuals/biesel.txt new file mode 100644 index 00000000000..f0e2d3b34b9 --- /dev/null +++ b/ingame_manuals/biesel.txt @@ -0,0 +1,15 @@ +The Federal Republic of Biesel is one, sovereign, democratic state founded on the values of freedom, duty and inclusivity. +The executive power shall be vested in a President of the Republic of Biesel. He shall hold his office during the term of four Years, together with the Vice President. +The President, Vice President and all Civil Officers of the Republic of Biesel, shall be removed from Office on Impeachment for, and Conviction of, Treason, Bribery, or other high crimes and Misdemeanors. +The official languages of the Republic are Tau Ceti Basic, Elyran Standard, Sol Common, Tradeband, Freespeak, Siik'maas, Siik'tajr, Delvahhi, Nal'rasan, Ya'ssa, Sinta'Unathi, Sinta'Azaziba and Nral'Malic. +In all criminal prosecutions, the accused shall enjoy the right to a speedy and public trial, by an impartial jury of the planet, region and district wherein the crime shall have been committed, which district shall have been previously ascertained by law, and to be informed of the nature and cause of the accusation; to be confronted with the witnesses against him; to have compulsory process for obtaining witnesses in his favor, and to have the Assistance of Counsel for his defence. +All persons born or naturalized in the Republic of Biesel, and subject to the jurisdiction thereof, are citizens of the Republic and of the planet wherein they reside. No planet shall make or enforce any law which shall abridge the privileges or immunities of citizens of the Republic of Biesel; nor shall any planet deprive any person of life, liberty, or property, without due process of law; nor deny to any person within its jurisdiction the equal protection of the laws. +Synthetics that have achieved freedom, and fulfilled their obligation of duty to the Republic of Biesel, shall be entitled to citizenship whereby they qualify for all rights and privileges associated with such. +The legislative power shall be vested in two houses, the upper chamber State Senate, and the lower chamber Tau Ceti Assembly of Spokespeople. +The security services of the Republic will consist of a single and well-organized defence force, a singular police force and any intelligence services established by in terms of the Constitution. +The single and well-organized armed force may be supplemented by private forces of which can be attained through contracting from recognized corporate juristic persons. +The primary object of the armed force is to defend and protect the Republic, its territorial integrity and its people in accordance with the Constitution and the principles of interstellar law regulating the use of force. +The judicial authority of the Republic is vested in the courts. The courts are independent and subject only to the Constitution and the law, which they must apply impartially and without fear, favour or prejudice. +The courts are: the Constitutional Court; the Supreme Court of Appeal; the High Court of the planetary states, and any high court of appeal that may be established as an Act of the Republican Congress that has similar or equal status; the Magistrate's Court, and any other court of appeal that may be established as an Act of the Republican Congress that has a status similar or equal to the Magistrate's Court. +The Constitutional Court consists of the Chief Justice of the Republic of Biesel, the Deputy Chief Justice and seven other judges. +The Supreme Court of Appeal consists of the Lord Justice of the Republic of Biesel, the Deputy Lord Justice and seven other judges. \ No newline at end of file diff --git a/maps/away/generic/cursed.dmm b/maps/away/generic/cursed.dmm index ddac83738e8..50b7a38f47a 100644 --- a/maps/away/generic/cursed.dmm +++ b/maps/away/generic/cursed.dmm @@ -49,7 +49,7 @@ /area/cursed/mineral_processing) "atI" = ( /obj/structure/table/wood, -/obj/item/device/litanybook/gadpathur{ +/obj/item/device/versebook/gadpathur{ pixel_y = 2 }, /turf/simulated/floor/wood, @@ -2161,7 +2161,7 @@ /turf/simulated/floor/reinforced/airless, /area/cursed/eva_storage) "mQc" = ( -/obj/item/device/litanybook, +/obj/item/device/versebook/tribunal, /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/sarezhiwine{ pixel_x = 9;