You eagerly lie down!":"You suddenly lie down!")]"), 5)
to_chat(user, "You encourage [L] to lie down.")
//KNOCKDOWN
@@ -1247,7 +1246,7 @@
for (var/trigger in E.customTriggers)
speaktrigger += "[trigger], "
to_chat(user, "[C] whispers, \"[speaktrigger] are my triggers.\"")//So they don't trigger themselves!
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You whisper your triggers to [(C.client?.prefs.lewdchem?"Your [E.enthrallGender]":"[E.master]")]."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You whisper your triggers to [(E.lewd?"Your [E.enthrallGender]":"[E.master]")]."), 5)
//CUSTOM TRIGGERS
@@ -1259,7 +1258,7 @@
if (get_dist(user, H) > 1)//Requires user to be next to their pet.
to_chat(user, "You need to be next to your pet to give them a new trigger!")
continue
- if(!H.client?.prefs.lewdchem)
+ if(!E.lewd)
to_chat(user, "[H] seems incapable of being implanted with triggers.")
continue
else
@@ -1282,7 +1281,7 @@
E.customTriggers[trigger] = trigger2
log_game("FERMICHEM: [H] has been implanted by [user] with [trigger], triggering [trigger2].")
E.mental_capacity -= 5
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(H.client?.prefs.lewdchem?"your [E.enthrallGender]":"[E.master]")] whispers you a new trigger."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(E.lewd?"your [E.enthrallGender]":"[E.master]")] whispers you a new trigger."), 5)
to_chat(user, "You sucessfully set the trigger word [trigger] in [H]")
else
to_chat(user, "Your pet looks at you confused, it seems they don't understand that effect!")
@@ -1300,7 +1299,7 @@
if (get_dist(user, H) > 1)//Requires user to be next to their pet.
to_chat(user, "You need to be next to your pet to give them a new echophrase!")
continue
- if(!H.client?.prefs.lewdchem)
+ if(!E.lewd)
to_chat(user, "[H] seems incapable of being implanted with an echoing phrase.")
continue
else
@@ -1344,7 +1343,7 @@
objective = replacetext(lowertext(objective), "suicide", "self-love")
message_admins("[H] has been implanted by [user] with the objective [objective].")
log_game("FERMICHEM: [H] has been implanted by [user] with the objective [objective] via MKUltra.")
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(H.client?.prefs.lewdchem?"Your [E.enthrallGender]":"[E.master]")] whispers you a new objective."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(E.lewd?"Your [E.enthrallGender]":"[E.master]")] whispers you a new objective."), 5)
brainwash(H, objective)
E.mental_capacity -= 200
to_chat(user, "You sucessfully give an objective to [H]")
@@ -1358,7 +1357,7 @@
for(var/V in listeners)
var/mob/living/carbon/human/H = V
var/datum/status_effect/chem/enthrall/E = H.has_status_effect(/datum/status_effect/chem/enthrall)
- if(E.phase >= 3 && H.client?.prefs.lewdchem)
+ if(E.phase >= 3 && E.lewd)
var/instill = stripped_input(user, "Instill an emotion in [H].", MAX_MESSAGE_LEN)
to_chat(H, "[instill]")
to_chat(user, "You sucessfully instill a feeling in [H]")
@@ -1373,7 +1372,7 @@
if(E.phase > 1)
if(user.ckey == E.enthrallID && user.real_name == E.master.real_name)
E.master = user
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(H.client?.prefs.lewdchem?"You hear the words of your [E.enthrallGender] again!! They're back!!":"You recognise the voice of [E.master].")]"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(E.lewd?"You hear the words of your [E.enthrallGender] again!! They're back!!":"You recognise the voice of [E.master].")]"), 5)
to_chat(user, "[H] looks at you with sparkling eyes, recognising you!")
//I dunno how to do state objectives without them revealing they're an antag
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index 71f813a5b..671ec03b6 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -9,6 +9,7 @@
var/list/chems_needed = list() //list of chems needed to complete the step. Even on success, the step will have no effect if there aren't the chems required in the mob.
var/require_all_chems = TRUE //any on the list or all on the list?
var/silicons_obey_prob = FALSE
+ var/pain_failure = 10 //how painful it is if you fail.
/datum/surgery_step/proc/try_op(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, try_to_fail = FALSE)
var/success = FALSE
@@ -62,14 +63,21 @@
var/prob_chance = 100
if(implement_type) //this means it isn't a require hand or any item step.
prob_chance = implements[implement_type]
+
prob_chance *= surgery.get_propability_multiplier()
+ //if human and awake
+ if (ishuman(target))
+ var/mob/living/carbon/human/H = target
+ if(H.stat == 0) //victorian surgery
+ prob_chance = prob_chance *0.65 //deminish your chances, they are awake!
+
if((prob(prob_chance) || (iscyborg(user) && !silicons_obey_prob)) && chem_check(target) && !try_to_fail)
if(success(user, target, target_zone, tool, surgery))
advance = TRUE
else
if(failure(user, target, target_zone, tool, surgery))
- advance = TRUE
+ advance = FALSE
if(advance && !repeatable)
surgery.status++
if(surgery.status > surgery.steps.len)
@@ -83,15 +91,18 @@
"[user] begins to perform surgery on [target].")
/datum/surgery_step/proc/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery)
- display_results(user, target, "You succeed.",
- "[user] succeeds!",
+ display_results(user, target, "You complete the procedure.",
+ "[user] completes the procedure!",
"[user] finishes.")
return TRUE
/datum/surgery_step/proc/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery)
- display_results(user, target, "You screw up!",
- "[user] screws up!",
+ display_results(user, target, "You failed the procedure!",
+ "[user] failed the procedure!",
"[user] finishes.", TRUE) //By default the patient will notice if the wrong thing has been cut
+ if (ishuman(target)) //pain on humans for messing up.
+ var/obj/item/bodypart/L = target.get_bodypart(target_zone)
+ L.pain_dam += pain_failure
return FALSE
/datum/surgery_step/proc/tool_check(mob/user, obj/item/tool)
diff --git a/code/modules/tgui/external.dm b/code/modules/tgui/external.dm
index 38a5a27e0..d67c251ea 100644
--- a/code/modules/tgui/external.dm
+++ b/code/modules/tgui/external.dm
@@ -1,140 +1,151 @@
- /**
- * tgui external
- *
- * Contains all external tgui declarations.
- **/
+/**
+ * tgui external
+ *
+ * Contains all external tgui declarations.
+ */
- /**
- * public
- *
- * Used to open and update UIs.
- * If this proc is not implemented properly, the UI will not update correctly.
- *
- * required user mob The mob who opened/is using the UI.
- * optional ui_key string The ui_key of the UI.
- * optional ui datum/tgui The UI to be updated, if it exists.
- * optional force_open bool If the UI should be re-opened instead of updated.
- * optional master_ui datum/tgui The parent UI.
- * optional state datum/ui_state The state used to determine status.
- **/
-/datum/proc/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/**
+ * public
+ *
+ * Used to open and update UIs.
+ * If this proc is not implemented properly, the UI will not update correctly.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * optional ui_key string The ui_key of the UI.
+ * optional ui datum/tgui The UI to be updated, if it exists.
+ * optional force_open bool If the UI should be re-opened instead of updated.
+ * optional master_ui datum/tgui The parent UI.
+ * optional state datum/tgui_state The state used to determine status.
+ */
+
+/datum/proc/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
return FALSE // Not implemented.
- /**
- * public
- *
- * Data to be sent to the UI.
- * This must be implemented for a UI to work.
- *
- * required user mob The mob interacting with the UI.
- *
- * return list Data to be sent to the UI.
- **/
+/**
+ * public
+ *
+ * Data to be sent to the UI.
+ * This must be implemented for a UI to work.
+ *
+ * required user mob The mob interacting with the UI.
+ *
+ * return list Data to be sent to the UI.
+ */
/datum/proc/ui_data(mob/user)
return list() // Not implemented.
- /**
- * public
- *
- * Static Data to be sent to the UI.
- * Static data differs from normal data in that it's large data that should be sent infrequently
- * This is implemented optionally for heavy uis that would be sending a lot of redundant data
- * frequently.
- * Gets squished into one object on the frontend side, but the static part is cached.
- *
- * required user mob The mob interacting with the UI.
- *
- * return list Statuic Data to be sent to the UI.
- **/
+/**
+ * public
+ *
+ * Static Data to be sent to the UI.
+ * Static data differs from normal data in that it's large data that should be sent infrequently
+ * This is implemented optionally for heavy uis that would be sending a lot of redundant data
+ * frequently.
+ * Gets squished into one object on the frontend side, but the static part is cached.
+ *
+ * required user mob The mob interacting with the UI.
+ *
+ * return list Statuic Data to be sent to the UI.
+ */
/datum/proc/ui_static_data(mob/user)
return list()
/**
- * public
- *
- * Forces an update on static data. Should be done manually whenever something happens to change static data.
- *
- * required user the mob currently interacting with the ui
- * optional ui ui to be updated
- * optional ui_key ui key of ui to be updated
- *
-**/
+ * public
+ *
+ * Forces an update on static data. Should be done manually whenever something happens to change static data.
+ *
+ * required user the mob currently interacting with the ui
+ * optional ui ui to be updated
+ * optional ui_key ui key of ui to be updated
+ */
/datum/proc/update_static_data(mob/user, datum/tgui/ui, ui_key = "main")
ui = SStgui.try_update_ui(user, src, ui_key, ui)
+ // If there was no ui to update, there's no static data to update either.
if(!ui)
- return //If there was no ui to update, there's no static data to update either.
+ return
ui.push_data(null, ui_static_data(), TRUE)
- /**
- * public
- *
- * Called on a UI when the UI receieves a href.
- * Think of this as Topic().
- *
- * required action string The action/button that has been invoked by the user.
- * required params list A list of parameters attached to the button.
- *
- * return bool If the UI should be updated or not.
- **/
-/datum/proc/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+/**
+ * public
+ *
+ * Called on a UI when the UI receieves a href.
+ * Think of this as Topic().
+ *
+ * required action string The action/button that has been invoked by the user.
+ * required params list A list of parameters attached to the button.
+ *
+ * return bool If the UI should be updated or not.
+ */
+/datum/proc/ui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
+ // If UI is not interactive or usr calling Topic is not the UI user, bail.
if(!ui || ui.status != UI_INTERACTIVE)
- return 1 // If UI is not interactive or usr calling Topic is not the UI user, bail.
+ return TRUE
- /**
- * public
- *
- * Called on an object when a tgui object is being created, allowing you to customise the html
- * For example: inserting a custom stylesheet that you need in the head
- *
- * For this purpose, some tags are available in the html, to be parsed out with replacetext
- * (customheadhtml) - Additions to the head tag
- *
- * required html the html base text
- *
- **/
+/**
+ * public
+ *
+ * Called on an object when a tgui object is being created, allowing you to
+ * customise the html
+ * For example: inserting a custom stylesheet that you need in the head
+ *
+ * For this purpose, some tags are available in the html, to be parsed out
+ ^ with replacetext
+ * (customheadhtml) - Additions to the head tag
+ *
+ * required html the html base text
+ */
/datum/proc/ui_base_html(html)
return html
- /**
- * private
- *
- * The UI's host object (usually src_object).
- * This allows modules/datums to have the UI attached to them,
- * and be a part of another object.
- **/
+/**
+ * private
+ *
+ * The UI's host object (usually src_object).
+ * This allows modules/datums to have the UI attached to them,
+ * and be a part of another object.
+ */
/datum/proc/ui_host(mob/user)
return src // Default src.
- /**
- * global
- *
- * Used to track UIs for a mob.
- **/
-/mob/var/list/open_uis = list()
- /**
- * public
- *
- * Called on a UI's object when the UI is closed, not to be confused with client/verb/uiclose(), which closes the ui window
- *
- *
- **/
-/datum/proc/ui_close()
+/**
+ * global
+ *
+ * Associative list of JSON-encoded shared states that were set by
+ * tgui clients.
+ */
- /**
- * verb
- *
- * Called by UIs when they are closed.
- * Must be a verb so winset() can call it.
- *
- * required uiref ref The UI that was closed.
- **/
-/client/verb/uiclose(ref as text)
+/datum/var/list/tgui_shared_states
+
+/**
+ * global
+ *
+ * Used to track UIs for a mob.
+ */
+/mob/var/list/open_tguis = list()
+/**
+ * public
+ *
+ * Called on a UI's object when the UI is closed, not to be confused with
+ * client/verb/uiclose(), which closes the ui window
+ */
+/datum/proc/ui_close(mob/user)
+
+/**
+ * verb
+ *
+ * Called by UIs when they are closed.
+ * Must be a verb so winset() can call it.
+ *
+ * required uiref ref The UI that was closed.
+ */
+/client/verb/tguiclose(uid as text)
// Name the verb, and hide it from the user panel.
set name = "uiclose"
- set hidden = 1
+ set hidden = TRUE
// Get the UI based on the ref.
- var/datum/tgui/ui = locate(ref)
+ var/datum/tgui/ui = locateUID(uid)
// If we found the UI, close it.
if(istype(ui))
diff --git a/code/modules/tgui/modules/_base.dm b/code/modules/tgui/modules/_base.dm
new file mode 100644
index 000000000..ce12ac633
--- /dev/null
+++ b/code/modules/tgui/modules/_base.dm
@@ -0,0 +1,21 @@
+/*
+TGUI MODULES
+
+This allows for datum-based TGUIs that can be hooked into objects.
+This is useful for things such as the power monitor, which needs to exist on a physical console in the world, but also as a virtual device the AI can use
+
+Code is pretty much ripped verbatim from nano modules, but with un-needed stuff removed
+*/
+/datum/tgui_module
+ var/name
+ var/datum/host
+
+/datum/tgui_module/New(var/host)
+ src.host = host
+
+/datum/tgui_module/ui_host()
+ return host ? host : src
+
+/datum/tgui_module/ui_close(mob/user)
+ if(host)
+ host.ui_close(user)
diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm
index fc30d171f..42abceb1c 100644
--- a/code/modules/tgui/states.dm
+++ b/code/modules/tgui/states.dm
@@ -1,20 +1,20 @@
- /**
- * tgui states
- *
- * Base state and helpers for states. Just does some sanity checks, implement a state for in-depth checks.
- **/
+/**
+ * tgui states
+ *
+ * Base state and helpers for states. Just does some sanity checks, implement a state for in-depth checks.
+ */
- /**
- * public
- *
- * Checks the UI state for a mob.
- *
- * required user mob The mob who opened/is using the UI.
- * required state datum/ui_state The state to check.
- *
- * return UI_state The state of the UI.
- **/
-/datum/proc/ui_status(mob/user, datum/ui_state/state)
+/**
+ * public
+ *
+ * Checks the UI state for a mob.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * required state datum/tgui_state The state to check.
+ *
+ * return UI_state The state of the UI.
+ */
+/datum/proc/ui_status(mob/user, datum/tgui_state/state)
var/src_object = ui_host(user)
. = UI_CLOSE
if(!state)
@@ -22,7 +22,7 @@
if(isobserver(user))
// If they turn on ghost AI control, admins can always interact.
- if(IsAdminGhost(user))
+ if(user.has_unlimited_silicon_privilege)
. = max(., UI_INTERACTIVE)
// Regular ghosts can always at least view if in range.
@@ -34,72 +34,72 @@
var/result = state.can_use_topic(src_object, user)
. = max(., result)
- /**
- * private
- *
- * Checks if a user can use src_object's UI, and returns the state.
- * Can call a mob proc, which allows overrides for each mob.
- *
- * required src_object datum The object/datum which owns the UI.
- * required user mob The mob who opened/is using the UI.
- *
- * return UI_state The state of the UI.
- **/
-/datum/ui_state/proc/can_use_topic(src_object, mob/user)
+/**
+ * private
+ *
+ * Checks if a user can use src_object's UI, and returns the state.
+ * Can call a mob proc, which allows overrides for each mob.
+ *
+ * required src_object datum The object/datum which owns the UI.
+ * required user mob The mob who opened/is using the UI.
+ *
+ * return UI_state The state of the UI.
+ */
+/datum/tgui_state/proc/can_use_topic(src_object, mob/user)
return UI_CLOSE // Don't allow interaction by default.
- /**
- * public
- *
- * Standard interaction/sanity checks. Different mob types may have overrides.
- *
- * return UI_state The state of the UI.
- **/
-/mob/proc/shared_ui_interaction(src_object)
+/**
+ * public
+ *
+ * Standard interaction/sanity checks. Different mob types may have overrides.
+ *
+ * return UI_state The state of the UI.
+ */
+/mob/proc/shared_tgui_interaction(src_object)
if(!client) // Close UIs if mindless.
return UI_CLOSE
else if(stat) // Disable UIs if unconcious.
return UI_DISABLED
- else if(incapacitated() || lying) // Update UIs if incapicitated but concious.
+ else if(incapacitated()) // Update UIs if incapicitated but concious.
return UI_UPDATE
return UI_INTERACTIVE
-/mob/living/silicon/ai/shared_ui_interaction(src_object)
+/mob/living/silicon/ai/shared_tgui_interaction(src_object)
if(lacks_power()) // Disable UIs if the AI is unpowered.
return UI_DISABLED
return ..()
-/mob/living/silicon/robot/shared_ui_interaction(src_object)
+/mob/living/silicon/robot/shared_tgui_interaction(src_object)
if(!cell || cell.charge <= 0 || lockcharge) // Disable UIs if the Borg is unpowered or locked.
return UI_DISABLED
return ..()
/**
- * public
- *
- * Check the distance for a living mob.
- * Really only used for checks outside the context of a mob.
- * Otherwise, use shared_living_ui_distance().
- *
- * required src_object The object which owns the UI.
- * required user mob The mob who opened/is using the UI.
- *
- * return UI_state The state of the UI.
- **/
-/atom/proc/contents_ui_distance(src_object, mob/living/user)
- return user.shared_living_ui_distance(src_object) // Just call this mob's check.
+ * public
+ *
+ * Check the distance for a living mob.
+ * Really only used for checks outside the context of a mob.
+ * Otherwise, use shared_living_ui_distance().
+ *
+ * required src_object The object which owns the UI.
+ * required user mob The mob who opened/is using the UI.
+ *
+ * return UI_state The state of the UI.
+ */
+/atom/proc/contents_tgui_distance(src_object, mob/living/user)
+ return user.shared_living_tgui_distance(src_object) // Just call this mob's check.
- /**
- * public
- *
- * Distance versus interaction check.
- *
- * required src_object atom/movable The object which owns the UI.
- *
- * return UI_state The state of the UI.
- **/
-/mob/living/proc/shared_living_ui_distance(atom/movable/src_object)
- if(!(src_object in view(src))) // If the object is obscured, close it.
+/**
+ * public
+ *
+ * Distance versus interaction check.
+ *
+ * required src_object atom/movable The object which owns the UI.
+ *
+ * return UI_state The state of the UI.
+ */
+/mob/living/proc/shared_living_tgui_distance(atom/movable/src_object, viewcheck = TRUE)
+ if(viewcheck && !(src_object in view(src))) // If the object is obscured, close it.
return UI_CLOSE
var/dist = get_dist(src_object, src)
@@ -111,7 +111,7 @@
return UI_DISABLED
return UI_CLOSE // Otherwise, we got nothing.
-/mob/living/carbon/human/shared_living_ui_distance(atom/movable/src_object)
+/mob/living/carbon/human/shared_living_tgui_distance(atom/movable/src_object)
if(dna.check_mutation(TK) && tkMaxRangeCheck(src, src_object))
return UI_INTERACTIVE
return ..()
diff --git a/code/modules/tgui/states/admin.dm b/code/modules/tgui/states/admin.dm
index 945a86443..a634cc5cc 100644
--- a/code/modules/tgui/states/admin.dm
+++ b/code/modules/tgui/states/admin.dm
@@ -4,9 +4,9 @@
* Checks that the user is an admin, end-of-story.
**/
-GLOBAL_DATUM_INIT(admin_state, /datum/ui_state/admin_state, new)
+GLOBAL_DATUM_INIT(tgui_admin_state, /datum/tgui_state/admin_state, new)
-/datum/ui_state/admin_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/admin_state/can_use_topic(src_object, mob/user)
if(check_rights_for(user.client, R_ADMIN))
return UI_INTERACTIVE
return UI_CLOSE
diff --git a/code/modules/tgui/states/always.dm b/code/modules/tgui/states/always.dm
index b6c689d5d..46d13dfe9 100644
--- a/code/modules/tgui/states/always.dm
+++ b/code/modules/tgui/states/always.dm
@@ -5,7 +5,7 @@
* Always grants the user UI_INTERACTIVE. Period.
**/
-GLOBAL_DATUM_INIT(always_state, /datum/ui_state/always_state, new)
+GLOBAL_DATUM_INIT(tgui_always_state, /datum/tgui_state/always_state, new)
-/datum/ui_state/always_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/always_state/can_use_topic(src_object, mob/user)
return UI_INTERACTIVE
diff --git a/code/modules/tgui/states/conscious.dm b/code/modules/tgui/states/conscious.dm
index 4323c1391..82171c0a9 100644
--- a/code/modules/tgui/states/conscious.dm
+++ b/code/modules/tgui/states/conscious.dm
@@ -4,9 +4,9 @@
* Only checks if the user is conscious.
**/
-GLOBAL_DATUM_INIT(conscious_state, /datum/ui_state/conscious_state, new)
+GLOBAL_DATUM_INIT(tgui_conscious_state, /datum/tgui_state/conscious_state, new)
-/datum/ui_state/conscious_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/conscious_state/can_use_topic(src_object, mob/user)
if(user.stat == CONSCIOUS)
return UI_INTERACTIVE
return UI_CLOSE
diff --git a/code/modules/tgui/states/contained.dm b/code/modules/tgui/states/contained.dm
index 7387f7e6c..af3cb9dfc 100644
--- a/code/modules/tgui/states/contained.dm
+++ b/code/modules/tgui/states/contained.dm
@@ -4,9 +4,9 @@
* Checks that the user is inside the src_object.
**/
-GLOBAL_DATUM_INIT(contained_state, /datum/ui_state/contained_state, new)
+GLOBAL_DATUM_INIT(tgui_contained_state, /datum/tgui_state/contained_state, new)
-/datum/ui_state/contained_state/can_use_topic(atom/src_object, mob/user)
+/datum/tgui_state/contained_state/can_use_topic(atom/src_object, mob/user)
if(!src_object.contains(user))
return UI_CLOSE
- return user.shared_ui_interaction(src_object)
+ return user.shared_tgui_interaction(src_object)
diff --git a/code/modules/tgui/states/deep_inventory.dm b/code/modules/tgui/states/deep_inventory.dm
index 06bdb92f3..27c6892a8 100644
--- a/code/modules/tgui/states/deep_inventory.dm
+++ b/code/modules/tgui/states/deep_inventory.dm
@@ -4,9 +4,9 @@
* Checks that the src_object is in the user's deep (backpack, box, toolbox, etc) inventory.
**/
-GLOBAL_DATUM_INIT(deep_inventory_state, /datum/ui_state/deep_inventory_state, new)
+GLOBAL_DATUM_INIT(tgui_deep_inventory_state, /datum/tgui_state/deep_inventory_state, new)
-/datum/ui_state/deep_inventory_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/deep_inventory_state/can_use_topic(src_object, mob/user)
if(!user.contains(src_object))
return UI_CLOSE
- return user.shared_ui_interaction(src_object)
+ return user.shared_tgui_interaction(src_object)
diff --git a/code/modules/tgui/states/default.dm b/code/modules/tgui/states/default.dm
index c6741f20b..5fe29a862 100644
--- a/code/modules/tgui/states/default.dm
+++ b/code/modules/tgui/states/default.dm
@@ -4,39 +4,39 @@
* Checks a number of things -- mostly physical distance for humans and view for robots.
**/
-GLOBAL_DATUM_INIT(default_state, /datum/ui_state/default, new)
+GLOBAL_DATUM_INIT(tgui_default_state, /datum/tgui_state/default, new)
-/datum/ui_state/default/can_use_topic(src_object, mob/user)
- return user.default_can_use_topic(src_object) // Call the individual mob-overridden procs.
+/datum/tgui_state/default/can_use_topic(src_object, mob/user)
+ return user.default_can_use_tgui_topic(src_object) // Call the individual mob-overridden procs.
-/mob/proc/default_can_use_topic(src_object)
+/mob/proc/default_can_use_tgui_topic(src_object)
return UI_CLOSE // Don't allow interaction by default.
-/mob/living/default_can_use_topic(src_object)
- . = shared_ui_interaction(src_object)
+/mob/living/default_can_use_tgui_topic(src_object)
+ . = shared_tgui_interaction(src_object)
if(. > UI_CLOSE && loc)
- . = min(., loc.contents_ui_distance(src_object, src)) // Check the distance...
+ . = min(., loc.contents_tgui_distance(src_object, src)) // Check the distance...
if(. == UI_INTERACTIVE) // Non-human living mobs can only look, not touch.
return UI_UPDATE
-/mob/living/carbon/human/default_can_use_topic(src_object)
- . = shared_ui_interaction(src_object)
+/mob/living/carbon/human/default_can_use_tgui_topic(src_object)
+ . = shared_tgui_interaction(src_object)
if(. > UI_CLOSE)
- . = min(., shared_living_ui_distance(src_object)) // Check the distance...
+ . = min(., shared_living_tgui_distance(src_object)) // Check the distance...
-/mob/living/silicon/robot/default_can_use_topic(src_object)
- . = shared_ui_interaction(src_object)
+/mob/living/silicon/robot/default_can_use_tgui_topic(src_object)
+ . = shared_tgui_interaction(src_object)
if(. <= UI_DISABLED)
return
// Robots can interact with anything they can see.
var/list/clientviewlist = getviewsize(client.view)
- if(get_dist(src, src_object) <= min(clientviewlist[1],clientviewlist[2]))
+ if((src_object in view(src)) && (get_dist(src, src_object) <= min(clientviewlist[1],clientviewlist[2])))
return UI_INTERACTIVE
return UI_DISABLED // Otherwise they can keep the UI open.
-/mob/living/silicon/ai/default_can_use_topic(src_object)
- . = shared_ui_interaction(src_object)
+/mob/living/silicon/ai/default_can_use_tgui_topic(src_object)
+ . = shared_tgui_interaction(src_object)
if(. < UI_INTERACTIVE)
return
@@ -45,12 +45,12 @@ GLOBAL_DATUM_INIT(default_state, /datum/ui_state/default, new)
return UI_INTERACTIVE
return UI_CLOSE
-/mob/living/simple_animal/default_can_use_topic(src_object)
- . = shared_ui_interaction(src_object)
+/mob/living/simple_animal/default_can_use_tgui_topic(src_object)
+ . = shared_tgui_interaction(src_object)
if(. > UI_CLOSE)
- . = min(., shared_living_ui_distance(src_object)) //simple animals can only use things they're near.
+ . = min(., shared_living_tgui_distance(src_object)) //simple animals can only use things they're near.
-/mob/living/silicon/pai/default_can_use_topic(src_object)
+/mob/living/silicon/pai/default_can_use_tgui_topic(src_object)
// pAIs can only use themselves and the owner's radio.
if((src_object == src || src_object == radio) && !stat)
return UI_INTERACTIVE
diff --git a/code/modules/tgui/states/hands.dm b/code/modules/tgui/states/hands.dm
index 5da0e5d50..f65462505 100644
--- a/code/modules/tgui/states/hands.dm
+++ b/code/modules/tgui/states/hands.dm
@@ -4,22 +4,22 @@
* Checks that the src_object is in the user's hands.
**/
-GLOBAL_DATUM_INIT(hands_state, /datum/ui_state/hands_state, new)
+GLOBAL_DATUM_INIT(tgui_hands_state, /datum/tgui_state/hands_state, new)
-/datum/ui_state/hands_state/can_use_topic(src_object, mob/user)
- . = user.shared_ui_interaction(src_object)
+/datum/tgui_state/hands_state/can_use_topic(src_object, mob/user)
+ . = user.shared_tgui_interaction(src_object)
if(. > UI_CLOSE)
- return min(., user.hands_can_use_topic(src_object))
+ return min(., user.hands_can_use_tgui_topic(src_object))
-/mob/proc/hands_can_use_topic(src_object)
+/mob/proc/hands_can_use_tgui_topic(src_object)
return UI_CLOSE
-/mob/living/hands_can_use_topic(src_object)
+/mob/living/hands_can_use_tgui_topic(src_object)
if(is_holding(src_object))
return UI_INTERACTIVE
return UI_CLOSE
-/mob/living/silicon/robot/hands_can_use_topic(src_object)
+/mob/living/silicon/robot/hands_can_use_tgui_topic(src_object)
if(activated(src_object))
return UI_INTERACTIVE
return UI_CLOSE
diff --git a/code/modules/tgui/states/human_adjacent.dm b/code/modules/tgui/states/human_adjacent.dm
index 0ab20b36f..3f8efa010 100644
--- a/code/modules/tgui/states/human_adjacent.dm
+++ b/code/modules/tgui/states/human_adjacent.dm
@@ -6,10 +6,10 @@
* human adjacent user.
**/
-GLOBAL_DATUM_INIT(human_adjacent_state, /datum/ui_state/human_adjacent_state, new)
+GLOBAL_DATUM_INIT(tgui_human_adjacent_state, /datum/tgui_state/human_adjacent_state, new)
-/datum/ui_state/human_adjacent_state/can_use_topic(src_object, mob/user)
- . = user.default_can_use_topic(src_object)
+/datum/tgui_state/human_adjacent_state/can_use_topic(src_object, mob/user)
+ . = user.default_can_use_tgui_topic(src_object)
var/dist = get_dist(src_object, user)
if((dist > 1) || (!ishuman(user)))
diff --git a/code/modules/tgui/states/inventory.dm b/code/modules/tgui/states/inventory.dm
index b8b1ad3b6..a89154537 100644
--- a/code/modules/tgui/states/inventory.dm
+++ b/code/modules/tgui/states/inventory.dm
@@ -4,9 +4,9 @@
* Checks that the src_object is in the user's top-level (hand, ear, pocket, belt, etc) inventory.
**/
-GLOBAL_DATUM_INIT(inventory_state, /datum/ui_state/inventory_state, new)
+GLOBAL_DATUM_INIT(tgui_inventory_state, /datum/tgui_state/inventory_state, new)
-/datum/ui_state/inventory_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/inventory_state/can_use_topic(src_object, mob/user)
if(!(src_object in user))
return UI_CLOSE
- return user.shared_ui_interaction(src_object)
+ return user.shared_tgui_interaction(src_object)
diff --git a/code/modules/tgui/states/language_menu.dm b/code/modules/tgui/states/language_menu.dm
index fedc4320e..736fef5c7 100644
--- a/code/modules/tgui/states/language_menu.dm
+++ b/code/modules/tgui/states/language_menu.dm
@@ -2,9 +2,9 @@
* tgui state: language_menu_state
*/
-GLOBAL_DATUM_INIT(language_menu_state, /datum/ui_state/language_menu, new)
+GLOBAL_DATUM_INIT(language_menu_state, /datum/tgui_state/language_menu, new)
-/datum/ui_state/language_menu/can_use_topic(src_object, mob/user)
+/datum/tgui_state/language_menu/can_use_topic(src_object, mob/user)
. = UI_CLOSE
if(check_rights_for(user.client, R_ADMIN))
. = UI_INTERACTIVE
diff --git a/code/modules/tgui/states/not_incapacitated.dm b/code/modules/tgui/states/not_incapacitated.dm
index 12fe266bc..3f87a47db 100644
--- a/code/modules/tgui/states/not_incapacitated.dm
+++ b/code/modules/tgui/states/not_incapacitated.dm
@@ -4,7 +4,7 @@
* Checks that the user isn't incapacitated
**/
-GLOBAL_DATUM_INIT(not_incapacitated_state, /datum/ui_state/not_incapacitated_state, new)
+GLOBAL_DATUM_INIT(tgui_not_incapacitated_state, /datum/tgui_state/not_incapacitated_state, new)
/**
* tgui state: not_incapacitated_turf_state
@@ -12,18 +12,18 @@ GLOBAL_DATUM_INIT(not_incapacitated_state, /datum/ui_state/not_incapacitated_sta
* Checks that the user isn't incapacitated and that their loc is a turf
**/
-GLOBAL_DATUM_INIT(not_incapacitated_turf_state, /datum/ui_state/not_incapacitated_state, new(no_turfs = TRUE))
+GLOBAL_DATUM_INIT(tgui_not_incapacitated_turf_state, /datum/tgui_state/not_incapacitated_state, new(no_turfs = TRUE))
-/datum/ui_state/not_incapacitated_state
+/datum/tgui_state/not_incapacitated_state
var/turf_check = FALSE
-/datum/ui_state/not_incapacitated_state/New(loc, no_turfs = FALSE)
+/datum/tgui_state/not_incapacitated_state/New(loc, no_turfs = FALSE)
..()
turf_check = no_turfs
-/datum/ui_state/not_incapacitated_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/not_incapacitated_state/can_use_topic(src_object, mob/user)
if(user.stat)
return UI_CLOSE
- if(user.incapacitated() || user.lying || (turf_check && !isturf(user.loc)))
+ if(user.incapacitated() || (turf_check && !isturf(user.loc)))
return UI_DISABLED
- return UI_INTERACTIVE
\ No newline at end of file
+ return UI_INTERACTIVE
diff --git a/code/modules/tgui/states/notcontained.dm b/code/modules/tgui/states/notcontained.dm
index 77a7fe01b..456bfbeac 100644
--- a/code/modules/tgui/states/notcontained.dm
+++ b/code/modules/tgui/states/notcontained.dm
@@ -4,23 +4,23 @@
* Checks that the user is not inside src_object, and then makes the default checks.
**/
-GLOBAL_DATUM_INIT(notcontained_state, /datum/ui_state/notcontained_state, new)
+GLOBAL_DATUM_INIT(tgui_notcontained_state, /datum/tgui_state/notcontained_state, new)
-/datum/ui_state/notcontained_state/can_use_topic(atom/src_object, mob/user)
- . = user.shared_ui_interaction(src_object)
+/datum/tgui_state/notcontained_state/can_use_topic(atom/src_object, mob/user)
+ . = user.shared_tgui_interaction(src_object)
if(. > UI_CLOSE)
- return min(., user.notcontained_can_use_topic(src_object))
+ return min(., user.notcontained_can_use_tgui_topic(src_object))
-/mob/proc/notcontained_can_use_topic(src_object)
+/mob/proc/notcontained_can_use_tgui_topic(src_object)
return UI_CLOSE
-/mob/living/notcontained_can_use_topic(atom/src_object)
+/mob/living/notcontained_can_use_tgui_topic(atom/src_object)
if(src_object.contains(src))
return UI_CLOSE // Close if we're inside it.
- return default_can_use_topic(src_object)
+ return default_can_use_tgui_topic(src_object)
-/mob/living/silicon/notcontained_can_use_topic(src_object)
- return default_can_use_topic(src_object) // Silicons use default bevhavior.
+/mob/living/silicon/notcontained_can_use_tgui_topic(src_object)
+ return default_can_use_tgui_topic(src_object) // Silicons use default bevhavior.
-/mob/living/simple_animal/drone/notcontained_can_use_topic(src_object)
- return default_can_use_topic(src_object) // Drones use default bevhavior.
+/mob/living/simple_animal/drone/notcontained_can_use_tgui_topic(src_object)
+ return default_can_use_tgui_topic(src_object) // Drones use default bevhavior.
diff --git a/code/modules/tgui/states/observer.dm b/code/modules/tgui/states/observer.dm
index ade0ce66b..b17c3260c 100644
--- a/code/modules/tgui/states/observer.dm
+++ b/code/modules/tgui/states/observer.dm
@@ -4,9 +4,9 @@
* Checks that the user is an observer/ghost.
**/
-GLOBAL_DATUM_INIT(observer_state, /datum/ui_state/observer_state, new)
+GLOBAL_DATUM_INIT(tgui_observer_state, /datum/tgui_state/observer_state, new)
-/datum/ui_state/observer_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/observer_state/can_use_topic(src_object, mob/user)
if(isobserver(user))
return UI_INTERACTIVE
return UI_CLOSE
diff --git a/code/modules/tgui/states/physical.dm b/code/modules/tgui/states/physical.dm
index 3b13dc5b3..ef6faefeb 100644
--- a/code/modules/tgui/states/physical.dm
+++ b/code/modules/tgui/states/physical.dm
@@ -2,25 +2,25 @@
* tgui state: physical_state
*
* Short-circuits the default state to only check physical distance.
- */
+ **/
-GLOBAL_DATUM_INIT(physical_state, /datum/ui_state/physical, new)
+GLOBAL_DATUM_INIT(tgui_physical_state, /datum/tgui_state/physical, new)
-/datum/ui_state/physical/can_use_topic(src_object, mob/user)
- . = user.shared_ui_interaction(src_object)
+/datum/tgui_state/physical/can_use_topic(src_object, mob/user)
+ . = user.shared_tgui_interaction(src_object)
if(. > UI_CLOSE)
- return min(., user.physical_can_use_topic(src_object))
+ return min(., user.physical_can_use_tgui_topic(src_object))
-/mob/proc/physical_can_use_topic(src_object)
+/mob/proc/physical_can_use_tgui_topic(src_object)
return UI_CLOSE
-/mob/living/physical_can_use_topic(src_object)
- return shared_living_ui_distance(src_object)
+/mob/living/physical_can_use_tgui_topic(src_object)
+ return shared_living_tgui_distance(src_object)
-/mob/living/silicon/physical_can_use_topic(src_object)
- return max(UI_UPDATE, shared_living_ui_distance(src_object)) // Silicons can always see.
+/mob/living/silicon/physical_can_use_tgui_topic(src_object)
+ return max(UI_UPDATE, shared_living_tgui_distance(src_object)) // Silicons can always see.
-/mob/living/silicon/ai/physical_can_use_topic(src_object)
+/mob/living/silicon/ai/physical_can_use_tgui_topic(src_object)
return UI_UPDATE // AIs are not physical.
/**
@@ -29,10 +29,10 @@ GLOBAL_DATUM_INIT(physical_state, /datum/ui_state/physical, new)
* Short-circuits the default state to only check physical distance, being in view doesn't matter
*/
-GLOBAL_DATUM_INIT(physical_obscured_state, /datum/ui_state/physical_obscured_state, new)
+GLOBAL_DATUM_INIT(tgui_physical_obscured_state, /datum/tgui_state/physical_obscured_state, new)
-/datum/ui_state/physical_obscured_state/can_use_topic(src_object, mob/user)
- . = user.shared_ui_interaction(src_object)
+/datum/tgui_state/physical_obscured_state/can_use_topic(src_object, mob/user)
+ . = user.shared_tgui_interaction(src_object)
if(. > UI_CLOSE)
return min(., user.physical_obscured_can_use_topic(src_object))
@@ -40,10 +40,10 @@ GLOBAL_DATUM_INIT(physical_obscured_state, /datum/ui_state/physical_obscured_sta
return UI_CLOSE
/mob/living/physical_obscured_can_use_topic(src_object)
- return shared_living_ui_distance(src_object)
+ return shared_living_tgui_distance(src_object)
/mob/living/silicon/physical_obscured_can_use_topic(src_object)
- return max(UI_UPDATE, shared_living_ui_distance(src_object)) // Silicons can always see.
+ return max(UI_UPDATE, shared_living_tgui_distance(src_object)) // Silicons can always see.
/mob/living/silicon/ai/physical_obscured_can_use_topic(src_object)
return UI_UPDATE // AIs are not physical.
\ No newline at end of file
diff --git a/code/modules/tgui/states/self.dm b/code/modules/tgui/states/self.dm
index 10849772c..fa7f6a2c3 100644
--- a/code/modules/tgui/states/self.dm
+++ b/code/modules/tgui/states/self.dm
@@ -4,9 +4,9 @@
* Only checks that the user and src_object are the same.
**/
-GLOBAL_DATUM_INIT(self_state, /datum/ui_state/self_state, new)
+GLOBAL_DATUM_INIT(tgui_self_state, /datum/tgui_state/self_state, new)
-/datum/ui_state/self_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/self_state/can_use_topic(src_object, mob/user)
if(src_object != user)
return UI_CLOSE
- return user.shared_ui_interaction(src_object)
+ return user.shared_tgui_interaction(src_object)
diff --git a/code/modules/tgui/states/zlevel.dm b/code/modules/tgui/states/zlevel.dm
index 6ccfd0fe7..5cff13ff3 100644
--- a/code/modules/tgui/states/zlevel.dm
+++ b/code/modules/tgui/states/zlevel.dm
@@ -4,9 +4,9 @@
* Only checks that the Z-level of the user and src_object are the same.
**/
-GLOBAL_DATUM_INIT(z_state, /datum/ui_state/z_state, new)
+GLOBAL_DATUM_INIT(tgui_z_state, /datum/tgui_state/z_state, new)
-/datum/ui_state/z_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/z_state/can_use_topic(src_object, mob/user)
var/turf/turf_obj = get_turf(src_object)
var/turf/turf_usr = get_turf(user)
if(turf_obj && turf_usr && turf_obj.z == turf_usr.z)
diff --git a/code/modules/tgui/subsystem.dm b/code/modules/tgui/subsystem.dm
index 90a00fb60..f91247b2f 100644
--- a/code/modules/tgui/subsystem.dm
+++ b/code/modules/tgui/subsystem.dm
@@ -128,11 +128,11 @@
* return int The number of UIs updated.
**/
/datum/controller/subsystem/tgui/proc/update_user_uis(mob/user, datum/src_object = null, ui_key = null)
- if(isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
+ if(isnull(user.open_tguis) || !istype(user.open_tguis, /list) || open_uis.len == 0)
return 0 // Couldn't find any UIs for this user.
var/update_count = 0
- for(var/datum/tgui/ui in user.open_uis)
+ for(var/datum/tgui/ui in user.open_tguis)
if((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
ui.process(force = 1) // Update the UI.
update_count++ // Count each UI we upadte.
@@ -150,11 +150,11 @@
* return int The number of UIs closed.
**/
/datum/controller/subsystem/tgui/proc/close_user_uis(mob/user, datum/src_object = null, ui_key = null)
- if(isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
+ if(isnull(user.open_tguis) || !istype(user.open_tguis, /list) || open_uis.len == 0)
return 0 // Couldn't find any UIs for this user.
var/close_count = 0
- for(var/datum/tgui/ui in user.open_uis)
+ for(var/datum/tgui/ui in user.open_tguis)
if((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
ui.close() // Close the UI.
close_count++ // Count each UI we close.
@@ -175,7 +175,7 @@
open_uis[src_object_key][ui.ui_key] = list() // Make a list for the ui_key.
// Append the UI to all the lists.
- ui.user.open_uis |= ui
+ ui.user.open_tguis |= ui
var/list/uis = open_uis[src_object_key][ui.ui_key]
uis |= ui
processing_uis |= ui
@@ -198,7 +198,7 @@
processing_uis.Remove(ui) // Remove it from the list of processing UIs.
if(ui.user) // If the user exists, remove it from them too.
- ui.user.open_uis.Remove(ui)
+ ui.user.open_tguis.Remove(ui)
var/Ukey = ui.ui_key
var/list/uis = open_uis[src_object_key][Ukey] // Remove it from the list of open UIs.
uis.Remove(ui)
@@ -233,15 +233,15 @@
* return bool If the UIs were transferred.
**/
/datum/controller/subsystem/tgui/proc/on_transfer(mob/source, mob/target)
- if(!source || isnull(source.open_uis) || !istype(source.open_uis, /list) || open_uis.len == 0)
+ if(!source || isnull(source.open_tguis) || !istype(source.open_tguis, /list) || open_uis.len == 0)
return 0 // The old mob had no open UIs.
- if(isnull(target.open_uis) || !istype(target.open_uis, /list))
- target.open_uis = list() // Create a list for the new mob if needed.
+ if(isnull(target.open_tguis) || !istype(target.open_tguis, /list))
+ target.open_tguis = list() // Create a list for the new mob if needed.
- for(var/datum/tgui/ui in source.open_uis)
+ for(var/datum/tgui/ui in source.open_tguis)
ui.user = target // Inform the UIs of their new owner.
- target.open_uis.Add(ui) // Transfer all the UIs.
+ target.open_tguis.Add(ui) // Transfer all the UIs.
- source.open_uis.Cut() // Clear the old list.
+ source.open_tguis.Cut() // Clear the old list.
return 1 // Let the caller know we did it.
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index 55fe8f0bb..f564a8c0f 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -1,12 +1,12 @@
- /**
- * tgui
- *
- * /tg/station user interface library
- **/
+/**
+ * tgui
+ *
+ * /tg/station user interface library
+ */
- /**
- * tgui datum (represents a UI).
- **/
+/**
+ * tgui datum (represents a UI).
+ */
/datum/tgui
/// The mob who opened/is using the UI.
var/mob/user
@@ -22,8 +22,10 @@
var/width = 0
/// The window height
var/height = 0
- /// The style to be used for this UI.
- var/style = "nanotrasen"
+
+ // /// The style to be used for this UI.
+ // var/style = "nanotrasen"
+
/// The interface (template) to be used for this UI.
var/interface
/// Update the UI every MC tick.
@@ -34,42 +36,40 @@
var/list/initial_data
/// The static data used to initialize the UI.
var/list/initial_static_data
+ /// Holder for the json string, that is sent during the initial update
+ var/_initial_update
/// The status/visibility of the UI.
var/status = UI_INTERACTIVE
/// Topic state used to determine status/interactability.
- var/datum/ui_state/state = null
+ var/datum/tgui_state/state = null
/// The parent UI.
var/datum/tgui/master_ui
/// Children of this UI.
var/list/datum/tgui/children = list()
- var/custom_browser_id = FALSE
- var/ui_screen = "home"
- /**
- * public
- *
- * Create a new UI.
- *
- * required user mob The mob who opened/is using the UI.
- * required src_object datum The object or datum which owns the UI.
- * required ui_key string The ui_key of the UI.
- * required interface string The interface used to render the UI.
- * optional title string The title of the UI.
- * optional width int The window width.
- * optional height int The window height.
- * optional master_ui datum/tgui The parent UI.
- * optional state datum/ui_state The state used to determine status.
- *
- * return datum/tgui The requested UI.
- **/
-/datum/tgui/New(mob/user, datum/src_object, ui_key, interface, title, width = 0, height = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state, browser_id = null)
+/**
+ * public
+ *
+ * Create a new UI.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * required src_object datum The object or datum which owns the UI.
+ * required ui_key string The ui_key of the UI.
+ * required interface string The interface used to render the UI.
+ * optional title string The title of the UI.
+ * optional width int The window width.
+ * optional height int The window height.
+ * optional master_ui datum/tgui The parent UI.
+ * optional state datum/tgui_state The state used to determine status.
+ *
+ * return datum/tgui The requested UI.
+ */
+/datum/tgui/New(mob/user, datum/src_object, ui_key, interface, title, width = 0, height = 0, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
src.user = user
src.src_object = src_object
src.ui_key = ui_key
- src.window_id = browser_id ? browser_id : "[REF(src_object)]-[ui_key]" // DO NOT replace with \ref here. src_object could potentially be tagged
- src.custom_browser_id = browser_id ? TRUE : FALSE
-
- set_interface(interface)
+ src.window_id = "[src_object.UID()]-[ui_key]"
+ src.interface = interface
if(title)
src.title = sanitize(title)
@@ -83,14 +83,16 @@
master_ui.children += src
src.state = state
- var/datum/asset/assets = get_asset_datum(/datum/asset/group/tgui)
- assets.send(user)
+ var/datum/asset/tgui_assets = get_asset_datum(/datum/asset/simple/tgui)
+ var/datum/asset/fa = get_asset_datum(/datum/asset/simple/fontawesome)
+ tgui_assets.send(user)
+ fa.send(user)
- /**
- * public
- *
- * Open this UI (and initialize it with data).
- **/
+/**
+ * public
+ *
+ * Open this UI (and initialize it with data).
+ */
/datum/tgui/proc/open()
if(!user.client)
return // Bail if there is no client.
@@ -99,18 +101,19 @@
if(status < UI_UPDATE)
return // Bail if we're not supposed to open.
- var/window_size
- if(width && height) // If we have a width and height, use them.
- window_size = "size=[width]x[height];"
- else
- window_size = ""
+
+
+ // Build window options
+ var/window_options = "can_minimize=0;auto_format=0;"
+ // If we have a width and height, use them.
+ if(width && height)
+ window_options += "size=[width]x[height];"
// Remove titlebar and resize handles for a fancy window
- var/have_title_bar
if(user.client.prefs.tgui_fancy)
- have_title_bar = "titlebar=0;can_resize=0;"
+ window_options += "titlebar=0;can_resize=0;"
else
- have_title_bar = "titlebar=1;can_resize=1;"
+ window_options += "titlebar=1;can_resize=1;"
// Generate page html
var/html
@@ -118,52 +121,52 @@
// Allow the src object to override the html if needed
html = src_object.ui_base_html(html)
// Replace template tokens with important UI data
- // NOTE: Intentional \ref usage; tgui datums can't/shouldn't
- // be tagged, so this is an effective unwrap
- html = replacetextEx(html, "\[ref]", "\ref[src]")
- html = replacetextEx(html, "\[style]", style)
+ html = replacetextEx(html, "\[tgui:ref]", "[src.UID()]")
// Open the window.
- user << browse(html, "window=[window_id];can_minimize=0;auto_format=0;[window_size][have_title_bar]")
- if (!custom_browser_id)
- // Instruct the client to signal UI when the window is closed.
- // NOTE: Intentional \ref usage; tgui datums can't/shouldn't
- // be tagged, so this is an effective unwrap
- winset(user, window_id, "on-close=\"uiclose \ref[src]\"")
+ user << browse(html, "window=[window_id];[window_options]")
+ // Instruct the client to signal UI when the window is closed.
+ // NOTE: Intentional \ref usage; tgui datums can't/shouldn't
+ // be tagged, so this is an effective unwrap
+ winset(user, window_id, "on-close=\"uiclose [UID()]\"")
+
+ // Pre-fetch initial state while browser is still loading in
+ // another thread
if(!initial_data)
initial_data = src_object.ui_data(user)
if(!initial_static_data)
initial_static_data = src_object.ui_static_data(user)
+ _initial_update = url_encode(get_json(initial_data, initial_static_data))
SStgui.on_open(src)
- /**
- * public
- *
- * Reinitialize the UI.
- * (Possibly with a new interface and/or data).
- *
- * optional template string The name of the new interface.
- * optional data list The new initial data.
- **/
+/**
+ * public
+ *
+ * Reinitialize the UI.
+ * (Possibly with a new interface and/or data).
+ *
+ * optional template string The name of the new interface.
+ * optional data list The new initial data.
+ */
/datum/tgui/proc/reinitialize(interface, list/data, list/static_data)
if(interface)
- set_interface(interface) // Set a new interface.
+ src.interface = interface
if(data)
initial_data = data
if(static_data)
initial_static_data = static_data
open()
- /**
- * public
- *
- * Close the UI, and all its children.
- **/
+/**
+ * public
+ *
+ * Close the UI, and all its children.
+ */
/datum/tgui/proc/close()
user << browse(null, "window=[window_id]") // Close the window.
- src_object.ui_close()
+ src_object.ui_close(user)
SStgui.on_close(src)
for(var/datum/tgui/child in children) // Loop through and close all children.
child.close()
@@ -172,67 +175,68 @@
master_ui = null
qdel(src)
- /**
- * public
- *
- * Set the style for this UI.
- *
- * required style string The new UI style.
- **/
-/datum/tgui/proc/set_style(style)
- src.style = lowertext(style)
+// /**
+// * public
+// *
+// * Set the style for this UI.
+// *
+// * required style string The new UI style.
+// **/
+// /datum/tgui/proc/set_style(style)
+// src.style = lowertext(style)
- /**
- * public
- *
- * Set the interface (template) for this UI.
- *
- * required interface string The new UI interface.
- **/
-/datum/tgui/proc/set_interface(interface)
- src.interface = lowertext(interface)
+// /**
+// * public
+// *
+// * Set the interface (template) for this UI.
+// *
+// * required interface string The new UI interface.
+// **/
+// /datum/tgui/proc/set_interface(interface)
+// src.interface = lowertext(interface)
- /**
- * public
- *
- * Enable/disable auto-updating of the UI.
- *
- * required state bool Enable/disable auto-updating.
- **/
+/**
+ * public
+ *
+ * Enable/disable auto-updating of the UI.
+ *
+ * required state bool Enable/disable auto-updating.
+ */
/datum/tgui/proc/set_autoupdate(state = TRUE)
autoupdate = state
- /**
- * private
- *
- * Package the data to send to the UI, as JSON.
- * This includes the UI data and config_data.
- *
- * return string The packaged JSON.
- **/
+/**
+ * private
+ *
+ * Package the data to send to the UI, as JSON.
+ * This includes the UI data and config_data.
+ *
+ * return string The packaged JSON.
+ */
/datum/tgui/proc/get_json(list/data, list/static_data)
var/list/json_data = list()
json_data["config"] = list(
"title" = title,
"status" = status,
- "screen" = ui_screen,
- "style" = style,
+ // "style" = style,
"interface" = interface,
"fancy" = user.client.prefs.tgui_fancy,
- "locked" = user.client.prefs.tgui_lock && !custom_browser_id,
"observer" = isobserver(user),
"window" = window_id,
- // NOTE: Intentional \ref usage; tgui datums can't/shouldn't
- // be tagged, so this is an effective unwrap
- "ref" = "\ref[src]"
+ // "map" = (GLOB.using_map && GLOB.using_map.name) ? GLOB.using_map.name : "Unknown",
+ "ref" = "[src.UID()]"
)
-
+
if(!isnull(data))
json_data["data"] = data
if(!isnull(static_data))
json_data["static_data"] = static_data
+ // Send shared states
+ if(src_object.tgui_shared_states)
+ json_data["shared"] = src_object.tgui_shared_states
+
// Generate the JSON.
var/json = json_encode(json_data)
// Strip #255/improper.
@@ -240,13 +244,13 @@
json = replacetext(json, "\improper", "")
return json
- /**
- * private
- *
- * Handle clicks from the UI.
- * Call the src_object's ui_act() if status is UI_INTERACTIVE.
- * If the src_object's ui_act() returns 1, update all UIs attacked to it.
- **/
+/**
+ * private
+ *
+ * Handle clicks from the UI.
+ * Call the src_object's ui_act() if status is UI_INTERACTIVE.
+ * If the src_object's ui_act() returns 1, update all UIs attacked to it.
+ */
/datum/tgui/Topic(href, href_list)
if(user != usr)
return // Something is not right here.
@@ -256,35 +260,48 @@
switch(action)
if("tgui:initialize")
- user << output(url_encode(get_json(initial_data, initial_static_data)), "[custom_browser_id ? window_id : "[window_id].browser"]:initialize")
+ user << output(_initial_update, "[window_id].browser:update")
initialized = TRUE
- if("tgui:view")
- if(params["screen"])
- ui_screen = params["screen"]
+ if("tgui:setSharedState")
+ // Update the window state.
+ update_status(push = FALSE)
+ // Bail if UI is not interactive or usr calling Topic
+ // is not the UI user.
+ if(status != UI_INTERACTIVE)
+ return
+ var/key = params["key"]
+ var/value = params["value"]
+ if(!src_object.tgui_shared_states)
+ src_object.tgui_shared_states = list()
+ src_object.tgui_shared_states[key] = value
SStgui.update_uis(src_object)
+ if("tgui:setFancy")
+ var/value = text2num(params["value"])
+ user.client.prefs.tgui_fancy = value
if("tgui:log")
// Force window to show frills on fatal errors
if(params["fatal"])
winset(user, window_id, "titlebar=1;can-resize=1;size=600x600")
+ log_message(params["log"])
if("tgui:link")
user << link(params["url"])
- if("tgui:fancy")
- user.client.prefs.tgui_fancy = TRUE
- if("tgui:nofrills")
- user.client.prefs.tgui_fancy = FALSE
- else
- update_status(push = FALSE) // Update the window state.
- if(src_object.ui_act(action, params, src, state)) // Call ui_act() on the src_object.
- SStgui.update_uis(src_object) // Update if the object requested it.
- /**
- * private
- *
- * Update the UI.
- * Only updates the data if update is true, otherwise only updates the status.
- *
- * optional force bool If the UI should be forced to update.
- **/
+ else
+ // Update the window state.
+ update_status(push = FALSE)
+ // Call ui_act() on the src_object.
+ if(src_object.ui_act(action, params, src, state))
+ // Update if the object requested it.
+ SStgui.update_uis(src_object)
+
+/**
+ * private
+ *
+ * Update the UI.
+ * Only updates the data if update is true, otherwise only updates the status.
+ *
+ * optional force bool If the UI should be forced to update.
+ */
/datum/tgui/process(force = FALSE)
var/datum/host = src_object.ui_host(user)
if(!src_object || !host || !user) // If the object or user died (or something else), abort.
@@ -296,69 +313,75 @@
else
update_status(push = TRUE) // Otherwise only update status.
- /**
- * private
- *
- * Push data to an already open UI.
- *
- * required data list The data to send.
- * optional force bool If the update should be sent regardless of state.
- **/
+/**
+ * private
+ *
+ * Push data to an already open UI.
+ *
+ * required data list The data to send.
+ * optional force bool If the update should be sent regardless of state.
+ */
/datum/tgui/proc/push_data(data, static_data, force = FALSE)
- update_status(push = FALSE) // Update the window state.
+ // Update the window state.
+ update_status(push = FALSE)
+ // Cannot update UI if it is not set up yet.
if(!initialized)
- return // Cannot update UI if it is not set up yet.
+ return
+ // Cannot update UI, we have no visibility.
if(status <= UI_DISABLED && !force)
- return // Cannot update UI, we have no visibility.
-
+ return
// Send the new JSON to the update() Javascript function.
- user << output(url_encode(get_json(data, static_data)), "[custom_browser_id ? window_id : "[window_id].browser"]:update")
+ user << output(
+ url_encode(get_json(data, static_data)),
+ "[window_id].browser:update")
- /**
- * private
- *
- * Updates the UI by interacting with the src_object again, which will hopefully
- * call try_ui_update on it.
- *
- * optional force_open bool If force_open should be passed to ui_interact.
- **/
+/**
+ * private
+ *
+ * Updates the UI by interacting with the src_object again, which will hopefully
+ * call try_ui_update on it.
+ *
+ * optional force_open bool If force_open should be passed to ui_interact.
+ */
/datum/tgui/proc/update(force_open = FALSE)
src_object.ui_interact(user, ui_key, src, force_open, master_ui, state)
- /**
- * private
- *
- * Update the status/visibility of the UI for its user.
- *
- * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
- **/
+/**
+ * private
+ *
+ * Update the status/visibility of the UI for its user.
+ *
+ * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
+ */
/datum/tgui/proc/update_status(push = FALSE)
var/status = src_object.ui_status(user, state)
if(master_ui)
status = min(status, master_ui.status)
+
set_status(status, push)
if(status == UI_CLOSE)
close()
- /**
- * private
- *
- * Set the status/visibility of the UI.
- *
- * required status int The status to set (UI_CLOSE/UI_DISABLED/UI_UPDATE/UI_INTERACTIVE).
- * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
- **/
+/**
+ * private
+ *
+ * Set the status/visibility of the UI.
+ *
+ * required status int The status to set (UI_CLOSE/UI_DISABLED/UI_UPDATE/UI_INTERACTIVE).
+ * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
+ */
/datum/tgui/proc/set_status(status, push = FALSE)
- if(src.status != status) // Only update if status has changed.
+ // Only update if status has changed.
+ if(src.status != status)
if(src.status == UI_DISABLED)
src.status = status
if(push)
update()
else
src.status = status
- if(status == UI_DISABLED || push) // Update if the UI just because disabled, or a push is requested.
+ // Update if the UI just because disabled, or a push is requested.
+ if(status == UI_DISABLED || push)
push_data(null, force = TRUE)
/datum/tgui/proc/log_message(message)
log_tgui("[user] ([user.ckey]) using \"[title]\":\n[message]")
-
diff --git a/dependencies.sh b/dependencies.sh
index a75940088..5bfe5a738 100644
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -16,5 +16,5 @@ export RUST_G_VERSION=0.4.2
#bsql git tag
export BSQL_VERSION=v1.4.0.0
-#node version
-export NODE_VERSION=8
+#node version (for tgui)
+export NODE_VERSION=12
diff --git a/hyperstation/code/game/objects/railings.dm b/hyperstation/code/game/objects/railings.dm
index 1710fe18f..561765f68 100644
--- a/hyperstation/code/game/objects/railings.dm
+++ b/hyperstation/code/game/objects/railings.dm
@@ -160,3 +160,36 @@
usr.forceMove(get_turf(src))
usr.visible_message("[user] climbed over \the [src]!")
+
+/obj/structure/railing/handrail
+ name = "handrail"
+ desc = "A waist high handrail, perhaps you could climb over it."
+
+ icon = 'hyperstation/icons/obj/railings.dmi'
+ icon_modifier = "hand_"
+ icon_state = "hand_railing0"
+ max_integrity = 100
+
+/obj/structure/railing/handrail/update_icon(var/UpdateNeighgors = 1)
+ NeighborsCheck(UpdateNeighgors)
+ overlays.Cut()
+ if (!check || !anchored)//|| !anchored
+ icon_state = "[icon_modifier]railing0"
+ else
+ icon_state = "[icon_modifier]railing1"
+ if (check & 32)
+ overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]corneroverlay")
+ if ((check & 16) || !(check & 32) || (check & 64))
+ overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]frontoverlay_l")
+ if (!(check & 2) || (check & 1) || (check & 4))
+ overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]frontoverlay_r")
+ if(check & 4)
+ switch (src.dir)
+ if (NORTH)
+ overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]mcorneroverlay", pixel_x = 32)
+ if (SOUTH)
+ overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]mcorneroverlay", pixel_x = -32)
+ if (EAST)
+ overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]mcorneroverlay", pixel_y = -32)
+ if (WEST)
+ overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]mcorneroverlay", pixel_y = 32)
\ No newline at end of file
diff --git a/hyperstation/code/mobs/crystal.dm b/hyperstation/code/mobs/crystal.dm
new file mode 100644
index 000000000..a949237a0
--- /dev/null
+++ b/hyperstation/code/mobs/crystal.dm
@@ -0,0 +1,65 @@
+#define REGENERATION_DELAY 60 // After taking damage, how long it takes for automatic regeneration to begin for megacarps (ty robustin!)
+
+/mob/living/simple_animal/hostile/crystal
+ name = "pellucyte"
+ desc = "A floating crystal with orbiting smaller crystals."
+ icon = 'hyperstation/icons/mob/crystal.dmi'
+ icon_state = "crystal"
+ icon_living = "crystal"
+ icon_dead = "crystal"
+ mob_biotypes = MOB_BEAST
+ speak_chance = 0
+ turns_per_move = 10
+ response_help = "touches"
+ response_disarm = "gently pushes aside"
+ response_harm = "hits"
+ emote_taunt = list("sings")
+ taunt_chance = 20
+ speed = 0
+ maxHealth = 40
+ health = 40
+ spacewalk = TRUE
+ harm_intent_damage = 8
+ obj_damage = 50
+ melee_damage_lower = 15
+ melee_damage_upper = 15
+ attacktext = "slams"
+ attack_sound = 'sound/creatures/crystal_hit.ogg'
+ speak_emote = list("sings")
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ minbodytemp = 0
+ maxbodytemp = 3500
+ faction = list("carp")
+ movement_type = FLYING
+ pressure_resistance = 500
+ gold_core_spawnable = HOSTILE_SPAWN
+ var/regen_cooldown = 0 //Used for how long it takes before a healing will take place default in 60 seconds
+ var/regen_amount = 1 //How much is healed pre regen cooldown
+ del_on_death = TRUE
+ pixel_x = -8
+
+/mob/living/simple_animal/hostile/crystal/Life()
+ . = ..()
+ if(regen_amount && regen_cooldown < world.time)
+ heal_overall_damage(regen_amount)
+ if(stat)
+ return
+ if(prob(15))
+ playsound(src, 'sound/creatures/crystal_idle.ogg', 100)
+
+/mob/living/simple_animal/hostile/crystal/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
+ . = ..()
+ if(regen_amount)
+ regen_cooldown = world.time + REGENERATION_DELAY
+
+
+/mob/living/simple_animal/hostile/crystal/AttackingTarget()
+ . = ..()
+ if(. && ishuman(target))
+ var/mob/living/carbon/human/H = target
+ H.adjustStaminaLoss(8)
+
+/mob/living/simple_animal/hostile/crystal/Destroy()
+ playsound(src, 'sound/creatures/crystal_death.ogg', 100)
+ new /obj/effect/decal/cleanable/glass(src.loc)
+ return ..()
diff --git a/hyperstation/code/modules/arousal/arousalhud.dm b/hyperstation/code/modules/arousal/arousalhud.dm
index 55d58183e..ff7725ddb 100644
--- a/hyperstation/code/modules/arousal/arousalhud.dm
+++ b/hyperstation/code/modules/arousal/arousalhud.dm
@@ -25,6 +25,9 @@
dat += "Fill container"
dat += "(Use a container in your hand to collect your seminal fluid.)
"
+ dat += "Climax on self"
+ dat += "(Stimulate a sexual organ to climax onto yourself.)
"
+
var/mob/living/carbon/human/C = usr
if(C && C.w_uniform || C.wear_suit) //if they are wearing cloths
dat += "Explode out of clothes"
@@ -160,6 +163,14 @@
to_chat(usr, "You aren't aroused enough for that! ")
return
+ if(href_list["climaxself"])
+ if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
+ H.climaxself()
+ return
+ else
+ to_chat(usr, "You aren't aroused enough for that! ")
+ return
+
if(href_list["climax"])
if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
H.climaxalone(FALSE)
@@ -340,17 +351,14 @@ obj/screen/arousal/proc/kiss()
/mob/living/carbon/human/proc/kisstarget(mob/living/L)
src << browse(null, "window=arousal") //closes the arousal window, if its open, mainly to stop spam
- if(isliving(L)) //is your target living? Living people can resist your advances if they want to via moving.
- if(iscarbon(L))
- src.visible_message("[src] is about to kiss [L]!", \
- "You're attempting to kiss [L]!", \
- "You're attempting to kiss with something!")
- SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "kissed", /datum/mood_event/kiss) //how cute, affection is nice.
- //Well done you kissed it/them!
+
+ L.adjustPainLoss(-5, 0) //mommas kisses always stop alittle pain..
+ SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "kissed", /datum/mood_event/kiss) //how cute, affection is nice.
src.visible_message("[src] kisses [L]!", \
"You kiss [L]!", \
"You kiss something!")
+
/mob/living/carbon/human/proc/climaxalone()
//we dont need hands to climax alone, its hands free!
var/obj/item/organ/genital/picked_organ
@@ -503,4 +511,29 @@ obj/screen/arousal/proc/kiss()
cut_overlay(mutable_appearance('hyperstation/icons/effects/cumoverlay.dmi', "cum_large"))
if(cum_splatter_icon)
cut_overlay(cum_splatter_icon)
- return TRUE
\ No newline at end of file
+ return TRUE
+
+/mob/living/carbon/human/proc/climaxself()
+ if(restrained(TRUE))
+ to_chat(src, "You can't do that while restrained!")
+ return
+ var/free_hands = get_num_arms()
+ if(!free_hands)
+ to_chat(src, "You need at least one free arm.")
+ return
+ for(var/helditem in held_items)
+ if(isobj(helditem))
+ free_hands--
+ if(free_hands <= 0)
+ to_chat(src, "You're holding too many things.")
+ return
+ //We got hands, let's pick an organ
+ var/obj/item/organ/genital/picked_organ
+ picked_organ = pick_masturbate_genitals()
+ if(picked_organ)
+ src << browse(null, "window=arousal") //closes the window
+ mob_masturbate(picked_organ, cover = TRUE)
+ return
+ else //They either lack organs that can masturbate, or they didn't pick one.
+ to_chat(src, "You cannot climax without choosing genitals.")
+ return
\ No newline at end of file
diff --git a/hyperstation/code/modules/busy_space/organisations.dm b/hyperstation/code/modules/busy_space/organisations.dm
index 935bba77f..5109a9dd6 100644
--- a/hyperstation/code/modules/busy_space/organisations.dm
+++ b/hyperstation/code/modules/busy_space/organisations.dm
@@ -326,7 +326,7 @@
Most stable colonies, stations, civilizations, planets, or anywhere on the spectrum is often backed by the firm hand of Kinaris- underneath one rule: \
Be Radiant."
history = ""
- work = "Weave-research, conversion, and colony management"
+ work = "Weave-research, conversion, uplifting, and colony management"
headquarters = "Holy City of Radiant Hearth, Myril"
motto = "Be Radiant"
@@ -361,6 +361,7 @@
"Salis Major orbit",
"a megastructure at Kappa Andromedae",
"Radiant Hearth",
+ "a dockyard at Procella, Tremora",
"sector command at Vivida Laetus",
"a dissonant tear at RR Lyra",
"a city-station at Kappa Andromedae",
@@ -384,7 +385,7 @@
Dzar works side-by-side with Kinaris, where Radiant Technology is their reward in return for high-grade metals."
history = ""
work = "metalsmithing, mining, and material research"
- headquarters = "the hollow-world of Salis Major"
+ headquarters = "the hollow-world of Salis Primary A-4"
motto = "in virtue we trust"
ship_prefixes = list("DZ" = "hauling", "DZ" = "cargo", "DZA" = "asset security")
@@ -414,6 +415,7 @@
"a ringworld at Incandesce Seconda",
"Salis Major orbit",
"a megastructure at Kappa Andromedae",
+ "a dockyard at Procella, Tremora",
"the rings of Layenia",
"Dzar metalworking at Loto",
"a metalworking site at Salis Major",
@@ -449,9 +451,61 @@
concerns peacefully through vigilance."
history = ""
work = "contracted policework"
- headquarters = "Incandesce Seconda"
+ headquarters = "the ringworld of Incandesce Primara"
motto = "secure the people, save the future"
ship_prefixes = list("ZCO" = "transportation", "ZC" = "patrol")
- autogenerate_destination_names = TRUE
\ No newline at end of file
+ autogenerate_destination_names = TRUE
+
+//Thanks Hellcelot for this one!
+/datum/lore/organization/titanceramics
+ name = "Titan Piezoelectrics and Ceramics"
+ short_name = "Titan Ceramics"
+ desc = "Titan Ceramics was the primary source of prominent electrical power on Tremora for it's lifespan, with extravagent materials and unique ceramic mixes that supported \
+ incredibly efficient production of energy in bulk. Not only did they provide energy for a once-struggling civilization, they brought upon artistic desire and talent for those \
+ who would seek their ceramics. Value in energy is equal to value in art in their eyes, with only the finest materials and expertly-tested conditions to meet the quality of \
+ their work. Despite the overwhelming size difference of the housing species, value is still sought from both sides, resulting in multi-size accomodations for their ceramics. \
+ When cheap yet efficient power is required without the Weave, Titan Ceramics is there."
+ history = ""
+ work = "Production of power-efficient piezoelectric ceramics and craft"
+ headquarters = "The Storm Capitol of Procella, Tremora"
+ motto = ""
+
+ ship_prefixes = list("TC" = "transportation", "TCF" = "freight", "TCR" = "research")
+ ship_names = list(
+ "Noki",
+ "Moyai",
+ "Megalodon",
+ "Mako",
+ "Minnow",
+ "Tsunami",
+ "North Star",
+ "Tempest",
+ "Eye of the Storm",
+ "Aquarius",
+ "Marinia",
+ "Thalassus",
+ "Stormwind"
+ )
+
+ autogenerate_destination_names = TRUE
+
+/datum/lore/organization/syntech
+ name = "Synergized Technology"
+ short_name = "SynTech"
+ desc = "Synergized Technology- commonly known as SynTech- is a company which leads the complex solutions in any galaxy's biggest problem: accomodating for the size of life. \
+ As civilization grew more welcoming to different ideals and lifestyles, it became more difficult and disasterous to deal with the extreme size difference from one alien \
+ species to the other. Not only did this spark an incredible amount of regulations from AzureGov, but Kinaris's interest was piqued to keep peace over all; and that included \
+ accomodating for any species, whether or not they stood above a mountain, or below an ant hill. The high demand of multi-size rights and technology was driven into SynTech's \
+ hands, where they would provide and assist in regulating consistent and meaningful products to ease interaction from one to the next. Not only do they supply incredibly \
+ advanced, highly-regulated technology, they also help in consistent planning and regulation in most cities to keep traffic from most differently-sized species without \
+ havoc. Without SynTech, galaxies would look like a fairly bland place, where one size rules above all."
+ history = ""
+ work = "Production and selling of size-altering technology, as well as accomodating the planning of infrastructure to support many sizes."
+ headquarters = "The City-Planet of Jovias, Nembus"
+ motto = "Modern solutions, big and small"
+
+ ship_prefixes = list("SYT" = "transportation", "SYTF" = "freight", "XSYT" = "scaler", "SYT-I" = "constructor")
+
+ autogenerate_destination_names = TRUE
diff --git a/hyperstation/code/modules/client/loadout/gloves.dm b/hyperstation/code/modules/client/loadout/gloves.dm
new file mode 100644
index 000000000..ad12c3e3e
--- /dev/null
+++ b/hyperstation/code/modules/client/loadout/gloves.dm
@@ -0,0 +1,11 @@
+/datum/gear/syntech/ring
+ name = "Normalizer Ring"
+ category = SLOT_GLOVES
+ path = /obj/item/clothing/gloves/ring/syntech
+ cost = 6
+
+/datum/gear/syntech/band
+ name = "Normalizer Band"
+ category = SLOT_GLOVES
+ path = /obj/item/clothing/gloves/ring/syntech/band
+ cost = 6
diff --git a/hyperstation/code/modules/client/loadout/neck.dm b/hyperstation/code/modules/client/loadout/neck.dm
new file mode 100644
index 000000000..a21c87434
--- /dev/null
+++ b/hyperstation/code/modules/client/loadout/neck.dm
@@ -0,0 +1,17 @@
+/datum/gear/syntech/pendant
+ name = "Normalizer Pendant"
+ category = SLOT_NECK
+ path = /obj/item/clothing/neck/syntech
+ cost = 6
+
+/datum/gear/syntech/choker
+ name = "Normalizer Choker"
+ category = SLOT_NECK
+ path = /obj/item/clothing/neck/syntech/choker
+ cost = 6
+
+/datum/gear/syntech/collar
+ name = "Normalizer Collar"
+ category = SLOT_NECK
+ path = /obj/item/clothing/neck/syntech/collar
+ cost = 6
diff --git a/hyperstation/code/modules/clothing/sizeaccessories.dm b/hyperstation/code/modules/clothing/sizeaccessories.dm
new file mode 100644
index 000000000..df67d29bb
--- /dev/null
+++ b/hyperstation/code/modules/clothing/sizeaccessories.dm
@@ -0,0 +1,115 @@
+//Clothing vars and procs
+/obj/item/clothing
+ var/normalize_size = RESIZE_NORMAL //This number is used as the "normal" height people will be given when wearing one of these accessories
+ var/natural_size = null //The value of the wearer's body_size var in prefs. Unused for now.
+ var/recorded_size = null //the user's height prior to equipping
+
+//For applying a normalization
+/obj/item/clothing/proc/normalize_mob_size(mob/living/carbon/human/H)
+ if(H.normalized) //First we make a check to see if they're already normalized, from wearing another article of SynTech jewelry
+ to_chat(H, "This accessory buzzes, being overwritten by another.")
+ playsound(H, 'sound/machines/buzz-sigh.ogg', 50, 1)
+ return
+ recorded_size = H.get_effective_size() //If not, grab their current size
+ playsound(H, 'sound/effects/magic.ogg', 50, 1)
+ flash_lighting_fx(3, 3, LIGHT_COLOR_PURPLE)
+ H.visible_message("A flash of purple light engulfs [H], before they change to normal!","You feel warm for a moment, before everything scales to your size...")
+ H.resize(normalize_size) //Then apply the size
+ H.normalized = TRUE //And set normalization
+
+//For removing a normalization, and reverting back to normal
+/obj/item/clothing/proc/denormalize_mob_size(mob/living/carbon/human/H)
+ if(H.normalized) //sanity check
+ playsound(H,'sound/weapons/emitter2.ogg', 50, 1)
+ flash_lighting_fx(3, 3, LIGHT_COLOR_YELLOW)
+ H.visible_message("Golden light engulfs [H], and they shoot back to their default height!","Energy rushes through your body, and you return to normal.")
+ H.resize(recorded_size)
+ H.normalized = FALSE
+
+
+//For storing normalization on mobs
+/mob/living
+ var/normalized = FALSE
+ //normalized is a check for instances where more than one accessory of jewelry is worn. For all intensive purposes, only the first worn accessory stores the user's size. \
+ //Anything else is just extra.
+
+//Clothing below. Code could be compressed more, but until I make jewelry slots, this will do. -Dahl
+
+//GLOVE SLOT ITEMS...
+//SynTech ring
+/obj/item/clothing/gloves/ring/syntech
+ name = "normalizer ring"
+ desc = "An expensive, shimmering SynTech ring gilded with golden Kinaris markings. It will 'normalize' the size of the user to a specified height approved for work-conditions, as long as it is equipped. The artificial violet gem inside twinkles ominously."
+ icon = 'hyperstation/icons/obj/clothing/sizeaccessories.dmi'
+ icon_state = "ring"
+ item_state = "sring" //No use in a unique sprite since it's just one pixel
+ w_class = WEIGHT_CLASS_TINY
+ body_parts_covered = 0
+ transfer_prints = TRUE
+ strip_delay = 40
+ //These are already defined under the parent ring, but I wanna leave em here for reference purposes
+
+//For glove slots
+/obj/item/clothing/gloves/ring/syntech/equipped(mob/living/user, slot)
+ if(ishuman(user))
+ var/mob/living/carbon/human/human_target = user
+ if(slot == SLOT_GLOVES)
+
+ if(human_target.custom_body_size)
+ normalize_mob_size(human_target)
+
+/obj/item/clothing/gloves/ring/syntech/dropped(mob/living/user, slot)
+ if(ishuman(user))
+ var/mob/living/carbon/human/human_target = user
+
+ if(human_target.normalized)
+ denormalize_mob_size(human_target)
+
+
+
+//SynTech Wristband
+/obj/item/clothing/gloves/ring/syntech/band
+ name = "normalizer wristband"
+ desc = "An expensive technological wristband cast in SynTech purples with shimmering Kinaris golds. It will 'normalize' the size of the user to a specified height for approved work-conditions, as long as it is equipped. There is a small screen buzzing with information."
+ icon_state = "wristband"
+ item_state = "syntechband"
+
+
+//NECK SLOT ITEMS...
+//Syntech Pendant
+/obj/item/clothing/neck/syntech
+ name = "normalizer pendant"
+ desc = "A vibrant violet jewel cast in silvery-gold metals, sporting the elegance of Kinaris with SynTech prowess. It will 'normalize' the size of the user to a specified height for approved work-conditions, as long as it is equipped. The artificial violet gem inside twinkles ominously."
+ icon = 'hyperstation/icons/obj/clothing/sizeaccessories.dmi'
+ icon_state = "pendant"
+ item_state = "pendant"
+
+//For neck items
+/obj/item/clothing/neck/syntech/equipped(mob/living/user, slot)
+ if(ishuman(user))
+ var/mob/living/carbon/human/human_target = user
+ if(slot == SLOT_NECK)
+
+ if(human_target.custom_body_size)
+ normalize_mob_size(human_target)
+
+/obj/item/clothing/neck/syntech/dropped(mob/living/user, slot)
+ if(ishuman(user))
+ var/mob/living/carbon/human/human_target = user
+
+ if(human_target.normalized)
+ denormalize_mob_size(human_target)
+
+//Syntech Choker
+/obj/item/clothing/neck/syntech/choker
+ name = "normalizer choker"
+ desc = "A sleek, tight-fitting choker embezzled with silver to gold, adorned with vibrant purple studs; combined technology of Kinaris and SynTech. It will 'normalize' the size of the user to a specified height for approved work-conditions, as long as it is equipped. There is a small screen buzzing with information."
+ icon_state = "choker"
+ item_state = "collar"
+
+//Syntech Collar
+/obj/item/clothing/neck/syntech/collar
+ name = "normalizer collar"
+ desc = "A cute pet collar, technologically designed with vibrant purples and smooth silvers. There is a small gem bordered by gold at the front, reading 'SYNTECH' engraved within the metal. It will 'normalize' the size of the user to a specified height for approved work-conditions, as long as it is equipped. The artificial violet gem inside twinkles ominously."
+ icon_state = "collar"
+ item_state = "collar"
diff --git a/hyperstation/code/modules/events/crystalloid_entities.dm b/hyperstation/code/modules/events/crystalloid_entities.dm
new file mode 100644
index 000000000..b13cf5f9d
--- /dev/null
+++ b/hyperstation/code/modules/events/crystalloid_entities.dm
@@ -0,0 +1,34 @@
+/datum/round_event_control/crystalloid_entities
+ name = "Crystal Invasion"
+ typepath = /datum/round_event/crystalloid_entities
+ weight = 10 //decreased weight from 15 to 10
+ min_players = 2 //increased min players from 2 to 5 to reduce chances of half the crew dying in a carp breach
+ earliest_start = 10 MINUTES
+ max_occurrences = 2
+
+
+/datum/round_event/crystalloid_entities
+ announceWhen = 3
+ startWhen = 50
+
+/datum/round_event/crystalloid_entities/setup()
+ startWhen = rand(40, 60)
+
+/datum/round_event/crystalloid_entities/announce(fake)
+ if(prob(70))
+ priority_announce("Unknown inorganic entities have been detected near [station_name()], please stand-by.", "Lifesign Alert", 'sound/ai/crystal.ogg')
+ else
+ priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/ai/commandreport.ogg') // CITADEL EDIT metabreak
+ for(var/obj/machinery/computer/communications/C in GLOB.machines)
+ if(!(C.stat & (BROKEN|NOPOWER)) && is_station_level(C.z))
+ var/obj/item/paper/P = new(C.loc)
+ P.name = "Crystalloid entities"
+ P.info = "Unknown inorganic entities have been detected near [station_name()], you may wish to break out arms."
+ P.update_icon()
+
+
+/datum/round_event/crystalloid_entities/start()
+ for(var/obj/effect/landmark/carpspawn/C in GLOB.landmarks_list)
+ if(prob(60)) //dont spawn them EVERYWHERE, they are tougher than carps.
+ new /mob/living/simple_animal/hostile/crystal(C.loc)
+
diff --git a/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm b/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm
new file mode 100644
index 000000000..f5672b14c
--- /dev/null
+++ b/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -0,0 +1,477 @@
+/*
+from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm:
+/datum/sprite_accessory
+ var/extra = FALSE
+ var/extra_color_src = MUTCOLORS2 //The color source for the extra overlay.
+ var/extra2 = FALSE
+ var/extra_icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+ var/extra2_icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+ var/extra2_color_src = MUTCOLORS3
+ var/list/ckeys_allowed
+
+we use the "citadel" versions of mutant/species parts, which usually (but not always)
+begins with "mam_" somewhere. stuff that's built for only humans/lizards in other parts
+of the code are from TG, don't use those.
+
+keep everything in alphabetical order, please!
+*/
+
+// TODO: code it so that we don't have to type in "icon = 'hyperstation/icons/mob/etc'"
+// manually for hyperstation parts
+
+
+/*
+SNOUTS
+==========================================================
+*/
+
+/datum/sprite_accessory/mam_snouts/bigmandible // sarcoph @ hyperstation, march 2022
+ name = "Big Mandibles (Hyper)"
+ icon_state = "bigmandible"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_snouts/proboscis // sarcoph @ hyperstation, march 2022
+ name = "Proboscis (Hyper)"
+ icon_state = "proboscis"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_snouts/rhinobeetle // sarcoph @ hyperstation, march 2022
+ name = "Rhino Beetle (Hyper)"
+ icon_state = "rhinobeetle"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_snouts/scarab // sarcoph @ hyperstation, march 2022
+ name = "Scarab Beetle (Hyper)"
+ icon_state = "scarab"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_snouts/smallmandible // sarcoph @ hyperstation, march 2022
+ name = "Small Mandibles (Hyper)"
+ icon_state = "smallmandible"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_snouts/spider // sarcoph @ hyperstation, march 2022
+ name = "Spider (Hyper)"
+ icon_state = "spider"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_snouts/tarantula // sarcoph @ hyperstation, march 2022
+ name = "Tarantula (Hyper)"
+ icon_state = "tarantula"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_snouts/easterndragon
+ name = "Eastern Dragon (Hyper)"
+ icon_state = "easterndw"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+
+/datum/sprite_accessory/mam_snouts/feasterndragon
+ name = "Eastern Dragon (Top) (Hyper)"
+ icon_state = "feasterndw"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+
+/datum/sprite_accessory/mam_snouts/easterndragonnowhiskers
+ name = "Eastern Dragon - No Whiskers (Hyper)"
+ icon_state = "easterndnw"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+
+/datum/sprite_accessory/mam_snouts/feasterndragonnowhiskers
+ name = "Eastern Dragon - No Whiskers (Top) (Hyper)"
+ icon_state = "feasterndnw"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+
+/datum/sprite_accessory/mam_snouts/fchemlight
+ name = "RadDog (Top) (Hyper)"
+ icon_state = "fchemlight"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+
+/datum/sprite_accessory/mam_snouts/chemlight
+ name = "RadDog (Hyper)"
+ icon_state = "chemlight"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+
+/*
+EARS
+==========================================================
+*/
+
+/datum/sprite_accessory/mam_ears/faceant // sarcoph @ hyperstation, march 2022
+ name = "Face Antennae (Hyper)"
+ icon_state = "faceant"
+ icon = 'hyperstation/icons/mob/char_ears.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_ears/faceant2 // sarcoph @ hyperstation, march 2022
+ name = "Face Antennae 2 (Hyper)"
+ icon_state = "faceant2"
+ icon = 'hyperstation/icons/mob/char_ears.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_ears/moth
+ name = "Moth Antennae (Hyper)"
+ icon_state = "moth"
+ icon = 'hyperstation/icons/mob/char_ears.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_ears/plumeant // sarcoph @ hyperstation, march 2022
+ name = "Plume Antennae (Hyper)"
+ icon_state = "plumeant"
+ icon = 'hyperstation/icons/mob/char_ears.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_ears/roundant // sarcoph @ hyperstation, march 2022
+ name = "Round Antennae (Hyper)"
+ icon_state = "roundant"
+ icon = 'hyperstation/icons/mob/char_ears.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_ears/thinant // sarcoph @ hyperstation, march 2022
+ name = "Thin Antennae (Hyper)"
+ icon_state = "thinant"
+ icon = 'hyperstation/icons/mob/char_ears.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_ears/easterndragon
+ name = "Eastern Dragon (Hyper)"
+ icon_state = "easternd"
+ icon = 'hyperstation/icons/mob/char_ears.dmi'
+
+/datum/sprite_accessory/mam_ears/chemlight
+ name = "RadDog (Hyper)"
+ icon_state = "chemlight"
+ icon = 'hyperstation/icons/mob/char_ears.dmi'
+
+/*
+WINGS
+==========================================================
+*/
+
+/datum/sprite_accessory/deco_wings/beetle // sarcoph @ hyperstation, march 2022
+ name = "Beetle (Hyper)"
+ icon_state = "beetle"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+/datum/sprite_accessory/moth_wings/beetle
+ name = "Beetle (Hyper)"
+ icon_state = "beetle"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+/datum/sprite_accessory/deco_wings/beetle2 // sarcoph @ hyperstation, march 2022
+ name = "Beetle - 2-toned (Hyper)"
+ icon_state = "beetle2"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+ color_src = MATRIXED
+
+/datum/sprite_accessory/moth_wings/beetle2
+ name = "Beetle - 2-toned (Hyper)"
+ icon_state = "beetle2"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+ color_src = MATRIXED
+
+/datum/sprite_accessory/deco_wings/insect // sarcoph @ hyperstation, march 2022
+ name = "Insect (Hyper)"
+ icon_state = "insect"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+/datum/sprite_accessory/moth_wings/insect
+ name = "Insect (Hyper)"
+ icon_state = "insect"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+/datum/sprite_accessory/deco_wings/minibat // sarcoph @ hyperstation, march 2022
+ name = "Mini Bat (Hyper)"
+ icon_state = "minibat"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+/datum/sprite_accessory/deco_wings/minifeather // sarcoph @ hyperstation, march 2022
+ name = "Mini Feather (Hyper)"
+ icon_state = "minifeather"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+/datum/sprite_accessory/deco_wings/tinybat // sarcoph @ hyperstation, march 2022
+ name = "Tiny Bat (Hyper)"
+ icon_state = "tinybat"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+/datum/sprite_accessory/deco_wings/tinyfeather // sarcoph @ hyperstation, march 2022
+ name = "Tiny Feather (Hyper)"
+ icon_state = "tinyfeather"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+
+/*
+TAILS + ANIMATED TAILS
+==========================================================
+*/
+
+/datum/sprite_accessory/mam_tails/bee // sarcoph @ hyperstation, march 2022
+ name = "Bee (Hyper)"
+ icon_state = "bee"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_tails_animated/bee
+ name = "Bee (Hyper)"
+ icon_state = "bee"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_tails/bee2 // sarcoph @ hyperstation, march 2022
+ name = "Bee w/ Stinger (Hyper)"
+ icon_state = "bee2"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_tails_animated/bee2
+ name = "Bee w/ Stinger (Hyper)"
+ icon_state = "bee2"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+// "fan" bird tail, short
+/datum/sprite_accessory/mam_tails/shorthawk // sarcoph @ hyperstation, jan 2022
+ name = "Hawk - Short (Hyper)"
+ icon_state = "shorthawk"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails_animated/shorthawk
+ name = "Hawk - Short (Hyper)"
+ icon_state = "shorthawk"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails/insect // sarcoph @ hyperstation, march 2022
+ name = "Insect (Hyper)"
+ icon_state = "insect"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_tails_animated/insect
+ name = "Insect (Hyper)"
+ icon_state = "insect"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_tails/bug2tone // sarcoph @ hyperstation, march 2022
+ name = "Insect - 2-tone (Hyper)"
+ icon_state = "bug2tone"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_tails_animated/bug2tone
+ name = "Insect - 2-tone (Hyper)"
+ icon_state = "bug2tone"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+// "narrow" bird tail, long
+/datum/sprite_accessory/mam_tails/longpigeon // sarcoph @ hyperstation, jan 2022
+ name = "Pigeon - Long (Hyper)"
+ icon_state = "longpigeon"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails_animated/longpigeon
+ name = "Pigeon - Long (Hyper)"
+ icon_state = "longpigeon"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+// "narrow" bird tail, short
+/datum/sprite_accessory/mam_tails/shortpigeon // sarcoph @ hyperstation, jan 2022
+ name = "Pigeon - Short (Hyper)"
+ icon_state = "shortpigeon"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails_animated/shortpigeon
+ name = "Pigeon - Short (Hyper)"
+ icon_state = "shortpigeon"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+// "forked" bird tail, long
+/datum/sprite_accessory/mam_tails/swallow // sarcoph @ hyperstation, jan 2022
+ name = "Swallow (Hyper)"
+ icon_state = "swallow"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails_animated/swallow
+ name = "Swallow (Hyper)"
+ icon_state = "swallow"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+// forked bird tail, long; special stripe markings
+/datum/sprite_accessory/mam_tails/swallowstriped // sarcoph @ hyperstation, jan 2022
+ name = "Swallow - Striped (Hyper)"
+ icon_state = "swallowstriped"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails_animated/swallowstriped
+ name = "Swallow - Striped (Hyper)"
+ icon_state = "swallowstriped"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails/easterndragon //Pulled base from Virgo, seriously love the server and love you guys, stay lovely.
+ name = "Eastern Dragon (Hyper)"
+ icon_state = "easternd"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails_animated/easterndragon
+ name = "Eastern Dragon (Hyper)"
+ icon_state = "easternd"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails/chemlight
+ name = "RadDog (Hyper)"
+ icon_state = "chemlight"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails_animated/chemlight
+ name = "RadDog (Hyper)"
+ icon_state = "chemlight"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+
+/*
+BODY MARKINGS
+==========================================================
+*/
+
+/*
+from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm:
+/datum/sprite_accessory/mam_body_markings
+ extra = FALSE
+ extra2 = FALSE
+ color_src = MATRIXED
+ gender_specific = 0
+ icon = 'modular_citadel/icons/mob/mam_markings.dmi'
+ recommended_species = list("mammal", "xeno", "slimeperson", "podweak", "avian", "aquatic")
+*/
+
+/datum/sprite_accessory/mam_body_markings/bee // sarcoph @ hyperstation, march 2022
+ name = "Bee (Hyper)"
+ icon_state = "bee"
+ icon = 'hyperstation/icons/mob/char_markings.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_body_markings/bee_fluff // sarcoph @ hyperstation, march 2022
+ name = "Bee - Fluffy (Hyper)"
+ icon_state = "bee_fluff"
+ icon = 'hyperstation/icons/mob/char_markings.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_body_markings/bug3tone // sarcoph @ hyperstation, march 2022
+ name = "Beetle - 3-tone (Hyper)"
+ icon_state = "bug3tone"
+ icon = 'hyperstation/icons/mob/char_markings.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_body_markings/moth // sarcoph @ hyperstation, jan 2022
+ name = "Moth (Hyper)"
+ icon_state = "moth"
+ icon = 'hyperstation/icons/mob/char_markings.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_body_markings/empty
+ name = "None (Hyper)"
+ icon_state = "empty"
+ recommended_species = list("podweak", /*"mammal",*/ "avian", "aquatic", "insect", "xeno", "synthliz", "slimeperson")
+ // mammals are cursed to no empty markings until they get their heads fixed.
+
+/datum/sprite_accessory/mam_body_markings/pigeon // sarcoph @ hyperstation, jan 2022
+ name = "Pigeon (Hyper)"
+ icon_state = "pigeon"
+ icon = 'hyperstation/icons/mob/char_markings.dmi'
+ recommended_species = list("avian")
+
+/datum/sprite_accessory/mam_body_markings/shrike // sarcoph @ hyperstation, jan 2022
+ name = "Shrike (Hyper)"
+ icon_state = "shrike"
+ icon = 'hyperstation/icons/mob/char_markings.dmi'
+ recommended_species = list("avian")
+
+/datum/sprite_accessory/mam_body_markings/easterndragon
+ name = "Eastern Dragon (Hyper)"
+ icon_state = "easternd"
+ icon = 'hyperstation/icons/mob/char_markings.dmi'
+
+//doged was here
+/datum/sprite_accessory/mam_body_markings/chemlight
+ name = "RadDog (Hyper)"
+ icon_state = "chemlight"
+ icon = 'hyperstation/icons/mob/char_markings.dmi'
+
+/*
+TAUR BODIES
+==========================================================
+*/
+
+/*
+from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm:
+/datum/sprite_accessory/taur
+ icon = 'modular_citadel/icons/mob/mam_taur.dmi'
+ extra_icon = 'modular_citadel/icons/mob/mam_taur.dmi'
+ extra = TRUE
+ extra2_icon = 'modular_citadel/icons/mob/mam_taur.dmi'
+ extra2 = TRUE
+ center = TRUE
+ dimension_x = 64
+ var/taur_mode = NOT_TAURIC
+ color_src = MATRIXED
+ recommended_species = list("human", "lizard", "insect", "mammal", "xeno", "jelly", "slimeperson", "podweak", "avian", "aquatic")
+*/
+/datum/sprite_accessory/taur/chemnaga //Chemlight experimental sprites for future spriting
+ name = "RadDog Naga (Hyper)"
+ icon_state = "chemnaga"
+ taur_mode = SNEK_TAURIC
+ ckeys_allowed = list("chemlight")
+
+/datum/sprite_accessory/taur/chemlight
+ name = "RadDog Taur (Hyper)"
+ icon_state = "chemlight"
+ taur_mode = PAW_TAURIC
+ ckeys_allowed = list("chemlight")
+
+/*
+HAIRSTYLES
+==========================================================
+*/
+
+/*
+from code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm:
+/datum/sprite_accessory/hair
+ icon = 'icons/mob/human_face.dmi' // default icon for all hairs
+
+ // please make sure they're sorted alphabetically and, where needed, categorized
+ // try to capitalize the names please~
+ // try to spell
+ // you do not need to define _s or _l sub-states, game automatically does this for you
+*/
+
+/datum/sprite_accessory/hair/aviancrest
+ name = "Avian Crest (Hyper)"
+ icon_state = "hair_aviancrest"
+ icon = 'hyperstation/icons/mob/char_hair.dmi'
+
+/datum/sprite_accessory/hair/curtains
+ name = "Curtains (Hyper)"
+ icon_state = "hair_curtains"
+
+/datum/sprite_accessory/hair/mommy
+ name = "Hairfre (Hyper)"
+ icon_state = "hair_hairfre"
+
+/datum/sprite_accessory/hair/sidehair
+ name = "Side Hair (Hyper)"
+ icon_state = "hair_tailhair2"
+
+/datum/sprite_accessory/hair/hsglamour
+ name = "Glamour (Hyper)"
+ icon_state = "hair_glamourh"
+
+/datum/sprite_accessory/hair/emoh
+ name = "Emo (Hyper)"
+ icon_state = "hair_emoh"
\ No newline at end of file
diff --git a/hyperstation/code/modules/mob/living/carbon/carbon.dm b/hyperstation/code/modules/mob/living/carbon/carbon.dm
new file mode 100644
index 000000000..27d4e3283
--- /dev/null
+++ b/hyperstation/code/modules/mob/living/carbon/carbon.dm
@@ -0,0 +1,122 @@
+/mob/living/carbon
+ var/total_pain = 0
+ var/pain_effect = 0
+ var/pain_cooldown = 0 //for defibs/surgry!
+
+//pain
+/mob/living/carbon/adjustPainLoss(amount, updating_health = TRUE, forced = FALSE, affected_zone = BODY_ZONE_CHEST)
+ if(!forced && (status_flags & GODMODE))
+ return FALSE
+ apply_damage(amount > 0 ? amount : amount, PAIN, affected_zone)
+ return amount
+
+/mob/living/carbon/handle_status_effects()
+ ..()
+ handle_pain()
+
+/mob/living/carbon/proc/handle_pain()
+ var/pain_amount = 0
+
+ pain_effect += 1
+
+ if (pain_cooldown)
+ pain_cooldown -= 1
+ pain_effect = 0 //ignore pain for now, you got adrenaline running through your body.
+
+ //build up pain in the system from all your limbs and natrually heal pain if its attached to a live body.
+ for(var/obj/item/bodypart/BP in bodyparts)
+ pain_amount += BP.pain_dam
+
+ var/pain_target = (BP.brute_dam + BP.burn_dam)*0.8
+ //natural healing of pain, capped at current damage * 0.8, if the pain is lower, slowly bring up the pain. this will let people "get used, to it."
+ if (BP.pain_dam > (pain_target))
+ BP.pain_dam -= 1 //bring down to the pain_level.
+ else
+ BP.pain_dam += 1 //slowly bring pain back, from pain killers.
+
+ //just make sure its zero'd
+ if (BP.pain_dam < 0)
+ BP.pain_dam = 0
+ continue //dont need to do the rest, your fine.
+
+ if (BP.pain_dam && pain_effect > 5 && (stat == 0))
+ var pain_level = (round(BP.pain_dam / 10))
+ switch(pain_level) //for every 10 points of damage minor -> major
+ if(1)//start at 10 just so it doesnt get annoying with micro damage
+ to_chat(src, "You feel minor pain in your [BP.name].")
+ if(2)
+ to_chat(src, "You feel pain in your [BP.name].")
+ if(3)
+ to_chat(src, "You feel severe pain in your [BP.name].")
+ if(4 to 99)
+ to_chat(src, "You feel overwhelming pain in your [BP.name].")
+ jitteriness += 2
+ stuttering += 2
+
+
+ total_pain = pain_amount
+
+ //handle onscreen alert
+ if (pain_effect > 5)
+ switch(total_pain)
+ if(-100 to 25)
+ clear_alert("pain")
+ if(25 to 69)
+ throw_alert("pain", /obj/screen/alert/pain)
+ if(70 to 99)
+ throw_alert("pain", /obj/screen/alert/painmajor)
+ if(100 to 999)
+ throw_alert("pain", /obj/screen/alert/painshock)
+
+ if (pain_effect > 5)
+ pain_effect = 0 //reset the timer 5 seconds.
+ if(stat == 0) //awake, not dead or asleep
+ //status effects for pain..
+ var/mob/living/H = src
+ if (total_pain > 50 && total_pain < 80)
+ if(HAS_TRAIT(H, TRAIT_MASO)) //just because your into it doesnt give you a advantage..
+ to_chat(src, "You love this pain, it excites you...")
+ H.adjustArousalLoss(6)
+ else
+ to_chat(src, "You cant handle the pain...")
+ if(prob(20))
+ emote("scream")
+ do_jitter_animation() //basic shake.
+ stuttering += 3 //stutter words, your in pain bro.
+
+ if (total_pain > 80) //your in trouble. fainting..
+ if(HAS_TRAIT(H, TRAIT_MASO))
+ to_chat(src, "You love this intense pain, it excites you...")
+ H.adjustArousalLoss(12)
+ else
+ to_chat(src, "You cant handle the intense pain...")
+ if(prob(20)) //chance of fainting..
+ visible_message("[src] collapses!")
+ Unconscious(100)
+ jitteriness += 3 //shake
+ stuttering += 3 //stutter words
+
+ //if they are asleep, this wont trigger.
+ if (total_pain > 110 && stat == 0) //taking 77 all damage at once from full health, will put you into shock and kill you. This cant be achived with chip damage (or fist fights), because youll die before you reach this pain level.
+ if(prob(50))
+ emote("scream")//scream
+ to_chat(src, "You give into the pain...")
+ visible_message("[src] goes into neurogenic shock!")
+ Unconscious(200)
+ if (can_heartattack()) //check if they can
+ set_heartattack(1) //heart stopped!
+
+
+//HS Pain heal
+/mob/living/carbon/adjustPainLoss(amount, updating_health = TRUE, forced = FALSE)
+ if (!forced && amount < 0 && HAS_TRAIT(src,TRAIT_NONATURALHEAL))
+ return FALSE
+ if(!forced && (status_flags & GODMODE))
+ return FALSE
+
+ //all attached limbs get pain damage
+ for(var/X in bodyparts)
+ var/obj/item/bodypart/BP = X
+ BP.pain_dam += amount
+
+ return amount
\ No newline at end of file
diff --git a/hyperstation/code/modules/power/reactor/fluffed.dm b/hyperstation/code/modules/power/reactor/fluffed.dm
new file mode 100644
index 000000000..e3d69be5b
--- /dev/null
+++ b/hyperstation/code/modules/power/reactor/fluffed.dm
@@ -0,0 +1,23 @@
+/*
+This is a pre-destroyed nuclear reactor for the sake of mapping special fluff stuff.
+Not actually a reactor, just uses the icon and irradiates the surrounding area a bit.
+Nowhere else to really put this.
+*/
+
+/obj/structure/fluff/destroyed_nuclear_reactor
+ name = "Destroyed Nuclear Reactor"
+ desc = "What in the hell happened here?"
+ icon = 'hyperstation/icons/obj/machinery/rbmk.dmi'
+ icon_state = "reactor_slagged"
+ pixel_x = -32
+ pixel_y = -32
+ density = FALSE
+ anchored = TRUE
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
+ light_color = LIGHT_COLOR_CYAN
+ dir = 8 //Less headache inducing :))
+
+/obj/structure/fluff/destroyed_nuclear_reactor/Initialize()
+ . = ..()
+ set_light(3)
+ AddComponent(/datum/component/radioactive, 15000 , src)
diff --git a/hyperstation/code/modules/power/reactor/rbmk.dm b/hyperstation/code/modules/power/reactor/rbmk.dm
index 948a6598f..51f56b47a 100644
--- a/hyperstation/code/modules/power/reactor/rbmk.dm
+++ b/hyperstation/code/modules/power/reactor/rbmk.dm
@@ -607,10 +607,10 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
. = ..()
ui_interact(user)
-/obj/machinery/computer/reactor/control_rods/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/ui_state/state)
+/obj/machinery/computer/reactor/control_rods/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/tgui_state/state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "rbmkcontrolrods", name, 300, 300, master_ui, state)
+ ui = new(user, src, ui_key, "RbmkControlRods", name, 300, 300, master_ui, state)
ui.open()
/obj/machinery/computer/reactor/control_rods/ui_act(action, params)
@@ -648,7 +648,7 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
. = ..()
ui_interact(user)
-/obj/machinery/computer/reactor/stats/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/ui_state/state)
+/obj/machinery/computer/reactor/stats/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/tgui_state/state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "RbmkStats", name, 350, 500, master_ui, state)
@@ -803,7 +803,7 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
transfer_access = ACCESS_CONSTRUCTION
network_destination = "rbmk monitoring system"
size = 2
- tgui_id = "ntosrbmkstats"
+ tgui_id = "NtosRbmkStats"
ui_x = 350
ui_y = 550
var/active = TRUE //Easy process throttle
diff --git a/hyperstation/code/obj/SYSuit/main.dm b/hyperstation/code/obj/SYSuit/main.dm
index a4047d81f..9e40cb449 100644
--- a/hyperstation/code/obj/SYSuit/main.dm
+++ b/hyperstation/code/obj/SYSuit/main.dm
@@ -6,7 +6,7 @@
//The suit itself
/obj/item/clothing/under/syclothing
- name = "SYTech Nanoweave suit"
+ name = "SynTech Nanoweave suit"
desc = "A leading-grade suit developed by SYTech, with an internal dampening field to lessen accidents at micro scales. This one seems to be more skimpy and developed for bedroom-play, though."
icon = 'hyperstation/icons/obj/clothing/uniforms.dmi'
icon_state = "syclothing"
@@ -61,7 +61,7 @@
//The cap
/obj/item/clothing/head/sycap
- name = "SYTech Nanoweave cap"
+ name = "SynTech Nanoweave cap"
desc = "A piece of clothing for a SYTech suit, allowing for extended control and breathability at micro scales via amplified hardlight respiration. This one seems to be modeled like a dominatrix cap, however."
icon = 'hyperstation/icons/obj/clothing/head.dmi'
icon_state = "sycap"
@@ -112,7 +112,7 @@
//The visor
/obj/item/clothing/glasses/hud/toggle/syvisor
- name = "SYTech Analysis Visor"
+ name = "SynTech Analysis Visor"
desc = "A high-tech visor developed for SYTech suits, for helping internal processes lead augment decisions. This one looks like a pair of darkened sunglasses."
icon = 'hyperstation/icons/obj/clothing/glasses.dmi'
icon_state = "syvisor"
@@ -161,7 +161,7 @@
//Shoes
/obj/item/clothing/shoes/syshoes
- name = "SYTech Nanoweave platform heels"
+ name = "SynTech Nanoweave platform heels"
desc = "A complimentary piece of SYTech apparel for gravity-altering applications. It even allows you to walk up walls! This pair takes on the appearance of skimpy, thigh-high latex boots with stilletos."
icon_state = "syshoes"
item_state = "syshoes"
@@ -174,7 +174,7 @@
//Gloves
/obj/item/clothing/gloves/sygloves
- name = "SYTech Nanoweave sleeves"
+ name = "SynTech Nanoweave sleeves"
desc = "A pair of enhanced sleeves, developed by SYTech. These allow remote and psionic levels of manipulation to the electrical currents inside living beings, or objects. Use with caution!"
icon_state = "sygloves"
item_state = "sygloves"
@@ -186,4 +186,4 @@
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
strip_delay = 120
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- mutantrace_variation = NO_MUTANTRACE_VARIATION
\ No newline at end of file
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
diff --git a/code/game/objects/items/lorebooks.dm b/hyperstation/code/obj/items/lorebooks.dm
similarity index 52%
rename from code/game/objects/items/lorebooks.dm
rename to hyperstation/code/obj/items/lorebooks.dm
index b22f6af4e..700089f55 100644
--- a/code/game/objects/items/lorebooks.dm
+++ b/hyperstation/code/obj/items/lorebooks.dm
@@ -6,7 +6,7 @@
/obj/item/book/lorebooks/welcome_to_kinaris
name = "Welcome to Kinaris!"
icon_state = "bookwelcometokinaris"
- desc = "An introductory book given to immigrants of people who changed their Nanotrasen ways, and accepted the light of Kinaris, Radiance, and the Azurean Government."
+ desc = "A humanitarian guide to Andromeda."
author = "V. Kinaris"
title = "Welcome to Kinaris!"
dat = {"
@@ -21,63 +21,152 @@
Welcome to Kinaris!
+ A humanitarian guide to Andromeda
- If you're reading this datapad, you probably have gained an interest in what the daily commodities and rights of a Kinaris worker may be, or you have recently been employed and are looking for further information. Under the latter's case; welcome! It's not an easy transition to working under a larger corporation for any Azurean, and we are here to alleviate that stress. Whether or not you fall under any of these categories, or are clueless at all to who we are, please do take a read!
+ Hello reader! If your eyes find themselves upon this datapad, then you’re surely interested in finding out what your new employers are all about. If not, Kinaris would highly recommend a thorough read regardless; Azurean culture tends to be a shock for outsiders!
Table of Contents...
- - What is Kinaris?
-
- How Kinaris Came to be
-
- How Kinaris Operates Today
-
- Workers' Rights
-
- Usage of Radiance
+
- Kinaris; Who Are We?
+
- Andromeda and the Current Era
+
- Others Under Kinaris
+
- About Layenia Station
- Chapter 1
- What is Kinaris?
+ Chapter 1
+ Kinaris, Who Are We?
- If you are unfamiliar to Azurean space, then you are most definitely unfamiliar with the entirety of Kinaris itself. Kinaris is the primary company under the rule of Azurea, who not only manufactures goods, but is a forefront of Radiant Technology, space exploration, exo-colony development, and asset protection. As such, it is a very expensive operation that almost entirely depends on it's own manufactured goods- and selling of such- towards it's own colonies, which is an extent of colony taxation and revenue collection after they've initially been set up. The sheer stability of it's exponential growth and safety has piqued the interest from other regions and promising even more imports and exports between Kinaris and other affiliates (including but not limited to; Lancaster Industries, CorpraTek, Grinlok Conglomerate, and Nanotrasen). The dependable and and noble nature of the heads at Kinaris had inevitably led to constant backing by the Azurean Government, and increased fortitude in asset protection. This ultimately ended up in Kinaris being the leading, and most-trusted government under Azurea law.
+ There are many misconceptions and illusions regarding Kinaris and what we are all about. This of course is coming with no surprise, thanks to our heavily-regulated uplifting guidelines and processes. Kinaris (otherwise known as Kinaris Colonization and Conversion LLC) is not what can be defined as a company or organization; we do not require the 9-5 wage-slave worklife that is requested from many capitalistic-leaning organizations in places such as the Milky Way. We are a firm believer that happiness and self-worth is as important as being part of a bigger picture in this Universe. Nobody asked to be born, but every soul has an opportunity to thrive. Such is the way of a progressive, forward-thinking power like us.
- The word Kinaris means "of kin", which translates to "of family", and that is the intent of Kinaris. A family nourishes you and helps you grow, through hardship and every step of the way along the road of becoming an individual. With every lesson learned, you grow. With every riddled situation, you learn anew. Kinaris is no different from that of the teachings of a mother or a father; intent to ensure that you can be a successor, and be better than your previous self. You are as important as everyone else in the world, yet you are unique. These rights are protected under Kinaris.
+ Every soul should have a taste of comfort and happiness, be it in the mindscape of neurological implants, or in the warm breeze of a familiar home. Nobody should be robbed of their desires as long as it leads to happiness for everyone involved. Life should lead to a fulfilling sense of accomplishment after discovering a true passion- this is reflected true for every soul under our wing. Be it a synthetic being manufactured for a reason, or a born individual who grew up looking at the stars. At the end of it all, we are one and the same. To live and to thrive.
+
+ The technological elegance and prowess we at Kinaris possess is equally important as it is fickle. We live in an age where death is long behind us; starvation and the crushing weight of reality itself can be washed away with an implant, or the golden towers of our civilization. But this means no room for breeding irresponsibility and disrespecting our reason in the Universe in the first place. To live is to die, to flourish is to wither. There is a forbidden fruit in this mindset we can land ourselves in; that of immortality and escaping the inevitable end of everything. This fruit leads to arrogance and a blind lack of care for the balance of the greater good. The truth of the matter is you cannot have your greatest achievements without wallowing in failure. We live our greatest lives for our inevitable death. This is Radiance.
+
+ As such, we have witnessed the greater illusions that developing civilizations like Humanity surround themselves in. Where death is simply another part of everyday life, and to be born again into a hysteria that asks more labor from their living cells ad infinitum. This is a blatant disrespect of our Radiance, but more on this concept later. Know vehemently that while Kinaris can save you from your death in the blink of an eye, that day we’re done with this Universe comes for us all. We never forget our reason for this reality in the first place.
Chapter 2
- How Kinaris Came to be
+ Andromeda and the Current Era
- Rising up to mega-corporation status and being backed as the most trustable force within several sectors is not a simple task whatsoever. There are mistakes along the road, and there are plenty of issues forthwrought with even considering such a task. Kinaris begun as nothing more than a simple cargo company nearly two centuries from the date of March 5th, 2560. Initially, the company began as nothing more than a delivery service by none other than Centurian Kinaris, within a low-tech sector out of Azurean Gov's grasp. Due to the unfortunate events of resistance against The Phoenix at the time, most sectors like this were outright ravaged and decimated into a smoldering pulp of mud and ash, where individuals kept to themselves and were cut-throat towards one another. This led to imports and exports often being outright mistrusted due to one scandallous event of poisoned rations after another. This was an opportunity for Centurian, who was one of the most trusted individuals within the sector, and opened up his shipping goods company after months of hauling for others. This in time spread word and opened further opportunities for Centurian himself, who saw these as nothing more than help to give towards those who needed it. Kinaris outright spent a good portion of it's early life as another small company with a few workers trickling in every now and then, indifferent to the thousands of others littering the frontier.
+ The chances are, you’re probably a long way away from home if you’re reading this datapad. The greater galaxy of Andromeda is an incredibly complex place compared to other galaxies; and even if you’re a newly-uplifted species who has been brought to safety only-recently, we know the stresses and struggles that this may bring. Know that you are not alone in this, and Kinaris solely lives for bringing everyone to an even playing field.
- What eventually settled Kinaris off from the norm of other companies was nothing more than the surge of artificial interest in becoming Radiant across Azurean space. Unlike most companies who resisted and fought against The Phoenix, Kinaris heeded it's will. It was said that Centurian himself was a vissionare in his early days, led by the golden light, as he called it. In most frontier sectors, this was appalled and shunned by most communties, who aimed to flee as far as they could from Azurea itself, to escape Radiance. This was a short downfall in Kinaris's momentum, as it's trust rapidly decimated into nothing in due time, and prompted anger within it's customers. However, Centurian prevailed, and in a simple matter of days, sectors begun following in Radiance in the bulk, and as a result, formed a bond with the company. It is unclear how exactly Centurian managed to pull off such a dangerous feat, but that is just more evidence towards his Radiance.
+ Andromeda as a whole lives in a state of high peace and tranquility. The teachings of Radiance and steady Uplifting have brought upon a level-headed sense of understanding from one civilization to the next. Coexistence is the key to a Utopian society, which is something we all strive for. When you live without respect for those who share the stars with you, you will only fall flat on your face in an endeavor to chase one light of many. This applies even more vehemently for those civilizations who are warring with themselves. Know words prior to violence.
- As the interest in Radiance surged across Azurean space, so did the success of Kinaris. One sector converted, one sector gained trust. More trust, more revenue. More revenue, more improvements. Rinse and repeat, for a hundred years. For a while, Radiance was nothing more than a melody that went with the chorus of Kinaris; a simple cargo company turned head over heels into a Pristine Zealot of Light, converting those within it's path instead of decimating it to smoldering ash, feeding back into the acceptance of Radiance as a whole for the people of Azurean Space. Centurian was nothing more than the leader of peace and safety, giving to those who needed help the most, branching off far beyond that of simple freight shipments. With trust, he smote down those who did not heed to peace, rather violence. Some did not believe in his ways. This led to his death after a Nanotrasen Assault on his capital freighter.
+ Approximately 90% of the galaxy is under complete Kinaris control, be it from colonies and worlds who wish independence, or those who depend on us for resources and aid. Andromeda’s history was not a quiet and relaxed one however; the streaks of distant war and conflict bear from star to star, be it from one torn megastructure to ripped-apart dyson spheres. Our teachings are to be gentle, but not all species were raised and born equally. War was once a flame we were quick to snuff out, as our technological advances outpace many by the thousands of years.
- Today, his tomb drifts within the gas clouds of Myril Majoris, Azurea's gas giant. In memoriam of the one person who heeded unity with individualism into Azurea's people. He was nothing more than Radiant, nothing less.
+ As of the current encryption of this datapad, the current date is 9E80C, which approximately translates to 4/4/2561 in Milky-Way-approved calendars. Kinaris’s regulatory Era-Cycle calendar supports the vagueness of one star to the next; be it a common binary, or the endless wandering of a rogue planet. The Era and Cycle is the same for everyone across the galaxy, with their own local orbits and patterns added on top. For example, while it is universally the 80th Cycle of the 9th Era, it may be the Fourth of April in sol time on top. A cycle tends to be one complete orbit of the two primary Binary Stars in Radiant Hearth, while an Era usually is a realized event of unprecedented advancement. The current Era is known sometimes as The Era of the Wing, where intergalactic travel has become near-instantaneous due to progressions in Radiant Technology.
+
+ Shortly after the birth of this Era, humanity and the Milky Way were discovered. Not only that, but their cultures, other species, and general society beneath their control. This was an exciting time to bring new mindsets to the table. Primarily at the forefront, we found what they classified as a “Megacorporation” known as “Nanotrasen”. To put it lightly, their abhorrent misuse of technologies for the sake of profit and lack of rights’ for the very lives they carelessly endanger put us at odds immediately. Complete uplifting and conversion of people under Nanotrasen has yet to happen, but after a peace-talk gone into a full-blown propaganda-fueled attack, we have decided to step out of the Milky Way entirely, and lock our borders to them. It is not unusual for us at Kinaris to wait for a civilization to mature, and humanity is one of many on that list.
+
+ Despite this, there are a few locations across the Andromeda that allow access from the Milky Way. Thankfully, they have a much lower technological understanding than we do, so getting from one galaxy to the next is nigh-impossible for them. As it is now, this is completely under our control.
- Chapter 3
- How Kinaris Operates Today
+ Chapter 3
+ Others Under Kinaris
- Modern-day Kinaris is a different story than that of previous-century Kinaris, with less aggression and more protection, yet it is the other side of one coin. Having gone past the days of aggression and forthright domination, KN's goal these days is that of a stalwart. Reliable, hardworking, and most of all: loyal. Having gone far from it's roots of zealot-like exports, imports, and radical conversion, Kinaris is that of an expanded mindset and reach, especially due to the usage of Radiant Technology. Today, Kinaris offers not only jobs in freight, but that of common commodities such as food growth and production, alongside processing. Further down the line includes industrial production and that of factory-assisted work, robotics, research, asset protection, and more. When a new sector, area or ship is attained, it is assigned a Commander, in which they ensure it is secured with it's own technological advances and supplies, to ensure the working condition of any outpost, station, or ship that KN may claim ownership of. After initial supplying and resource distribution, workers are given a period of time to get set up before sending shipments out for Kinaris to collect and maintain as exports elsewhere, ultimately with profit in mind. This may not be the case for every new sector attained, but it is often standard protocol, with more upgrades to the sector coming forth as a the Commander may see fit; and often times, Commanders are rotated in and out from the sector.
+ While this datapad has certainly fed you a lot of information on Kinaris, know that not everything is just about us, as per our priority of coexistence. Below are some of our primary partners and civilizations that we refer to quite frequently. You may even see them around Layenia!
- Kinaris Officials and Commanders are often protected by a multitude of laws that allow them to display their power and ensure that workers are making profits, and may even be escorted by KN Elites and Zealots, if suspected threats are within the area. Usage of force is often permitted in the instance of non-compliance with a Commander, who is above any captain or high-ranking individual in control of that sector, and is more often than not, above KN Law, but below Radiance Protocol. Kinaris Officials do not get this benefit.
-
Above Commanders, there may be a regional director who controls and permits what Commanders do in their sectors, and above that, there will be a member of the board who represents certain regions. There is no distinct "CEO" of Kinaris, rather a board of directors who have fully committed to Radiance, and have the near-full extent of Radiant Technology within their system. The closest personnel to a higher rank above that would be Valarie Kinaris, the daughter of the founder. She still answers to other board members, as they answer to her, however.
+
Dzar Underworks
-
- Chapter 4
- Workers' Rights
+ Homeworld: Salis Primary A-4
+
+ Home Star: Salis Major
+
+ Primary Species: Vitruvian
+
+ Primary Language: Natrul
+
+ Primary Work: Metalsmithing, mining, and material research
+
+ Motto: In virtue we trust
- Please refer to Kinaris Law for a full extent of these rights.
+ “Dzar Underworks is a conglomerate of metalworking companies underneath the intergalactic umbrella of Kinaris, formed firstly in opposition of Radiance in the past, and an ally now. They possess the unique engram of smithing highly-sophisticated metals and impossible materials from patented forges, which is kept secret by shareholders at Dzar. The unique way Dzar is able to manufacture metals has left them uncontested against many other companies, leading them to a divine- if not pricey- hold on anyone who is interested in making high-grade vessels, colonies, megastructures, or plain-old appliances. Dzar works side-by-side with Kinaris, where Radiant Technology is their reward in return for high-grade metals.”
+
-
-
- Chapter 5
- Usage of Radiance
+ The Azurean Government
- If you've been blessed by The Phoenix's light, then we commend you for such a noble hierarchy to achieve! As Radiance Protocol is rather straightforward in the eyes of Kinaris and we do not doubt the usage of the beholder, it is permitted to use Radiant Technology within Kinaris-owned space, so as long as it involves a more efficient workflow. Usage of smiting should be used with caution.
+ Homeworld: KNCS Jul Ryynthal, Myril Majoris orbit
+
+ Home Star: Dissona / Radia (binary)
+
+ Primary Species: Hyenidae
+
+ Primary Language: Fornaux
+
+ Primary Work: governing and representing anthro species intergalactically
+
+ Motto: No soul left behind
-
-
-
+ “The Azurean Government (also known as AzureGov, or Azurean Govern) is the leading spearhead into peace and tranquility within Andromeda when Kinaris has its back turned; despite their criticisms. It governs and loosely controls the various organizations currently operating around Andromeda, but it’s not secret their power is limited in comparison to the other powers in the galaxy. Despite this, their operations in ensuring that the representation of anthromorphs and other sentient creatures can be seen in a better light to lesser civilizations such as humanity, given that the correct pacts can be agreed upon.”
+ -
+
+
Zao Security and Protection
+
+ Homeworld: the Ringworld of Incandesce Primara
+
+ Home Star: Incandesce Seconda
+
+ Primary Species: Primaris Unit
+
+ Primary Language: Binary
+
+ Primary Work: Contracted Policework
+
+ Motto: Secure the people, save the future
+
+ “ZaoCorp is a vigilant workhorse of stabilizing colonies with quick, effective, and calm policework. Their strict neurological pursuit of hiring only the most fair and level-headed individuals leads them to establish peace among any colonies they’re contracted at, making for an effective police force. Not only do they hire the best of the best through genetic selection and splicing, they also manufacture bleeding-edge Nuovo-fabric exosuits, threaded to a casual and calm trench coat adorned in a blue and beige. This makes for an approachable, fair, and just visage that is capable of nonlethal apprehension where necessary. Trust is always locked in the hands of Zao; stifling any concerns peacefully through vigilance.”
+
-
+
+
Synergized Technology
+
+ Homeworld: the City-Planet of Jovias
+
+ Home Star: Nembus
+
+ Primary Species: Anthromorph
+
+ Primary Language: Fornaux
+
+ Primary Work: Production and selling of size-altering technology, including infrastructure
+
+ Motto: Modern solutions, big and small
+
+ “Synergized Technology- commonly known as SynTech- is a company which leads the complex solutions in any galaxy’s biggest problem: accommodating for the size of life. As civilizations grew more welcoming to different ideals and lifestyles, it became more difficult and disastrous to deal with extreme size differences from one alien species to the other. Not only did this spark an incredible amount of regulations from AzureGov, but Kinaris’s interest was piqued to keep peace over all; and that included accommodating for any species, whether or not they stood over a mountain, or below an ant hill. The high demand of multi-size rights and technology was driven into SynTech’s hands, where they would provide and assist in regulating consistent and meaningful products to ease interaction from one to the next. Not only do they supply incredibly advanced, highly-regulated technology, they also help in consistent planning and moderation in most cities to keep traffic from most differently-sized species without havoc. Without SynTech, galaxies would look like a fairly bland place, where one size rules above all.”
+
-
+
+
Titan Piezoelectrics and Ceramics
+
+ Homeworld: Tremora
+
+ Home Star: Titawin
+
+ Primary Species: Megalithian
+
+ Primary Language: Aquarian
+
+ Primary Work: Production of power-efficient piezoelectric ceramics and craft
+
+ Motto: n/a
+
+ “Titan Ceramics was the primary source of prominent electrical power on Tremora for its lifespan, with extravagant materials and unique ceramic mixes that supported incredibly efficient production of energy in bulk. Not only did they provide energy for a once-struggling civilization, they brought upon artistic desire and talent for those who would seek their ceramics. Value in energy is equal to value in art in their eyes, with only the finest materials and expertly-tested conditions to meet the quality of their work. Despite the overwhelming size difference of the housing species, value is still sought from both sides, resulting in multi-size accommodations for their ceramics. When cheap yet efficient power is required without the Weave, Titan Ceramics is there.”
+
-
+
+
+ Chapter 4
+ About Layenia Station
+
+ After reading this far in, it may become apparent that Layenia does not reflect the values of Kinaris in many ways. From the technological progress to the surroundings, it may seem like Layenia Station is far behind its time. And that’s an entirely correct notion, all thanks to the standards of Kinaris Uplifting.
+
+ As it stands right now, Layenia Station uses a fabricated Engram to replicate that of its former employers and owners. The star was previously given to humanity prior to the first attempt at Uplifting, but it was taken back shortly after things went south, and given open borders to the Milky Way. The Engram in particular mimics a lot of Nanotrasen-esque technology, which makes Layenia Station one of the most low-tech Kinaris stations to exist out there to date!
+
+ When it comes down to standards of Uplifting, change is one thing that many species cannot deal with easily. As such, the golden standard of Uplifting is to start from the technology they know, and slowly introduce new concepts and realizations after time. Layenia Station is currently in its early phases of conversion, but in time, it too will reach heightened technological elegance like the rest of the galaxy.
+
+ If you wish to learn more about Engrams, please locate a datapad on the subject!
+
+
+