Welcome, [client ? client.prefs.real_name : "Unknown User"]
" - output += "" +/mob/dead/new_player/proc/refresh_player_panel() + new_player_panel() +/mob/dead/new_player/proc/new_player_panel() + src << browse(null, "window=playersetup") //closes the player setup window if its already open. + var/output = "" if(SSticker.current_state <= GAME_STATE_PREGAME) switch(ready) if(PLAYER_NOT_READY) - output += "\[ [LINKIFY_READY("Ready", PLAYER_READY_TO_PLAY)] | Not Ready | [LINKIFY_READY("Observe", PLAYER_READY_TO_OBSERVE)] \]
" + output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "notready")]Not Ready
" if(PLAYER_READY_TO_PLAY) - output += "\[ Ready | [LINKIFY_READY("Not Ready", PLAYER_NOT_READY)] | [LINKIFY_READY("Observe", PLAYER_READY_TO_OBSERVE)] \]
" + output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "ready")]Ready
" if(PLAYER_READY_TO_OBSERVE) output += "\[ [LINKIFY_READY("Ready", PLAYER_READY_TO_PLAY)] | [LINKIFY_READY("Not Ready", PLAYER_NOT_READY)] | Observe \]
" + output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "settings")]Setup Character
" else - output += "" - output += "" - output += "[LINKIFY_READY("Observe", PLAYER_READY_TO_OBSERVE)]
" + //make menu preview + var/mob/living/carbon/human/dummy/mannequin = generate_or_wait_for_human_dummy(DUMMY_HUMAN_SLOT_ROLEPLAY) + var/icon/preview_icon = icon('icons/effects/effects.dmi', "nothing") + client.prefs.copy_to(mannequin) + COMPILE_OVERLAYS(mannequin) + var/icon/stamp = getFlatIcon(mannequin) + mannequin.setDir(SOUTH) + stamp = getFlatIcon(mannequin) + CHECK_TICK + preview_icon.Blend(stamp, ICON_OVERLAY, 0, 0) + CHECK_TICK + preview_icon.Scale(preview_icon.Width() * 2, preview_icon.Height() * 2) + CHECK_TICK + unset_busy_human_dummy(DUMMY_HUMAN_SLOT_ROLEPLAY) + output += "[icon2html(preview_icon, world, "preview")]Join Game >>
" + output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "roleplay")]Roleplay Roles
" + output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "settings")]Setup Character
" + output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "manifest")]View the Crew Manifest
" + output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "ghost")]Observe
" if(!IsGuestKey(src.key)) if (SSdbcore.Connect()) @@ -61,18 +80,23 @@ newpoll = 1 if(newpoll) - output += "Show Player Polls (NEW!)
" + output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "manifest")]Show Player Polls (NEW!)
" else - output += "" + output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "manifest")]Show Player Polls
" qdel(query_get_new_polls) if(QDELETED(src)) return output += "Whitelist Required
| "
@@ -551,12 +675,15 @@
if(job.title in GLOB.command_positions)
position_class = "commandPosition"
var/jobline = ""
- if(job in SSjob.prioritized_jobs)
- jobline += "[job.title] ([job.current_positions])"
+ if(!roleplayonly)
+ if(job in SSjob.prioritized_jobs)
+ jobline += "[job.title] ([job.current_positions])"
+ else
+ jobline += "[job.title] ([job.current_positions])"
+ if(client && client.prefs && client.prefs.alt_titles_preferences[job.title])
+ jobline += " (as [client.prefs.alt_titles_preferences[job.title]])" else - jobline += "[job.title] ([job.current_positions])" - if(client && client.prefs && client.prefs.alt_titles_preferences[job.title]) - jobline += " (as [client.prefs.alt_titles_preferences[job.title]])" + jobline += "[job.title] ([job.current_positions])" dat += jobline categorizedJobs[jobcat]["jobs"] -= job @@ -638,3 +765,4 @@ src << browse(null, "window=preferences") //closes job selection src << browse(null, "window=mob_occupation") src << browse(null, "window=latechoices") //closes late job selection + diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm index 3566f3dea..f08c40e82 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm @@ -3,7 +3,7 @@ ///////////////////////////// /datum/sprite_accessory/facial_hair icon = 'icons/mob/human_face.dmi' - gender = MALE // barf (unless you're a dorf, dorfs dig chix w/ beards :P) + gender = NEUTER // barf (unless you're a dorf, dorfs dig chix w/ beards :P) // please make sure they're sorted alphabetically and categorized @@ -86,4 +86,3 @@ /datum/sprite_accessory/facial_hair/elvis name = "Sideburns (Elvis)" - icon_state = "facial_elvis" \ No newline at end of file diff --git a/html/browser/mainmenu.css b/html/browser/mainmenu.css new file mode 100644 index 000000000..ed5399c50 --- /dev/null +++ b/html/browser/mainmenu.css @@ -0,0 +1,33 @@ +a, button, a:link, a:visited, a:active, .linkOn, .linkOff +{ +text-align: center; +text-decoration: none; +display: inline-block; +vertical-align: middle; +align-items:center; +width: 95%; +border: 2px solid #161616; +} + +.icon +{ + width: 64px; + height: 64px; + vertical-align: middle; +} + +.p { + margin-bottom: -10px; /* between paragraphs */ + padding: -10px; + margin: 0px; + } + +body +{ + padding: 0; + margin: 0; + background-color: #272727; + font-size: 12px; + color: #ffffff; + line-height: 0%; +} diff --git a/html/browser/smallmainmenu.css b/html/browser/smallmainmenu.css new file mode 100644 index 000000000..43166d8b9 --- /dev/null +++ b/html/browser/smallmainmenu.css @@ -0,0 +1,33 @@ +a, button, a:link, a:visited, a:active, .linkOn, .linkOff +{ +text-align: center; +text-decoration: none; +display: inline-block; +vertical-align: middle; +align-items:center; +width: 95%; +border: 1px solid #161616; +} + +.icon +{ + width: 32px; + height: 32px; + vertical-align: middle; +} + +.p { + margin-bottom: -10px; /* between paragraphs */ + padding: -10px; + margin: 0px; + } + +body +{ + padding: 0; + margin: 0; + background-color: #272727; + font-size: 12px; + color: #ffffff; + line-height: 0%; +} diff --git a/hyperstation/code/modules/jobs/job_types/roleplay.dm b/hyperstation/code/modules/jobs/job_types/roleplay.dm index 9becaf9b8..564d001c0 100644 --- a/hyperstation/code/modules/jobs/job_types/roleplay.dm +++ b/hyperstation/code/modules/jobs/job_types/roleplay.dm @@ -1,7 +1,19 @@ -/* -Roleplay Jobs, Currently borked. +GLOBAL_LIST_INIT(roleplay_positions, list( + "Central Command Inspector", + "Prisoner")) -/datum/job/rpcentral +/datum/job/roleplay/ + var/info_text = "Debug Text on What the Job does." + var/quest_info = "To be the very best, like noone ever was." + var/failure_info = "To suck." + department_flag = ROLEPLAY + loadout = FALSE + +//Central Command Inspector +//////////////////////////////////////////// +GLOBAL_LIST_EMPTY(rpcentralspawn) //required for late game spawning + +/datum/job/roleplay/rpcentral title = "Central Command Inspector" faction = "Station" total_positions = 1 @@ -9,5 +21,63 @@ Roleplay Jobs, Currently borked. minimal_player_age = 1 supervisors = "central command" selection_color = "#ffeef0" - custom_spawn_text = "You are from central command doing a routine inspection of the station, please fill out the provided information and submit it to central command by the end of the shift." -*/ \ No newline at end of file + info_text = "A offical from Central Command, performing a routine inspection of the station." + quest_info = "Complete a routine check of the station, And make a write up for your bosses. The information collected should be submitted to Central Command before the end of the shift. Notify the crew ahead of time for initating." + failure_info = "Failure to fill in the form correctly will face severe penalties from Command." + outfit = /datum/outfit/centcom_official + override_roundstart_spawn = /obj/effect/landmark/start/rpcentral + +/datum/job/roleplay/rpcentral/override_latejoin_spawn() + return TRUE + +/datum/job/roleplay/rpcentral/after_spawn(mob/H, mob/M, latejoin) + H.Move(pick(GLOB.rpcentralspawn)) + H.forceMove(pick(GLOB.rpcentralspawn)) + +/obj/effect/landmark/start/rpcentral + name = "Central Command Inspector" + icon = 'icons/effects/landmarks_static.dmi' + icon_state = "snukeop_leader_spawn" + +/obj/effect/landmark/start/rpcentral/Initialize(mapload) + ..() + GLOB.rpcentralspawn += loc + return INITIALIZE_HINT_QDEL + +//Prisoner +//////////////////////////////////////////// +GLOBAL_LIST_EMPTY(prisionspawn) + +/datum/job/roleplay/prisoner + title = "Prisoner" + faction = "Station" + total_positions = 3 + spawn_positions = 1 + minimal_player_age = 1 + supervisors = "security" + selection_color = "#ffeef0" + info_text = "For one reason or another, you are a prisoner. Kinaris has chosen to temporarily hold you within Layenia Station's holding area, \ + until the end of the shift. You do not permanently reside here, but you may end up in this place from shift to shift. It is highly recommended to \ + make a unique character slot for this role. Kinaris would not neuter or otherwise remove identifying features that make you who you are; such as \ + altering your name, features, or physical appearance. As a prisoner, you still uphold a decent amount of rights." + quest_info = "Do NOT attempt to break out, antagonize, or otherwise treat your role as anything to grief with. Should you find a scenario where you want to, AHELP." + failure_info = "" + outfit = /datum/outfit/prisoner + +/datum/job/roleplay/prisoner/override_latejoin_spawn() + return TRUE + +/datum/job/roleplay/prisoner/after_spawn(mob/H, mob/M, latejoin) + AnnounceArrival(H, title) + H.Move(pick(GLOB.prisionspawn)) + H.forceMove(pick(GLOB.prisionspawn)) + +/obj/effect/landmark/start/prisoner + name = "Central Command Inspector" + icon = 'icons/effects/landmarks_static.dmi' + icon_state = "snukeop_leader_spawn" + +/obj/effect/landmark/start/prisoner/Initialize(mapload) + ..() + GLOB.prisionspawn += loc + return INITIALIZE_HINT_QDEL diff --git a/hyperstation/code/modules/jobs/jobs.dm b/hyperstation/code/modules/jobs/jobs.dm new file mode 100644 index 000000000..e69de29bb diff --git a/hyperstation/code/modules/mob/dead/new_player/roleplay.dm b/hyperstation/code/modules/mob/dead/new_player/roleplay.dm new file mode 100644 index 000000000..e69de29bb diff --git a/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm b/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm index 34dc50426..7eb188df2 100644 --- a/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -437,7 +437,7 @@ from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm: name = "RadDog (Hyper)" icon_state = "chemlight" icon = 'hyperstation/icons/mob/char_markings.dmi' - + //racc do a code maybe it won't explode /datum/sprite_accessory/mam_body_markings/raccalt name = "RaccAlt (Hyper)" @@ -543,7 +543,7 @@ from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm: /datum/sprite_accessory/screen/visor/blue name = "Blue Visor (Hyper)" icon_state = "visor_blue" - + /datum/sprite_accessory/screen/visor/green name = "Green Visor (Hyper)" icon_state = "visor_green" @@ -559,7 +559,7 @@ from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm: /datum/sprite_accessory/screen/visor/yellow name = "Yellow Visor (Hyper)" icon_state = "visor_yellow" - + /* HAIRSTYLES @@ -601,3 +601,18 @@ from code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm: /datum/sprite_accessory/hair/emoh name = "Emo (Hyper)" icon_state = "hair_emoh" + +/* +BEARDS +========================================================== +*/ + +/* +/datum/sprite_accessory/facial_hair + icon = 'icons/mob/human_face.dmi' + gender = MALE // barf (unless you're a dorf, dorfs dig chix w/ beards :P) +*/ + +/datum/sprite_accessory/facial_hair/mane + name = "Neckfluff (Hyper)" + icon_state = "facial_neckfluff" \ No newline at end of file diff --git a/hyperstation/icons/menu/menu.dmi b/hyperstation/icons/menu/menu.dmi new file mode 100644 index 000000000..c2ab29375 Binary files /dev/null and b/hyperstation/icons/menu/menu.dmi differ diff --git a/hyperstation/icons/menu/menu_large.dmi b/hyperstation/icons/menu/menu_large.dmi new file mode 100644 index 000000000..1131454e6 Binary files /dev/null and b/hyperstation/icons/menu/menu_large.dmi differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 064442d15..063a0b974 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm index fe0e28949..a1bbe34a7 100644 --- a/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm +++ b/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm @@ -3,7 +3,7 @@ id = "mammal" default_color = "4B4B4B" icon_limbs = DEFAULT_BODYPART_ICON_CITADEL - species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,WINGCOLOR) + species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,WINGCOLOR,FACEHAIR) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "taur", "legs", "deco_wings") default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "mam_body_markings" = "Husky", "taur" = "None", "legs" = "Normal Legs", "deco_wings" = "None") @@ -54,7 +54,7 @@ say_mod = "chirps" default_color = "BCAC9B" icon_limbs = DEFAULT_BODYPART_ICON_CITADEL - species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,WINGCOLOR) + species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,WINGCOLOR,FACEHAIR) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID mutant_bodyparts = list("mam_snouts", "wings", "taur", "mam_tail", "mam_body_markings", "taur", "deco_wings") default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Beak", "mam_body_markings" = "Hawk", "wings" = "None", "taur" = "None", "mam_tail" = "Hawk", "deco_wings" = "None") @@ -100,7 +100,7 @@ id = "aquatic" default_color = "BCAC9B" icon_limbs = DEFAULT_BODYPART_ICON_CITADEL - species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,WINGCOLOR) + species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,WINGCOLOR,FACEHAIR) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID mutant_bodyparts = list("mam_tail", "mam_ears","mam_body_markings", "taur", "mam_snouts", "deco_wings", "legs") default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "Shark", "mam_ears" = "None", "mam_body_markings" = "Shark", "mam_snouts" = "Round", "taur" = "None", "legs" = "Normal Legs", "deco_wings" = "None") @@ -147,7 +147,7 @@ id = "insect" default_color = "BCAC9B" icon_limbs = DEFAULT_BODYPART_ICON_CITADEL - species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR) + species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,FACEHAIR) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG mutant_bodyparts = list("mam_ears", "mam_body_markings", "mam_tail", "taur", "moth_wings","moth_markings", "mam_snouts", "moth_fluff", "legs") default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "moth_wings" = "Plain","moth_markings" = "None", "mam_snouts" = "Bug", "mam_body_markings" = "Moth", "taur" = "None", "moth_fluff" = "Plain", "legs" = "Normal Legs") @@ -250,7 +250,7 @@ icon_limbs = DEFAULT_BODYPART_ICON_CITADEL say_mod = "beeps" default_color = "00FF00" - species_traits = list(MUTCOLORS,NOTRANSSTING,EYECOLOR,LIPS,HAIR) + species_traits = list(MUTCOLORS,NOTRANSSTING,EYECOLOR,LIPS,HAIR,FACEHAIR) inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID mutant_bodyparts = list("ipc_antenna", "mam_tail", "mam_snouts", "legs", "mam_body_markings", "taur") default_features = list("ipc_antenna" = "Synthetic Lizard - Antennae","mam_tail" = "Synthetic Lizard", "mam_snouts" = "Synthetic Lizard - Snout", "legs" = "Digitigrade Legs", "mam_body_markings" = "Synthetic Lizard - Plates", "taur" = "None") diff --git a/tgstation.dme b/tgstation.dme index bfd1708ac..6236e1025 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3199,6 +3199,7 @@ #include "hyperstation\code\modules\food_and_drinks\recipes\drinks_recipes.dm" #include "hyperstation\code\modules\hydroponics\grown\kalyna.dm" #include "hyperstation\code\modules\integrated_electronics\input.dm" +#include "hyperstation\code\modules\jobs\jobs.dm" #include "hyperstation\code\modules\jobs\job_types\_job.dm" #include "hyperstation\code\modules\jobs\job_types\civilian.dm" #include "hyperstation\code\modules\jobs\job_types\job_alt_titles.dm" @@ -3209,6 +3210,7 @@ #include "hyperstation\code\modules\mining\equipment\survival_pod.dm" #include "hyperstation\code\modules\mob\mob_helpers.dm" #include "hyperstation\code\modules\mob\dead\new_player\cosmetic_parts.dm" +#include "hyperstation\code\modules\mob\dead\new_player\roleplay.dm" #include "hyperstation\code\modules\mob\dead\new_player\sprite_accessories.dm" #include "hyperstation\code\modules\mob\living\status_indicators.dm" #include "hyperstation\code\modules\mob\living\carbon\carbon.dm" |