From 2fa35d7e14357db14b42405af01595ed898f4aa0 Mon Sep 17 00:00:00 2001 From: Reddeyfish Date: Fri, 9 Nov 2018 13:32:55 -0800 Subject: [PATCH 1/4] Add Jesse's Orca markings --- .../mob/new_player/sprite_accessories_ch.dm | 26 ++++++++++++++++++ icons/mob/human_races/markings_ch.dmi | Bin 0 -> 928 bytes vorestation.dme | 1 + 3 files changed, 27 insertions(+) create mode 100644 code/modules/mob/new_player/sprite_accessories_ch.dm create mode 100644 icons/mob/human_races/markings_ch.dmi diff --git a/code/modules/mob/new_player/sprite_accessories_ch.dm b/code/modules/mob/new_player/sprite_accessories_ch.dm new file mode 100644 index 0000000000..e641ef7128 --- /dev/null +++ b/code/modules/mob/new_player/sprite_accessories_ch.dm @@ -0,0 +1,26 @@ +/datum/sprite_accessory/marking/ch + icon = 'icons/mob/human_races/markings_ch.dmi' + + orca_head + name = "Orca head" + icon_state = "orca_head" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + + orca_body + name = "Orca body" + icon_state = "orca_body" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_TORSO) + + orca_legs + name = "Orca legs" + icon_state = "orca_leg" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_L_LEG,BP_R_LEG) + + orca_arms + name = "Orca arms" + icon_state = "orca_arm" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_L_ARM,BP_R_ARM) diff --git a/icons/mob/human_races/markings_ch.dmi b/icons/mob/human_races/markings_ch.dmi new file mode 100644 index 0000000000000000000000000000000000000000..15138896d40be327c565dc7f1361120580ca18df GIT binary patch literal 928 zcmV;R17G}!P)V=-0C=2@(Z349Fc1dtIeCiE&Jq8uF47_$>?@ShoXtUM z$_#^{P2{az+m1@9LoTtF;shnP}6n+e%@PMjJmvh!8Q= z%JUTli(qt)N(w_9^0pK=h6!`ueDRAnPaQo6U*;W-+T|?gT+V@~bUkG`=OP|~+z|e< z2jfh*{BpHw`{w^1c1c7*RCt{2n_q6!Fc8M=M5t2x(lu1#G4ZOE z;AshOoTBt3mAC-y6URX61vmmnW4rWECeHf99S;iZ_fso%YL7oVPQ2rd$2qbPPIo{1 zZMTx9^Q)rvo2`4u*v`jZdW1Mp%;O(^_u1+ZxZzFMfIh_YXXC1@|8C|IB!qs{rVprk z!bOLAaGEi(KjdgS$=4J8;vtn0V)3jL;bXKN!r4~f+;Rw4!$lk}4F%fO?agb$_MQ6{ z-hMR|xQV^3fc0(a!aHjL^AVT}^u_{&5JJdO=%m@yZXd+|dVG*}U;8uM2f0P6F5u(_ zBE;J5JGpNx-$g>KNAN0kW3!31_bcWCE=Ym;b6_s;K?>C0(s?ORKNxSNK>Fp5b^MPu z80zIWKkGiKpGBbBKO}O8_6L;K_oWV{uT;tf z3SYSwFC?D}>k~o#_gQm$?R-`2Kf|w!1!MWjQ_R3_+JT(|FyvQUkQx=m(DNQdO_=y_V4}x0000 Date: Fri, 9 Nov 2018 21:04:11 -0500 Subject: [PATCH 2/4] kitchen equipment revision will now ding audibly when the food is ready will now eject your food when it's ready --- code/game/machinery/kitchen/cooking_machines/candy.dm | 2 ++ code/game/machinery/kitchen/cooking_machines/cereal.dm | 2 ++ code/game/machinery/kitchen/cooking_machines/grill.dm | 3 ++- code/game/machinery/kitchen/cooking_machines/oven.dm | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/kitchen/cooking_machines/candy.dm b/code/game/machinery/kitchen/cooking_machines/candy.dm index 21fd506911..2894c145a4 100644 --- a/code/game/machinery/kitchen/cooking_machines/candy.dm +++ b/code/game/machinery/kitchen/cooking_machines/candy.dm @@ -5,6 +5,8 @@ off_icon = "mixer_off" on_icon = "mixer_on" cook_type = "candied" + can_burn_food = 0 + cooked_sound = 'sound/machines/ding.ogg' output_options = list( "Jawbreaker" = /obj/item/weapon/reagent_containers/food/snacks/variable/jawbreaker, diff --git a/code/game/machinery/kitchen/cooking_machines/cereal.dm b/code/game/machinery/kitchen/cooking_machines/cereal.dm index 3a7b19c9b1..f9023a8743 100644 --- a/code/game/machinery/kitchen/cooking_machines/cereal.dm +++ b/code/game/machinery/kitchen/cooking_machines/cereal.dm @@ -6,6 +6,8 @@ cook_type = "cerealized" on_icon = "cereal_on" off_icon = "cereal_off" + can_burn_food = 0 + cooked_sound = 'sound/machines/ding.ogg' /obj/machinery/cooker/cereal/change_product_strings(var/obj/item/weapon/reagent_containers/food/snacks/product) . = ..() diff --git a/code/game/machinery/kitchen/cooking_machines/grill.dm b/code/game/machinery/kitchen/cooking_machines/grill.dm index 312189c588..b2c3659f61 100644 --- a/code/game/machinery/kitchen/cooking_machines/grill.dm +++ b/code/game/machinery/kitchen/cooking_machines/grill.dm @@ -7,4 +7,5 @@ food_color = "#A34719" on_icon = "grill_on" off_icon = "grill_off" - can_burn_food = 1 \ No newline at end of file + can_burn_food = 0 + cooked_sound = 'sound/machines/ding.ogg' diff --git a/code/game/machinery/kitchen/cooking_machines/oven.dm b/code/game/machinery/kitchen/cooking_machines/oven.dm index ec941af223..3f58269128 100644 --- a/code/game/machinery/kitchen/cooking_machines/oven.dm +++ b/code/game/machinery/kitchen/cooking_machines/oven.dm @@ -8,7 +8,8 @@ cook_type = "baked" cook_time = 300 food_color = "#A34719" - can_burn_food = 1 + can_burn_food = 0 + cooked_sound = 'sound/machines/ding.ogg' output_options = list( "Personal Pizza" = /obj/item/weapon/reagent_containers/food/snacks/variable/pizza, From 90cb5ccc041806d49092f348e76955213d28b05b Mon Sep 17 00:00:00 2001 From: Cactus Date: Fri, 9 Nov 2018 21:04:24 -0500 Subject: [PATCH 3/4] adds the character directory --- code/game/verbs/character_directory.dm | 37 +++++++++++++++++++ .../client/preference_setup/vore/09_misc.dm | 26 +++++++++++++ vorestation.dme | 2 + 3 files changed, 65 insertions(+) create mode 100644 code/game/verbs/character_directory.dm create mode 100644 code/modules/client/preference_setup/vore/09_misc.dm diff --git a/code/game/verbs/character_directory.dm b/code/game/verbs/character_directory.dm new file mode 100644 index 0000000000..6f5a6debc2 --- /dev/null +++ b/code/game/verbs/character_directory.dm @@ -0,0 +1,37 @@ +/client/verb/show_character_directory() + set name = "Character Directory" + set category = "OOC" + set desc = "Shows a listing of all active characters, along with their associated OOC notes, flavor text, and more." + + if(mob.next_move >= world.time) //This is primarily to stop malicious users from trying to lag the server by spamming this verb + return + + mob.next_move = world.time + 10 + + var/html = "" + + var/curID = 0 + for(var/client/C in clients) + if(C.prefs && !C.prefs.show_in_directory) + continue + if(ishuman(C.mob)) + var/mob/living/carbon/human/H = C.mob + if(data_core && data_core.general) + if(!find_general_record("name", H.real_name)) + continue + curID++ + html += "
" + html += "

[H.real_name]


" + if(H.flavor_texts["general"]) + html += "Flavor text" + html += "" + if(H.ooc_notes) + html += "OOC notes" + html += "" + html += "
" + if(!curID) + html += "

404: Station not found

" + + var/datum/browser/popup = new(mob, "chardir", "Character Directory", 640, 480) + popup.set_content(html) + popup.open() \ No newline at end of file diff --git a/code/modules/client/preference_setup/vore/09_misc.dm b/code/modules/client/preference_setup/vore/09_misc.dm new file mode 100644 index 0000000000..d0809c781e --- /dev/null +++ b/code/modules/client/preference_setup/vore/09_misc.dm @@ -0,0 +1,26 @@ +/datum/preferences + var/show_in_directory = TRUE + +/datum/category_item/player_setup_item/vore/misc + name = "Misc Settings" + sort_order = 9 + +/datum/category_item/player_setup_item/vore/misc/load_character(var/savefile/S) + S["show_in_directory"] >> pref.show_in_directory + + +/datum/category_item/player_setup_item/vore/misc/save_character(var/savefile/S) + S["show_in_directory"] << pref.show_in_directory + +/datum/category_item/player_setup_item/vore/misc/sanitize_character() + pref.show_in_directory = sanitize_integer(pref.show_in_directory, 0, 1, initial(pref.show_in_directory)) + +/datum/category_item/player_setup_item/vore/misc/content(var/mob/user) + . += "
" + . += "Appear in Character Directory: [pref.show_in_directory ? "Yes" : "No"]
" + +/datum/category_item/player_setup_item/vore/misc/OnTopic(var/href, var/list/href_list, var/mob/user) + if(href_list["toggle_show_in_directory"]) + pref.show_in_directory = pref.show_in_directory ? 0 : 1; + return TOPIC_REFRESH + return ..(); \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index 0e81bb0fc6..ffd1097406 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1291,6 +1291,7 @@ #include "code\game\turfs\unsimulated\sky_vr.dm" #include "code\game\turfs\unsimulated\walls.dm" #include "code\game\verbs\advanced_who.dm" +#include "code\game\verbs\character_directory.dm" #include "code\game\verbs\ignore.dm" #include "code\game\verbs\ooc.dm" #include "code\game\verbs\suicide.dm" @@ -1504,6 +1505,7 @@ #include "code\modules\client\preference_setup\vore\06_vantag.dm" #include "code\modules\client\preference_setup\vore\07_traits.dm" #include "code\modules\client\preference_setup\vore\08_nif.dm" +#include "code\modules\client\preference_setup\vore\09_misc.dm" #include "code\modules\clothing\chameleon.dm" #include "code\modules\clothing\clothing.dm" #include "code\modules\clothing\clothing_accessories.dm" From 042cf00d252cab182a3cc5cc45865791bdd853cb Mon Sep 17 00:00:00 2001 From: Deryk Vanderhorst Date: Mon, 12 Nov 2018 02:13:03 -0800 Subject: [PATCH 4/4] Changed Mob Size here to match Prometheans_VR.dm hopefully this will fix the issue of prommies not able to swap places with others? --- .../mob/living/carbon/human/species/station/prometheans.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index 01af604992..378ac6195b 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -20,7 +20,7 @@ var/datum/species/shapeshifter/promethean/prometheans hunger_factor = 0.2 reagent_tag = IS_SLIME - mob_size = MOB_SMALL + mob_size = MOB_MEDIUM bump_flag = SLIME swap_flags = MONKEY|SLIME|SIMPLE_ANIMAL push_flags = MONKEY|SLIME|SIMPLE_ANIMAL