diff --git a/code/game/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm index 05cdfc65877..f5a5871edf3 100644 --- a/code/game/antagonist/antagonist.dm +++ b/code/game/antagonist/antagonist.dm @@ -218,6 +218,8 @@ if(flags & ANTAG_OVERRIDE_JOB) player.assigned_role = null player.special_role = null - player.current.client.verbs -= /client/proc/aooc + + if (!check_rights(R_ADMIN|R_MOD|R_CCIAA, 0, player.current)) + player.current.client.verbs -= /client/proc/aooc pending_antagonists.Cut() candidates.Cut() diff --git a/code/game/antagonist/antagonist_add.dm b/code/game/antagonist/antagonist_add.dm index 9f9c828b59a..b7c1937d4d9 100644 --- a/code/game/antagonist/antagonist_add.dm +++ b/code/game/antagonist/antagonist_add.dm @@ -14,9 +14,9 @@ create_antagonist(player, move_to_spawn, do_not_announce, preserve_appearance) if(!do_not_equip) equip(player.current) - + player.current.faction = faction - + return 1 /datum/antagonist/proc/add_antagonist_mind(var/datum/mind/player, var/ignore_role, var/nonstandard_role_type, var/nonstandard_role_msg) @@ -61,7 +61,7 @@ update_icons_removed(player) BITSET(player.current.hud_updateflag, SPECIALROLE_HUD) - if (!is_special_character(player) && !player.current.client.holder) + if (!is_special_character(player) && !check_rights(R_ADMIN|R_MOD|R_CCIAA, 0, player.current)) player.current.client.verbs -= /client/proc/aooc return 1 diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 4fefdf5e53c..3eb0797de31 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -85,7 +85,7 @@ user << "It's broken!" return 1 else if(src.dirty==100) // The microwave is all dirty so can't be used! - if(istype(O, /obj/item/weapon/reagent_containers/spray/cleaner)) // If they're trying to clean it then let them + if(istype(O, /obj/item/weapon/reagent_containers/spray/cleaner) || istype(O, /obj/item/weapon/soap)) // If they're trying to clean it then let them user.visible_message( \ "\The [user] starts to clean the microwave.", \ "You start to clean the microwave." \ diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 67bf5d46837..dfdd610b723 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -152,7 +152,7 @@ if(wreckage) var/obj/effect/decal/mecha_wreckage/WR = new wreckage(loc) - WR.icon_state = "[icon_state]-broken" + WR.icon_state = "[initial_icon]-broken" for(var/obj/item/mecha_parts/mecha_equipment/E in equipment) if(E.salvageable && prob(30)) WR.crowbar_salvage += E diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 1dfa28bdf12..c10939b00dd 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -27,7 +27,6 @@ name = "space piano" desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't." icon_state = "piano" - w_class = 15 /obj/structure/device/piano/proc/playnote(var/note as text) //world << "Note: [note]" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index b25652ff909..f20e903b95c 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -375,7 +375,8 @@ var/list/admin_verbs_cciaa = list( /client/proc/returntobody, /client/proc/view_duty_log, /datum/admins/proc/create_admin_fax, - /client/proc/check_fax_history + /client/proc/check_fax_history, + /client/proc/aooc ) /client/proc/add_admin_verbs() diff --git a/code/modules/admin/verbs/antag-ooc.dm b/code/modules/admin/verbs/antag-ooc.dm index 8374292bba3..948c4e3585c 100644 --- a/code/modules/admin/verbs/antag-ooc.dm +++ b/code/modules/admin/verbs/antag-ooc.dm @@ -3,7 +3,7 @@ set name = "AOOC" set desc = "Antagonist OOC" - if (istype(src.mob, /mob/dead/observer) && !check_rights(R_ADMIN|R_MOD, 0)) + if (istype(src.mob, /mob/dead/observer) && !check_rights(R_ADMIN|R_MOD|R_CCIAA, 0)) src << "You cannot use AOOC while ghosting/observing!" return @@ -22,7 +22,7 @@ display_name = holder.fakekey for(var/mob/M in mob_list) - if (check_rights(R_ADMIN|R_MOD, 0, M)) + if (check_rights(R_ADMIN|R_MOD|R_CCIAA, 0, M)) M << "" + create_text_tag("aooc", "Antag-OOC:", M.client) + " [get_options_bar(src, 0, 1, 1)](JMP): [msg]" else if (M.mind && M.mind.special_role && M.client) M << "" + create_text_tag("aooc", "Antag-OOC:", M.client) + " [display_name]: [msg]" diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index a175e448135..d605db74fc2 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -726,7 +726,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/clothing/accessory/armband/fluff/karl_armband //Medizinercorps Armband - Karl Jonson - arrow768 +/obj/item/clothing/accessory/armband/fluff/karl_armband //Medizinercorps Armband - Karl Pollard - arrow768 name = "medizinercorps armband" desc = "A plain black armband with the golden Medizinercorps logo on it." icon = 'icons/obj/custom_items/karl_armband.dmi' @@ -1245,3 +1245,182 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "hikmat_shoes" species_restricted = null contained_sprite = TRUE + + +/obj/item/clothing/suit/storage/fluff/vira_coat //Designer Military Coat - Vira Bolivar - scheveningen + name = "designer military coat" + desc = "A dark funnel neck designer military-style dress coat, specially fitted on commission, clearly designed for a woman's figure. \ + A skillfully stitched 'NT' pattern is laden above a chest pocket, the phrase \"15 years of loyal service to the Corp\" below the insignia, followed by the personal signature of \"Vira Bolivar Taryk\"." + icon = 'icons/obj/custom_items/vira_coat.dmi' + icon_state = "vira_coat" + item_state = "vira_coat" + contained_sprite = TRUE + + +/obj/item/weapon/storage/backpack/satchel/fluff/kresimir_bag //Worn Leather Bag - Kresimir Kostadinov - alberyk + name = "worn leather bag" + desc = "A sturdy and worn leather bag. The clasp has a faded blue and golden insigna." + icon = 'icons/obj/custom_items/kresimir_bag.dmi' + icon_state = "kresimir_bag" + item_state = "kresimir_bag" + contained_sprite = TRUE + + +/obj/item/weapon/stamp/fluff/leland_stamp //Sol Alliance Government Foreign Relations Department Stamp - Leland Field - saudus + name = "\improper Sol Alliance foreign relations department stamp" + desc = "A stamp with the emblem of the Sol Alliance Foreign Relations Department. The text \"Diplomatic Observer, L. Field\" is inscribed on the handle." + icon = 'icons/obj/custom_items/leland_items.dmi' + icon_state = "leland_stamp" + item_state = "leland_stamp" + +/obj/item/clothing/accessory/badge/fluff/leland_badge //Sol Alliance Government Foreign Relations Department Badge - Leland Field - saudus + name = "\improper Sol Alliance foreign relations department badge" + desc = "A badge bearing the emblem of the Sol Alliance Foreign Relations Department. It has an inscription reading \"Leland Field, Diplomatic Observer\"." + icon = 'icons/obj/custom_items/leland_items.dmi' + icon_state = "leland_badge" + stored_name = "Leland Field" + badge_string = "Diplomatic Observer" + +/obj/item/clothing/accessory/badge/fluff/leland_badge/verb/flip() + set name = "Flip the Badge" + set desc = "Open or close the badge." + set category = "Object" + set src in usr + + if(src.icon_state == "leland_badge") + src.icon_state = "leland_badge-info" + usr << "You open \the [src]." + else + src.icon_state = "leland_badge" + usr << "You close \the [src]." + + +/obj/item/clothing/suit/storage/fluff/azala_coat //Azala's Gentleman's Coat - Azala Guwan - tomiixstarslasher + name = "gentleman's coat" + desc = "A blue gentleman's coat. It is very stylish, and appears to be very warm." + icon = 'icons/obj/custom_items/azala_items.dmi' + icon_state = "azala_coat" + item_state = "azala_coat" + contained_sprite = TRUE + +/obj/item/clothing/head/fluff/azala_hat //Azala's Gentleman's Cap - Azala Guwan - tomiixstarslasher + name = "gentleman's cap" + desc = "A blue gentleman's cap. It is very stylish, and appears to be warped from being worn crooked." + icon = 'icons/obj/custom_items/azala_items.dmi' + icon_state = "azala_hat" + item_state = "azala_hat" + contained_sprite = TRUE + +/obj/item/clothing/under/fluff/azala_jumpsuit //Azala's Roboticist Jumpsuit - Azala Guwan - tomiixstarslasher + name = "modified roboticist jumpsuit" + desc = "A variation of the roboticists jumpsuit, this one is in blue colors." + icon = 'icons/obj/custom_items/azala_items.dmi' + icon_state = "azala_jumpsuit" + item_state = "azala_jumpsuit" + contained_sprite = TRUE + + +/obj/item/clothing/suit/fluff/leo_scarf //Scarf - Leo Wyatt - keinto + name = "striped scarf" + desc = "A soft scarf striped in black and blue." + icon = 'icons/obj/custom_items/leo_scarf.dmi' + icon_state = "leo_scarf" + item_state = "leo_scarf" + contained_sprite = TRUE + + +/obj/item/clothing/under/rank/medical/fluff/jurlkiitajr_scrubs //IAC Scrubs - Rajii'rkalahk Jurlkiitajr - jackboot + name = "\improper IAA scrubs" + desc = "A change of sterile medical scrubs worn by IAC workers. This one is specific for Tajara Aid workers." + icon = 'icons/obj/custom_items/jurlkiitajr_items.dmi' + icon_state = "jurlkiitajr_scrubs" + item_state = "jurlkiitajr_scrubs" + contained_sprite = TRUE + +/obj/item/clothing/suit/apron/surgery/fluff/jurlkiitajr_vest //IAC Vest - Rajii'rkalahk Jurlkiitajr - jackboot + name = "\improper IAA vest" + desc = "A vest designed to distinguish medical workers in the Interstellar Aid Corps." + icon = 'icons/obj/custom_items/jurlkiitajr_items.dmi' + icon_state = "jurlkiitajr_vest" + item_state = "jurlkiitajr_vest" + contained_sprite = TRUE + + +/obj/item/clothing/under/fluff/zilosnish_uniform //Exotic Purple Robe - Zilosnish Szu - sleepywolf + name = "exotic purple robe" + desc = "An extravagant display of wealth, hand-tailored with Unathi craftmanship. There are intricate designs of hammers, cactus flowers, and coins etched into the cloth." + icon = 'icons/obj/custom_items/zilosnish_items.dmi' + icon_state = "zilosnish_uniform" + item_state = "zilosnish_uniform" + contained_sprite = TRUE + +/obj/item/clothing/suit/unathi/mantle/fluff/zilosnish_mantle //Exotic Mantle - Zilosnish Szu - sleepywolf + name = "exotic mantle" + desc = "A red hide with a gold and jade insignia pin to keep it on a wearers shoulders. The hide is thick, like rhino skin." + icon = 'icons/obj/custom_items/zilosnish_items.dmi' + icon_state = "zilosnish_mantle" + item_state = "zilosnish_mantle" + contained_sprite = TRUE + +/obj/item/weapon/pen/fluff/zilosnish_pen //Golden Pen - Zilosnish Szu - sleepywolf + name = "golden pen" + desc = "A pen plated in gold. It has black ink." + icon = 'icons/obj/custom_items/zilosnish_items.dmi' + icon_state = "zilosnish_pen" + + +/obj/item/clothing/head/fluff/qorja_headband //Rebellious Headband - Q'orja Sak'ha - fortport + name = "rebellious headband" + desc = "A comfortable headband made from a long, soft cloth that's tied into a knot in the back. It is a bright shade of red, slipped through a decorative brass plate. \ + Upon the metal is an engraving of the People's Republic of Adhomai's insignia, as if straight from their flag." + icon = 'icons/obj/custom_items/qorja_headband.dmi' + icon_state = "qorja_headband" + item_state = "qorja_headband" + contained_sprite = TRUE + + +/obj/item/clothing/glasses/regular/fluff/harley_glasses //Chic Sunglasses - Harley O'Ryan - ornias + name = "chic sunglasses" + desc = "A relatively expensive set of Phoenixport-manufactured sunglasses. They do not look like they would provide much protection." + icon = 'icons/obj/custom_items/harley_clothing.dmi' + icon_state = "harley_glasses" + item_state = "harley_glasses" + contained_sprite = TRUE + +/obj/item/clothing/under/fluff/harley_uniform //Phoenixport Shirt - Harley O'Ryan - ornias + name = "\improper Phoenixport shirt" + desc = "A white t-shirt with the writing \"Eiffel Tower Diner\" on it in a small font, below a recreation of the famous monument in question, the Eiffel Tower." + icon = 'icons/obj/custom_items/harley_clothing.dmi' + icon_state = "harley_uniform" + item_state = "harley_uniform" + contained_sprite = TRUE + +/obj/item/clothing/under/fluff/harley_uniform/verb/change_tshirt() + set name = "Change the shirt style" + set desc = "Change the style of your shirt." + set category = "Object" + set src in usr + + if (use_check(usr)) return + + var/style = input("You change the shirt to;","Change the shirt style") as null|anything in list("Eiffel Tower Diner","Pyramids of Giza Café","Phoenixport","New Parthenon") + switch(style) + if("Eiffel Tower Diner") + item_state = "harley_uniform" + desc = "A white t-shirt with the writing \"Eiffel Tower Diner\" on it in a small font, below a recreation of the famous monument in question, the Eiffel Tower." + + if("Pyramids of Giza Café") + item_state = "harley_uniform_1" + desc = "A white t-shirt with \"GIZA CAFÉ\" written in large, retro font, with a small background. It looks slightly well-worn." + + if("Phoenixport") + item_state = "harley_uniform_2" + desc = "A black vintage shirt with \"PHOENIXPORT\" written on it in a font. A small icon of an orange phoenix is perched on the \"O\"." + + if("New Parthenon") + item_state = "harley_uniform_3" + desc = "A grey t-shirt with a stylistic white, faded depiction of the Parthenon on it. It has been cut in half, displaying the inside, with sections clearly labelled in small font." + + usr.update_inv_w_uniform() + usr.visible_message("[user] fumbles with \the [src], changing the shirt..", + "You change \the [src]'s style to be '[style]'.") diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 48db1d4f2de..263babd15cb 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -11,7 +11,7 @@ // VARIABLES // var/teles_left // How many teleports left until it becomes uncalibrated var/datum/projectile_data/last_tele_data = null - var/z_co = 3 + var/z_co = 4 var/power_off var/rotation_off //var/angle_off @@ -26,7 +26,7 @@ var/list/power_options = list(5, 10, 20, 25, 30, 40, 50, 80, 100) var/teleporting = 0 var/starting_crystals = 0 //Edit this on the map, seriously. - var/max_crystals = 4 + var/max_crystals = 5 var/list/crystals = list() var/obj/item/device/gps/inserted_gps diff --git a/html/changelog.html b/html/changelog.html index 8c31c40b1e2..9b8c3cd5d74 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

17 September 2017

+

Skull132 updated:

+ +

14 September 2017

Lohikar updated: