", "\[hr\]") + t = replacetext(t, "
- ", "\[list\]")
+ t = replacetext(t, "
", "\[logo\]")
+ t = replacetext(t, "
", "\[redlogo\]")
+ t = replacetext(t, "
", "\[sglogo\]")
+ t = replacetext(t, "", "\[field\]")
+ t = replacetext(t, "R E D A C T E D", "\[redacted\]")
+ t = strip_html_properly(t)
+ return t
+
// Random password generator
/proc/GenerateKey()
//Feel free to move to Helpers.
@@ -476,23 +528,43 @@
#define gender2text(gender) capitalize(gender)
-/// Used to get a properly sanitized input, of max_length
-/// no_trim is self explanatory but it prevents the input from being trimed if you intend to parse newlines or whitespace.
+/**
+ * Used to get a properly sanitized input. Returns null if cancel is pressed.
+ *
+ * Arguments
+ ** user - Target of the input prompt.
+ ** message - The text inside of the prompt.
+ ** title - The window title of the prompt.
+ ** max_length - If you intend to impose a length limit - default is 1024.
+ ** no_trim - Prevents the input from being trimmed if you intend to parse newlines or whitespace.
+*/
/proc/stripped_input(mob/user, message = "", title = "", default = "", max_length=MAX_MESSAGE_LEN, no_trim=FALSE)
- var/name = input(user, message, title, default) as text|null
-
+ var/user_input = input(user, message, title, default) as text|null
+ if(isnull(user_input)) // User pressed cancel
+ return
if(no_trim)
- return copytext(html_encode(name), 1, max_length)
+ return copytext(html_encode(user_input), 1, max_length)
else
- return trim(html_encode(name), max_length) //trim is "outside" because html_encode can expand single symbols into multiple symbols (such as turning < into <)
+ return trim(html_encode(user_input), max_length) //trim is "outside" because html_encode can expand single symbols into multiple symbols (such as turning < into <)
-// Used to get a properly sanitized multiline input, of max_length
+/**
+ * Used to get a properly sanitized input in a larger box. Works very similarly to stripped_input.
+ *
+ * Arguments
+ ** user - Target of the input prompt.
+ ** message - The text inside of the prompt.
+ ** title - The window title of the prompt.
+ ** max_length - If you intend to impose a length limit - default is 1024.
+ ** no_trim - Prevents the input from being trimmed if you intend to parse newlines or whitespace.
+*/
/proc/stripped_multiline_input(mob/user, message = "", title = "", default = "", max_length=MAX_MESSAGE_LEN, no_trim=FALSE)
- var/name = input(user, message, title, default) as message|null
+ var/user_input = input(user, message, title, default) as message|null
+ if(isnull(user_input)) // User pressed cancel
+ return
if(no_trim)
- return copytext(html_encode(name), 1, max_length)
+ return copytext(html_encode(user_input), 1, max_length)
else
- return trim(html_encode(name), max_length)
+ return trim(html_encode(user_input), max_length)
//Adds 'char' ahead of 'text' until there are 'count' characters total
/proc/add_leading(text, count, char = " ")
diff --git a/code/_helpers/turfs.dm b/code/_helpers/turfs.dm
index 690e4f1833..ddfcec7421 100644
--- a/code/_helpers/turfs.dm
+++ b/code/_helpers/turfs.dm
@@ -131,7 +131,7 @@
var/old_icon1 = T.icon
var/old_decals = T.decals ? T.decals.Copy() : null
- B.Destroy()
+ //B.Destroy()
X = B.ChangeTurf(T.type)
X.set_dir(old_dir1)
X.icon_state = old_icon_state1
diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm
index 94914550b3..33398d6a87 100644
--- a/code/_helpers/unsorted.dm
+++ b/code/_helpers/unsorted.dm
@@ -344,7 +344,8 @@ Turf and target are seperate in case you want to teleport some distance from a t
var/newname
for(var/i=1,i<=3,i++) //we get 3 attempts to pick a suitable name.
- newname = input(src,"You are \a [role]. Would you like to change your name to something else?", "Name change",oldname) as text
+ //newname = tgui_input_text(src,"You are \a [role]. Would you like to change your name to something else?", "Name change",oldname)
+ newname = input(src,"You are \a [role]. Would you like to change your name to something else?", "Name change",oldname)
if((world.time-time_passed)>3000)
return //took too long
newname = sanitizeName(newname, ,allow_numbers) //returns null if the name doesn't meet some basic requirements. Tidies up a few other things like bad-characters.
@@ -1364,7 +1365,7 @@ var/mob/dview/dview_mob = new
/proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
if (value == FALSE) //nothing should be calling us with a number, so this is safe
- value = input(usr, "Enter type to find (blank for all, cancel to cancel)", "Search for type") as null|text
+ value = tgui_input_text(usr, "Enter type to find (blank for all, cancel to cancel)", "Search for type")
if (isnull(value))
return
value = trim(value)
diff --git a/code/_helpers/unsorted_vr.dm b/code/_helpers/unsorted_vr.dm
index daf4db48d7..0890c1f9c6 100644
--- a/code/_helpers/unsorted_vr.dm
+++ b/code/_helpers/unsorted_vr.dm
@@ -18,7 +18,8 @@
continue
if(vent.welded)
continue
- if(istype(get_area(vent), /area/crew_quarters/sleep)) //No going to dorms
+ var/area/A = get_area(vent)
+ if(A.forbid_events)
continue
vent_list += vent
if(!vent_list.len)
diff --git a/code/_macros.dm b/code/_macros.dm
index d122d9045f..737b317abe 100644
--- a/code/_macros.dm
+++ b/code/_macros.dm
@@ -42,4 +42,6 @@
#define WORLD_ICON_SIZE 32 //Needed for the R-UST port
-#define PIXEL_MULTIPLIER WORLD_ICON_SIZE/32 //Needed for the R-UST port
\ No newline at end of file
+#define PIXEL_MULTIPLIER WORLD_ICON_SIZE/32 //Needed for the R-UST port
+
+#define JOINTEXT(X) jointext(X, null)
diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
index 14feaf1b5f..f1a7f22248 100644
--- a/code/_onclick/hud/_defines.dm
+++ b/code/_onclick/hud/_defines.dm
@@ -47,6 +47,7 @@
#define ui_construct_purge "EAST:00,CENTER-1:15"
#define ui_construct_fire "EAST-1:16,CENTER+1:13" //above health, slightly to the left
#define ui_construct_pull "EAST-1:28,SOUTH+1:10" //above the zone_sel icon
+#define ui_pai_comms "EAST-1:28,SOUTH+1:5"
//Lower right, persistant menu
#define ui_dropbutton "EAST-4:22,SOUTH:5"
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index 6298747901..642ec99c73 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -192,7 +192,7 @@ var/list/global_huds = list(
var/icon/ui_style
var/ui_color
var/ui_alpha
-
+
// TGMC Ammo HUD Port
var/list/obj/screen/ammo_hud_list = list()
@@ -368,6 +368,9 @@ var/list/global_huds = list(
toggle_hud_vis(full)
/mob/proc/toggle_hud_vis(full)
+ if(!client)
+ return FALSE
+
if(hud_used.hud_shown)
hud_used.hud_shown = 0
if(hud_used.adding)
@@ -405,7 +408,8 @@ var/list/global_huds = list(
return TRUE
/mob/living/carbon/human/toggle_hud_vis(full)
- ..()
+ if(!(. = ..()))
+ return FALSE
// Prevents humans from hiding a few hud elements
if(!hud_used.hud_shown) // transitioning to hidden
@@ -466,7 +470,7 @@ var/list/global_huds = list(
/mob/new_player/add_click_catcher()
return
-
+
/* TGMC Ammo HUD Port
* These procs call to screen_objects.dm's respective procs.
* All these do is manage the amount of huds on screen and set the HUD.
diff --git a/code/_onclick/hud/movable_screen_objects.dm b/code/_onclick/hud/movable_screen_objects.dm
index 40e5977c83..39d36738aa 100644
--- a/code/_onclick/hud/movable_screen_objects.dm
+++ b/code/_onclick/hud/movable_screen_objects.dm
@@ -114,7 +114,7 @@
M.maptext = "Movable"
M.maptext_width = 64
- var/screen_l = input(usr,"Where on the screen? (Formatted as 'X,Y' e.g: '1,1' for bottom left)","Spawn Movable UI Object") as text
+ var/screen_l = tgui_input_text(usr,"Where on the screen? (Formatted as 'X,Y' e.g: '1,1' for bottom left)","Spawn Movable UI Object")
if(!screen_l)
return
@@ -133,7 +133,7 @@
S.maptext = "Snap"
S.maptext_width = 64
- var/screen_l = input(usr,"Where on the screen? (Formatted as 'X,Y' e.g: '1,1' for bottom left)","Spawn Snap UI Object") as text
+ var/screen_l = tgui_input_text(usr,"Where on the screen? (Formatted as 'X,Y' e.g: '1,1' for bottom left)","Spawn Snap UI Object")
if(!screen_l)
return
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index a06df0c082..03fd9bac74 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -422,16 +422,28 @@
usr.a_intent_change("right")
if(I_HELP)
usr.a_intent = I_HELP
- usr.hud_used.action_intent.icon_state = "intent_help"
+ if(ispAI(usr))
+ usr.a_intent_change(I_HELP)
+ else
+ usr.hud_used.action_intent.icon_state = "intent_help"
if(I_HURT)
usr.a_intent = I_HURT
- usr.hud_used.action_intent.icon_state = "intent_harm"
+ if(ispAI(usr))
+ usr.a_intent_change(I_HURT)
+ else
+ usr.hud_used.action_intent.icon_state = "intent_harm"
if(I_GRAB)
usr.a_intent = I_GRAB
- usr.hud_used.action_intent.icon_state = "intent_grab"
+ if(ispAI(usr))
+ usr.a_intent_change(I_GRAB)
+ else
+ usr.hud_used.action_intent.icon_state = "intent_grab"
if(I_DISARM)
usr.a_intent = I_DISARM
- usr.hud_used.action_intent.icon_state = "intent_disarm"
+ if(ispAI(usr))
+ usr.a_intent_change(I_DISARM)
+ else
+ usr.hud_used.action_intent.icon_state = "intent_disarm"
if("pull")
usr.stop_pulling()
diff --git a/code/controllers/subsystems/game_master.dm b/code/controllers/subsystems/game_master.dm
index 06a6060227..5315a3dbe8 100644
--- a/code/controllers/subsystems/game_master.dm
+++ b/code/controllers/subsystems/game_master.dm
@@ -350,13 +350,13 @@ SUBSYSTEM_DEF(game_master)
choose_game_master(usr)
if(href_list["set_staleness"])
- var/amount = input(usr, "How much staleness should there be?", "Game Master") as null|num
+ var/amount = tgui_input_number(usr, "How much staleness should there be?", "Game Master")
if(!isnull(amount))
staleness = amount
message_admins("GM staleness was set to [amount] by [usr.key].")
if(href_list["set_danger"])
- var/amount = input(usr, "How much danger should there be?", "Game Master") as null|num
+ var/amount = tgui_input_number(usr, "How much danger should there be?", "Game Master")
if(!isnull(amount))
danger = amount
message_admins("GM danger was set to [amount] by [usr.key].")
diff --git a/code/controllers/subsystems/media_tracks.dm b/code/controllers/subsystems/media_tracks.dm
index 53805bcbec..58fd0ec858 100644
--- a/code/controllers/subsystems/media_tracks.dm
+++ b/code/controllers/subsystems/media_tracks.dm
@@ -74,7 +74,7 @@ SUBSYSTEM_DEF(media_tracks)
return
// Required
- var/url = input(C, "REQUIRED: Provide URL for track, or paste JSON if you know what you're doing. See code comments.", "Track URL") as message|null
+ var/url = tgui_input_text(C, "REQUIRED: Provide URL for track, or paste JSON if you know what you're doing. See code comments.", "Track URL", multiline = TRUE)
if(!url)
return
@@ -112,20 +112,20 @@ SUBSYSTEM_DEF(media_tracks)
sort_tracks()
return
- var/title = input(C, "REQUIRED: Provide title for track", "Track Title") as text|null
+ var/title = tgui_input_text(C, "REQUIRED: Provide title for track", "Track Title")
if(!title)
return
- var/duration = input(C, "REQUIRED: Provide duration for track (in deciseconds, aka seconds*10)", "Track Duration") as num|null
+ var/duration = tgui_input_number(C, "REQUIRED: Provide duration for track (in deciseconds, aka seconds*10)", "Track Duration")
if(!duration)
return
// Optional
- var/artist = input(C, "Optional: Provide artist for track", "Track Artist") as text|null
+ var/artist = tgui_input_text(C, "Optional: Provide artist for track", "Track Artist")
if(isnull(artist)) // Cancel rather than empty string
return
- var/genre = input(C, "Optional: Provide genre for track (try to match an existing one)", "Track Genre") as text|null
+ var/genre = tgui_input_text(C, "Optional: Provide genre for track (try to match an existing one)", "Track Genre")
if(isnull(genre)) // Cancel rather than empty string
return
@@ -160,7 +160,7 @@ SUBSYSTEM_DEF(media_tracks)
if(!check_rights(R_DEBUG|R_FUN))
return
- var/track = input(C, "Input track title or URL to remove (must be exact)", "Remove Track") as text|null
+ var/track = tgui_input_text(C, "Input track title or URL to remove (must be exact)", "Remove Track")
if(!track)
return
diff --git a/code/controllers/subsystems/persist_vr.dm b/code/controllers/subsystems/persist_vr.dm
index c40a0b0e35..5217b72f9a 100644
--- a/code/controllers/subsystems/persist_vr.dm
+++ b/code/controllers/subsystems/persist_vr.dm
@@ -59,6 +59,8 @@ SUBSYSTEM_DEF(persist)
var/client/C = M.client
var/wait_in_hours = wait / (1 HOUR)
var/pto_factored = wait_in_hours * J.timeoff_factor
+ if(J.playtime_only)
+ pto_factored = 0
LAZYINITLIST(C.department_hours)
LAZYINITLIST(C.play_hours)
var/dept_hours = C.department_hours
diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm
index af096c33a8..c30d559e4b 100644
--- a/code/controllers/subsystems/supply.dm
+++ b/code/controllers/subsystems/supply.dm
@@ -363,15 +363,15 @@ SUBSYSTEM_DEF(supply)
// Will add an item entry to the specified export receipt on the user-side list
/datum/controller/subsystem/supply/proc/add_export_item(var/datum/exported_crate/E, var/mob/user)
- var/new_name = input(user, "Name", "Please enter the name of the item.") as null|text
+ var/new_name = tgui_input_text(user, "Name", "Please enter the name of the item.")
if(!new_name)
return
- var/new_quantity = input(user, "Name", "Please enter the quantity of the item.") as null|num
+ var/new_quantity = tgui_input_number(user, "Name", "Please enter the quantity of the item.")
if(!new_quantity)
return
- var/new_value = input(user, "Name", "Please enter the value of the item.") as null|num
+ var/new_value = tgui_input_number(user, "Name", "Please enter the value of the item.")
if(!new_value)
return
diff --git a/code/controllers/subsystems/throwing.dm b/code/controllers/subsystems/throwing.dm
index 6c3a799b28..101c71a147 100644
--- a/code/controllers/subsystems/throwing.dm
+++ b/code/controllers/subsystems/throwing.dm
@@ -145,6 +145,9 @@ SUBSYSTEM_DEF(throwing)
AM.Move(step, get_dir(AM, step))
+ if (!AM) // Us moving somehow destroyed us?
+ return
+
if (!AM.throwing) // we hit something during our move
finalize(hit = TRUE)
return
diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index d5c1094fd3..f5f2ff99b9 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -50,9 +50,9 @@ var/global/datum/controller/subsystem/ticker/ticker
pregame_timeleft = config.pregame_time
send2mainirc("Server lobby is loaded and open at byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]")
SSwebhooks.send(
- WEBHOOK_ROUNDPREP,
+ WEBHOOK_ROUNDPREP,
list(
- "map" = station_name(),
+ "map" = station_name(),
"url" = get_world_url()
)
)
@@ -404,14 +404,19 @@ var/global/datum/controller/subsystem/ticker/ticker
if(player && player.ready && player.mind?.assigned_role)
var/datum/job/J = SSjob.get_job(player.mind.assigned_role)
+ // Ask their new_player mob to spawn them
+ if(!player.spawn_checks_vr(player.mind.assigned_role))
+ var/datum/job/job_datum = job_master.GetJob(J.title)
+ job_datum.current_positions--
+ player.mind.assigned_role = null
+ continue //VOREStation Add
+
// Snowflakey AI treatment
if(J?.mob_type & JOB_SILICON_AI)
player.close_spawn_windows()
player.AIize(move = TRUE)
continue
- // Ask their new_player mob to spawn them
- if(!player.spawn_checks_vr(player.mind.assigned_role)) continue //VOREStation Add
var/mob/living/carbon/human/new_char = player.create_character()
// Created their playable character, delete their /mob/new_player
diff --git a/code/controllers/subsystems/vote.dm b/code/controllers/subsystems/vote.dm
index 252f1fa789..3d367cb79c 100644
--- a/code/controllers/subsystems/vote.dm
+++ b/code/controllers/subsystems/vote.dm
@@ -1,394 +1,399 @@
-SUBSYSTEM_DEF(vote)
- name = "Vote"
- wait = 10
- priority = FIRE_PRIORITY_VOTE
- runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
- flags = SS_KEEP_TIMING | SS_NO_INIT
- var/list/round_voters = list()
-
- //Current vote
- var/initiator
- var/started_time
- var/time_remaining
- var/duration
- var/mode
- var/question
- var/gamemode_vote_called = FALSE // Have we had a gamemode vote this round? Only auto-call if we haven't
- var/list/choices = list()
- var/list/gamemode_names = list()
- var/list/voted = list()
- var/list/current_votes = list()
- var/list/additional_text = list()
-
-/datum/controller/subsystem/vote/fire(resumed)
- if(mode)
- time_remaining = round((started_time + duration - world.time)/10)
- if(mode == VOTE_GAMEMODE && ticker.current_state >= GAME_STATE_SETTING_UP)
- to_chat(world, "Gamemode vote aborted: Game has already started.")
- reset()
- return
- if(time_remaining <= 0)
- result()
- reset()
-
-/datum/controller/subsystem/vote/proc/autotransfer()
- // Before doing the vote, see if anyone is playing.
- // If not, just do the transfer.
- var/players_are_in_round = FALSE
- for(var/mob/living/L as anything in player_list) // Mobs with clients attached.
- if(!istype(L)) // Exclude ghosts and other weird things.
- continue
- if(L.stat == DEAD) // Dead mobs aren't playing.
- continue
- // Everything else is, however.
- players_are_in_round = TRUE
- break
-
- if(!players_are_in_round)
- log_debug("The crew transfer shuttle would have been called at vote time due to no players being present.") //YW Edit
-// init_shift_change(null, 1) //YW Edit
- return
-
- initiate_vote(VOTE_CREW_TRANSFER, "the server", 1)
- log_debug("The server has called a crew transfer vote.")
-
-/datum/controller/subsystem/vote/proc/autogamemode()
- initiate_vote(VOTE_GAMEMODE, "the server", 1)
- log_debug("The server has called a gamemode vote.")
-
-/datum/controller/subsystem/vote/proc/reset()
- initiator = null
- started_time = null
- duration = null
- time_remaining = null
- mode = null
- question = null
- choices.Cut()
- voted.Cut()
- current_votes.Cut()
- additional_text.Cut()
-
-/datum/controller/subsystem/vote/proc/get_result() // Get the highest number of votes
- var/greatest_votes = 0
- var/total_votes = 0
-
- for(var/option in choices)
- var/votes = choices[option]
- total_votes += votes
- if(votes > greatest_votes)
- greatest_votes = votes
-
- if(!config.vote_no_default && choices.len) // Default-vote for everyone who didn't vote
- var/non_voters = (GLOB.clients.len - total_votes)
- if(non_voters > 0)
- if(mode == VOTE_RESTART)
- choices["Continue Playing"] += non_voters
- if(choices["Continue Playing"] >= greatest_votes)
- greatest_votes = choices["Continue Playing"]
- else if(mode == VOTE_GAMEMODE)
- if(master_mode in choices)
- choices[master_mode] += non_voters
- if(choices[master_mode] >= greatest_votes)
- greatest_votes = choices[master_mode]
- else if(mode == VOTE_CREW_TRANSFER)
- var/factor = 0.5
- switch(world.time / (10 * 60)) // minutes
- if(0 to 60)
- factor = 0.5
- if(61 to 120)
- factor = 0.8
- if(121 to 240)
- factor = 1
- if(241 to 300)
- factor = 1.2
- else
- factor = 1.4
- choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] * factor)
- to_world("Crew Transfer Factor: [factor]")
- greatest_votes = max(choices["Initiate Crew Transfer"], choices["Extend the Shift"]) //VOREStation Edit
-
- . = list() // Get all options with that many votes and return them in a list
- if(greatest_votes)
- for(var/option in choices)
- if(choices[option] == greatest_votes)
- . += option
-
-/datum/controller/subsystem/vote/proc/announce_result()
- var/list/winners = get_result()
- var/text
- if(winners.len > 0)
- if(winners.len > 1)
- if(mode != VOTE_GAMEMODE || ticker.hide_mode == 0) // Here we are making sure we don't announce potential game modes
- text = "Vote Tied Between:\n"
- for(var/option in winners)
- text += "\t[option]\n"
- . = pick(winners)
-
- for(var/key in current_votes)
- if(choices[current_votes[key]] == .)
- round_voters += key // Keep track of who voted for the winning round.
- if(mode != VOTE_GAMEMODE || . == "Extended" || ticker.hide_mode == 0) // Announce Extended gamemode, but not other gamemodes
- text += "Vote Result: [mode == VOTE_GAMEMODE ? gamemode_names[.] : .]"
- else
- text += "The vote has ended."
-
- else
- text += "Vote Result: Inconclusive - No Votes!"
- if(mode == VOTE_ADD_ANTAGONIST)
- antag_add_failed = 1
- log_vote(text)
- to_chat(world, "[text]")
-
-/datum/controller/subsystem/vote/proc/result()
- . = announce_result()
- var/restart = 0
- if(.)
- switch(mode)
- if(VOTE_RESTART)
- if(. == "Restart Round")
- restart = 1
- if(VOTE_GAMEMODE)
- if(master_mode != .)
- world.save_mode(.)
- if(ticker && ticker.mode)
- restart = 1
- else
- master_mode = .
- if(VOTE_CREW_TRANSFER)
- if(. == "Initiate Crew Transfer")
- init_shift_change(null, 1)
- if(VOTE_ADD_ANTAGONIST)
- if(isnull(.) || . == "None")
- antag_add_failed = 1
- else
- additional_antag_types |= antag_names_to_ids[.]
-
- if(mode == VOTE_GAMEMODE) //fire this even if the vote fails.
- if(!round_progressing)
- round_progressing = 1
- to_world("The round will start soon.")
-
- if(restart)
- to_world("World restarting due to vote...")
- feedback_set_details("end_error", "restart vote")
- if(blackbox)
- blackbox.save_all_data_to_sql()
- sleep(50)
- log_game("Rebooting due to restart vote")
- world.Reboot()
-
-/datum/controller/subsystem/vote/proc/submit_vote(ckey, newVote)
- if(mode)
- if(config.vote_no_dead && usr.stat == DEAD && !usr.client.holder)
- return
- if(current_votes[ckey])
- choices[choices[current_votes[ckey]]]--
- if(newVote && newVote >= 1 && newVote <= choices.len)
- choices[choices[newVote]]++
- current_votes[ckey] = newVote
- else
- current_votes[ckey] = null
-
-/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, automatic = FALSE, time = config.vote_period)
- if(!mode)
- if(started_time != null && !(check_rights(R_ADMIN|R_EVENT) || automatic))
- var/next_allowed_time = (started_time + config.vote_delay)
- if(next_allowed_time > world.time)
- return 0
-
- reset()
-
- switch(vote_type)
- if(VOTE_RESTART)
- choices.Add("Restart Round", "Continue Playing")
- if(VOTE_GAMEMODE)
- if(ticker.current_state >= GAME_STATE_SETTING_UP)
- return 0
- choices.Add(config.votable_modes)
- for(var/F in choices)
- var/datum/game_mode/M = gamemode_cache[F]
- if(!M)
- continue
- gamemode_names[M.config_tag] = capitalize(M.name) //It's ugly to put this here but it works
- additional_text.Add("Vote: '[question]'
" - else - . += "Vote: [capitalize(mode)]
" - . += "Time Left: [time_remaining] s" - . += "
| Choices | Votes | " - if(mode == VOTE_GAMEMODE) - .+= "Minimum Players | |
| [thisVote ? "" : ""][gamemode_names[choices[i]]][thisVote ? "" : ""] | [votes] | " - else - . += "[thisVote ? "" : ""][choices[i]][thisVote ? "" : ""] | [votes] | " - if (additional_text.len >= i) - . += additional_text[i] - . += "
| Unvote |
" - if(admin) - . += "(Cancel Vote) " - else - . += "
Start a vote:
- " - if(admin || config.allow_vote_restart) - . += "Restart" - else - . += "Restart (Disallowed)" - . += "
- " - - if(admin || config.allow_vote_restart) - . += "Crew Transfer" - else - . += "Crew Transfer (Disallowed)" - - if(admin) - . += "\t([config.allow_vote_restart ? "Allowed" : "Disallowed"])" - . += "
- " - - if(admin || config.allow_vote_mode) - . += "GameMode" - else - . += "GameMode (Disallowed)" - - if(admin) - . += "\t([config.allow_vote_mode ? "Allowed" : "Disallowed"])" - . += "
- " - - if(!antag_add_failed && config.allow_extra_antags) - . += "Add Antagonist Type" - else - . += "Add Antagonist (Disallowed)" - . += " " - - if(admin) - . += "
- Custom " - . += "
" - - . += "Close" - -/datum/controller/subsystem/vote/Topic(href, href_list[]) - if(!usr || !usr.client) - return - switch(href_list["vote"]) - if("close") - usr << browse(null, "window=vote") - return - - if("cancel") - if(usr.client.holder) - if("Yes" == tgui_alert(usr, "You are about to cancel this vote. Are you sure?", "Cancel Vote", list("No", "Yes"))) - reset() - if("toggle_restart") - if(usr.client.holder) - config.allow_vote_restart = !config.allow_vote_restart - if("toggle_gamemode") - if(usr.client.holder) - config.allow_vote_mode = !config.allow_vote_mode - - if(VOTE_RESTART) - if(config.allow_vote_restart || usr.client.holder) - initiate_vote(VOTE_RESTART, usr.key) - if(VOTE_GAMEMODE) - if(config.allow_vote_mode || usr.client.holder) - initiate_vote(VOTE_GAMEMODE, usr.key) - if(VOTE_CREW_TRANSFER) - if(config.allow_vote_restart || usr.client.holder) - initiate_vote(VOTE_CREW_TRANSFER, usr.key) - if(VOTE_ADD_ANTAGONIST) - if(config.allow_extra_antags || usr.client.holder) - initiate_vote(VOTE_ADD_ANTAGONIST, usr.key) - if(VOTE_CUSTOM) - if(usr.client.holder) - initiate_vote(VOTE_CUSTOM, usr.key) - - if("unvote") - submit_vote(usr.ckey, null) - - else - var/t = round(text2num(href_list["vote"])) - if(t) // It starts from 1, so there's no problem - submit_vote(usr.ckey, t) - usr.client.vote() - -/client/verb/vote() - set category = "OOC" - set name = "Vote" - - if(SSvote) - src << browse(SSvote.interface(src), "window=vote;size=500x[300 + SSvote.choices.len * 25]") +SUBSYSTEM_DEF(vote) + name = "Vote" + wait = 10 + priority = FIRE_PRIORITY_VOTE + runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT + flags = SS_KEEP_TIMING | SS_NO_INIT + var/list/round_voters = list() + + //Current vote + var/initiator + var/started_time + var/time_remaining + var/duration + var/mode + var/question + var/gamemode_vote_called = FALSE // Have we had a gamemode vote this round? Only auto-call if we haven't + var/list/choices = list() + var/list/gamemode_names = list() + var/list/voted = list() + var/list/current_votes = list() + var/list/additional_text = list() + +/datum/controller/subsystem/vote/fire(resumed) + if(mode) + time_remaining = round((started_time + duration - world.time)/10) + if(mode == VOTE_GAMEMODE && ticker.current_state >= GAME_STATE_SETTING_UP) + to_chat(world, "Gamemode vote aborted: Game has already started.") + reset() + return + if(time_remaining <= 0) + result() + reset() + +/datum/controller/subsystem/vote/proc/autotransfer() + // Before doing the vote, see if anyone is playing. + // If not, just do the transfer. + var/players_are_in_round = FALSE + for(var/mob/living/L as anything in player_list) // Mobs with clients attached. + if(!istype(L)) // Exclude ghosts and other weird things. + continue + if(L.stat == DEAD) // Dead mobs aren't playing. + continue + // Everything else is, however. + players_are_in_round = TRUE + break + + if(!players_are_in_round) + log_debug("The crew transfer shuttle would have been called at vote time due to no players being present.") //YW Edit +// init_shift_change(null, 1) //YW Edit + return + + initiate_vote(VOTE_CREW_TRANSFER, "the server", 1) + log_debug("The server has called a crew transfer vote.") + +/datum/controller/subsystem/vote/proc/autogamemode() + initiate_vote(VOTE_GAMEMODE, "the server", 1) + log_debug("The server has called a gamemode vote.") + +/datum/controller/subsystem/vote/proc/reset() + initiator = null + started_time = null + duration = null + time_remaining = null + mode = null + question = null + choices.Cut() + voted.Cut() + current_votes.Cut() + additional_text.Cut() + +/datum/controller/subsystem/vote/proc/get_result() // Get the highest number of votes + var/greatest_votes = 0 + var/total_votes = 0 + + for(var/option in choices) + var/votes = choices[option] + total_votes += votes + if(votes > greatest_votes) + greatest_votes = votes + + if(!config.vote_no_default && choices.len) // Default-vote for everyone who didn't vote + var/non_voters = (GLOB.clients.len - total_votes) + if(non_voters > 0) + if(mode == VOTE_RESTART) + choices["Continue Playing"] += non_voters + if(choices["Continue Playing"] >= greatest_votes) + greatest_votes = choices["Continue Playing"] + else if(mode == VOTE_GAMEMODE) + if(master_mode in choices) + choices[master_mode] += non_voters + if(choices[master_mode] >= greatest_votes) + greatest_votes = choices[master_mode] + else if(mode == VOTE_CREW_TRANSFER) + var/factor = 0.5 + switch(world.time / (10 * 60)) // minutes + if(0 to 60) + factor = 0.5 + if(61 to 120) + factor = 0.8 + if(121 to 240) + factor = 1 + if(241 to 300) + factor = 1.2 + else + factor = 1.4 + choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] * factor) + to_world("Crew Transfer Factor: [factor]") + greatest_votes = max(choices["Initiate Crew Transfer"], choices["Extend the Shift"]) //VOREStation Edit + + . = list() // Get all options with that many votes and return them in a list + if(greatest_votes) + for(var/option in choices) + if(choices[option] == greatest_votes) + . += option + +/datum/controller/subsystem/vote/proc/announce_result() + var/list/winners = get_result() + var/text + if(winners.len > 0) + if(winners.len > 1) + if(mode != VOTE_GAMEMODE || ticker.hide_mode == 0) // Here we are making sure we don't announce potential game modes + text = "Vote Tied Between:\n" + for(var/option in winners) + text += "\t[option]\n" + . = pick(winners) + + for(var/key in current_votes) + if(choices[current_votes[key]] == .) + round_voters += key // Keep track of who voted for the winning round. + if(mode != VOTE_GAMEMODE || . == "Extended" || ticker.hide_mode == 0) // Announce Extended gamemode, but not other gamemodes + text += "Vote Result: [mode == VOTE_GAMEMODE ? gamemode_names[.] : .]" + else + text += "The vote has ended." + + else + text += "Vote Result: Inconclusive - No Votes!" + if(mode == VOTE_ADD_ANTAGONIST) + antag_add_failed = 1 + log_vote(text) + to_chat(world, "[text]") + +/datum/controller/subsystem/vote/proc/result() + . = announce_result() + var/restart = 0 + if(.) + switch(mode) + if(VOTE_RESTART) + if(. == "Restart Round") + restart = 1 + if(VOTE_GAMEMODE) + if(master_mode != .) + world.save_mode(.) + if(ticker && ticker.mode) + restart = 1 + else + master_mode = . + if(VOTE_CREW_TRANSFER) + if(. == "Initiate Crew Transfer") + init_shift_change(null, 1) + if(VOTE_ADD_ANTAGONIST) + if(isnull(.) || . == "None") + antag_add_failed = 1 + else + additional_antag_types |= antag_names_to_ids[.] + + if(mode == VOTE_GAMEMODE) //fire this even if the vote fails. + if(!round_progressing) + round_progressing = 1 + to_world("The round will start soon.") + + if(restart) + to_world("World restarting due to vote...") + feedback_set_details("end_error", "restart vote") + if(blackbox) + blackbox.save_all_data_to_sql() + sleep(50) + log_game("Rebooting due to restart vote") + world.Reboot() + +/datum/controller/subsystem/vote/proc/submit_vote(ckey, newVote) + if(mode) + if(config.vote_no_dead && usr.stat == DEAD && !usr.client.holder) + return + if(current_votes[ckey]) + choices[choices[current_votes[ckey]]]-- + if(newVote && newVote >= 1 && newVote <= choices.len) + choices[choices[newVote]]++ + current_votes[ckey] = newVote + else + current_votes[ckey] = null + +/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, automatic = FALSE, time = config.vote_period) + if(!mode) + if(started_time != null && !(check_rights(R_ADMIN|R_EVENT) || automatic)) + var/next_allowed_time = (started_time + config.vote_delay) + if(next_allowed_time > world.time) + return 0 + + reset() + + switch(vote_type) + if(VOTE_RESTART) + choices.Add("Restart Round", "Continue Playing") + if(VOTE_GAMEMODE) + if(ticker.current_state >= GAME_STATE_SETTING_UP) + return 0 + choices.Add(config.votable_modes) + for(var/F in choices) + var/datum/game_mode/M = gamemode_cache[F] + if(!M) + continue + gamemode_names[M.config_tag] = capitalize(M.name) //It's ugly to put this here but it works + additional_text.Add("
Vote: '[question]'
" + else + . += "Vote: [capitalize(mode)]
" + . += "Time Left: [time_remaining] s" + . += "
| Choices | Votes | " + if(mode == VOTE_GAMEMODE) + .+= "Minimum Players | |
| [thisVote ? "" : ""][gamemode_names[choices[i]]][thisVote ? "" : ""] | [votes] | " + else + . += "[thisVote ? "" : ""][choices[i]][thisVote ? "" : ""] | [votes] | " + if (additional_text.len >= i) + . += additional_text[i] + . += "
| Unvote |
" + if(admin) + . += "(Cancel Vote) " + else + . += "
Start a vote:
- " + if(admin || config.allow_vote_restart) + . += "Restart" + else + . += "Restart (Disallowed)" + . += "
- " + + if(admin || config.allow_vote_restart) + . += "Crew Transfer" + else + . += "Crew Transfer (Disallowed)" + + if(admin) + . += "\t([config.allow_vote_restart ? "Allowed" : "Disallowed"])" + . += "
- " + + if(admin || config.allow_vote_mode) + . += "GameMode" + else + . += "GameMode (Disallowed)" + + if(admin) + . += "\t([config.allow_vote_mode ? "Allowed" : "Disallowed"])" + . += "
- " + + if(!antag_add_failed && config.allow_extra_antags) + . += "Add Antagonist Type" + else + . += "Add Antagonist (Disallowed)" + . += " " + + if(admin) + . += "
- Custom " + . += "
" + + . += "Close" + +/datum/controller/subsystem/vote/Topic(href, href_list[]) + if(!usr || !usr.client) + return + switch(href_list["vote"]) + if("close") + usr << browse(null, "window=vote") + return + + if("cancel") + if(usr.client.holder) + if("Yes" == tgui_alert(usr, "You are about to cancel this vote. Are you sure?", "Cancel Vote", list("No", "Yes"))) + reset() + if("toggle_restart") + if(usr.client.holder) + config.allow_vote_restart = !config.allow_vote_restart + if("toggle_gamemode") + if(usr.client.holder) + config.allow_vote_mode = !config.allow_vote_mode + + if(VOTE_RESTART) + if(config.allow_vote_restart || usr.client.holder) + var/admin_number_present = send2irc_adminless_only(usr.ckey, usr) + if(admin_number_present <= 0 || usr.client.holder) + if(tgui_alert(usr, "Are you sure you want to start a RESTART VOTE? You should only do this if the server is dying and no staff are around to investigate.", "RESTART VOTE", list("No", "Yes I want to start a RESTART VOTE")) == "Yes I want to start a RESTART VOTE") + initiate_vote(VOTE_RESTART, usr.key) + else + to_chat(usr, "You can't start a RESTART VOTE while there are staff around. If you are having an issue with the round, please ahelp it.") + if(VOTE_GAMEMODE) + if(config.allow_vote_mode || usr.client.holder) + initiate_vote(VOTE_GAMEMODE, usr.key) + if(VOTE_CREW_TRANSFER) + if(config.allow_vote_restart || usr.client.holder) + initiate_vote(VOTE_CREW_TRANSFER, usr.key) + if(VOTE_ADD_ANTAGONIST) + if(config.allow_extra_antags || usr.client.holder) + initiate_vote(VOTE_ADD_ANTAGONIST, usr.key) + if(VOTE_CUSTOM) + if(usr.client.holder) + initiate_vote(VOTE_CUSTOM, usr.key) + + if("unvote") + submit_vote(usr.ckey, null) + + else + var/t = round(text2num(href_list["vote"])) + if(t) // It starts from 1, so there's no problem + submit_vote(usr.ckey, t) + usr.client.vote() + +/client/verb/vote() + set category = "OOC" + set name = "Vote" + + if(SSvote) + src << browse(SSvote.interface(src), "window=vote;size=500x[300 + SSvote.choices.len * 25]") diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 75c3c64c7f..fef1bcd25d 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -68,7 +68,7 @@ names += componentsubtypes names += "---Elements---" names += sortTim(subtypesof(/datum/element), /proc/cmp_typepaths_asc) - var/result = input(usr, "Choose a component/element to add:", "Add Component/Element", names) + var/result = tgui_input_list(usr, "Choose a component/element to add:", "Add Component/Element", names) if(!usr || !result || result == "---Components---" || result == "---Elements---") return if(QDELETED(src)) diff --git a/code/datums/managed_browsers/feedback_form.dm b/code/datums/managed_browsers/feedback_form.dm index b380018bea..c6160ffc59 100644 --- a/code/datums/managed_browsers/feedback_form.dm +++ b/code/datums/managed_browsers/feedback_form.dm @@ -99,7 +99,7 @@ GENERAL_PROTECT_DATUM(/datum/managed_browser/feedback_form) if(href_list["feedback_edit_body"]) // This is deliberately not sanitized here, and is instead checked when hitting the submission button, // as we want to give the user a chance to fix it without needing to rewrite the whole thing. - feedback_body = input(my_client, "Please write your feedback here.", "Feedback Body", feedback_body) as null|message + feedback_body = tgui_input_text(my_client, "Please write your feedback here.", "Feedback Body", feedback_body, multiline = TRUE, prevent_enter = TRUE) display() // Refresh the window with new information. return diff --git a/code/datums/managed_browsers/feedback_viewer.dm b/code/datums/managed_browsers/feedback_viewer.dm index 895bd36fae..0236036338 100644 --- a/code/datums/managed_browsers/feedback_viewer.dm +++ b/code/datums/managed_browsers/feedback_viewer.dm @@ -132,29 +132,29 @@ return if(href_list["filter_id"]) - var/id_to_search = input(my_client, "Write feedback ID here.", "Filter by ID", null) as null|num + var/id_to_search = tgui_input_number(my_client, "Write feedback ID here.", "Filter by ID", null) if(id_to_search) last_query = feedback_filter(SQLITE_FEEDBACK_COLUMN_ID, id_to_search, TRUE) if(href_list["filter_author"]) - var/author_to_search = input(my_client, "Write desired key or hash here. Partial keys/hashes are allowed.", "Filter by Author", null) as null|text + var/author_to_search = tgui_input_text(my_client, "Write desired key or hash here. Partial keys/hashes are allowed.", "Filter by Author", null) if(author_to_search) last_query = feedback_filter(SQLITE_FEEDBACK_COLUMN_AUTHOR, author_to_search) if(href_list["filter_topic"]) - var/topic_to_search = input(my_client, "Write desired topic here. Partial topics are allowed. \ - \nThe current topics in the config are [english_list(config.sqlite_feedback_topics)].", "Filter by Topic", null) as null|text + var/topic_to_search = tgui_input_text(my_client, "Write desired topic here. Partial topics are allowed. \ + \nThe current topics in the config are [english_list(config.sqlite_feedback_topics)].", "Filter by Topic", null) if(topic_to_search) last_query = feedback_filter(SQLITE_FEEDBACK_COLUMN_TOPIC, topic_to_search) if(href_list["filter_content"]) - var/content_to_search = input(my_client, "Write desired content to find here. Partial matches are allowed.", "Filter by Content", null) as null|message + var/content_to_search = tgui_input_text(my_client, "Write desired content to find here. Partial matches are allowed.", "Filter by Content", null, multiline = TRUE) if(content_to_search) last_query = feedback_filter(SQLITE_FEEDBACK_COLUMN_CONTENT, content_to_search) if(href_list["filter_datetime"]) - var/datetime_to_search = input(my_client, "Write desired datetime. Partial matches are allowed.\n\ - Format is 'YYYY-MM-DD HH:MM:SS'.", "Filter by Datetime", null) as null|text + var/datetime_to_search = tgui_input_text(my_client, "Write desired datetime. Partial matches are allowed.\n\ + Format is 'YYYY-MM-DD HH:MM:SS'.", "Filter by Datetime", null) if(datetime_to_search) last_query = feedback_filter(SQLITE_FEEDBACK_COLUMN_DATETIME, datetime_to_search) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 736fdff021..e4ec5954e2 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -190,7 +190,7 @@ assigned_role = new_role else if (href_list["memory_edit"]) - var/new_memo = sanitize(input("Write new memory", "Memory", memory) as null|message) + var/new_memo = sanitize(tgui_input_text(usr, "Write new memory", "Memory", memory, multiline = TRUE, prevent_enter = TRUE)) if (isnull(new_memo)) return memory = new_memo @@ -198,7 +198,7 @@ var/datum/mind/mind = locate(href_list["amb_edit"]) if(!mind) return - var/new_ambition = input("Enter a new ambition", "Memory", mind.ambitions) as null|message + var/new_ambition = tgui_input_text(usr, "Enter a new ambition", "Memory", mind.ambitions, multiline = TRUE, prevent_enter = TRUE) if(isnull(new_ambition)) return if(mind) @@ -296,7 +296,7 @@ if(objective&&objective.type==text2path("/datum/objective/[new_obj_type]")) def_num = objective.target_amount - var/target_number = input("Input target number:", "Objective", def_num) as num|null + var/target_number = tgui_input_number(usr, "Input target number:", "Objective", def_num) if (isnull(target_number))//Ordinarily, you wouldn't need isnull. In this case, the value may already exist. return @@ -314,7 +314,7 @@ new_objective.target_amount = target_number if ("custom") - var/expl = sanitize(input("Custom objective:", "Objective", objective ? objective.explanation_text : "") as text|null) + var/expl = sanitize(tgui_input_text(usr, "Custom objective:", "Objective", objective ? objective.explanation_text : "")) if (!expl) return new_objective = new /datum/objective new_objective.owner = src @@ -410,7 +410,7 @@ // var/obj/item/device/uplink/hidden/suplink = find_syndicate_uplink() No longer needed, uses stored in mind var/crystals crystals = tcrystals - crystals = input("Amount of telecrystals for [key]", crystals) as null|num + crystals = tgui_input_number(usr, "Amount of telecrystals for [key]", crystals) if (!isnull(crystals)) tcrystals = crystals diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm index 1d299a81db..554666cbca 100644 --- a/code/datums/outfits/jobs/civilian.dm +++ b/code/datums/outfits/jobs/civilian.dm @@ -31,8 +31,9 @@ /decl/hierarchy/outfit/job/service/bartender/post_equip(mob/living/carbon/human/H) ..() - for(var/obj/item/clothing/accessory/permit/gun/bar/permit in H.back.contents) - permit.set_name(H.real_name) + if(H.back) + for(var/obj/item/clothing/accessory/permit/gun/bar/permit in H.back.contents) + permit.set_name(H.real_name) /decl/hierarchy/outfit/job/service/bartender/barista name = OUTFIT_JOB_NAME("Barista") diff --git a/code/datums/supplypacks/materials.dm b/code/datums/supplypacks/materials.dm index 5e181d8af8..3268d05a46 100644 --- a/code/datums/supplypacks/materials.dm +++ b/code/datums/supplypacks/materials.dm @@ -66,17 +66,19 @@ /obj/fiftyspawner/tealcarpet ) -/datum/supply_pack/materials/arcade_carpet - name = "Retro carpets" +/datum/supply_pack/materials/retrocarpet + name = "Retro carpet" containertype = /obj/structure/closet/crate/grayson - containername = "Retro carpets crate" + containername = "Retro carpet crate" cost = 15 contains = list( - /obj/fiftyspawner/decocarpet, - /obj/fiftyspawner/retrocarpet + /obj/fiftyspawner/geocarpet, + /obj/fiftyspawner/retrocarpet, + /obj/fiftyspawner/retrocarpet_red, + /obj/fiftyspawner/happycarpet ) -/datum/supply_pack/misc/linoleum +/datum/supply_pack/materials/linoleum name = "Linoleum" containertype = /obj/structure/closet/crate/grayson containername = "Linoleum crate" diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm index 6db5602175..66c8a2d4b4 100644 --- a/code/datums/supplypacks/misc_vr.dm +++ b/code/datums/supplypacks/misc_vr.dm @@ -102,6 +102,18 @@ containername = "solgov medical hardsuit crate" //YW EDIT access = access_engine +/* YW EDIT: comments out breacher rig +/datum/supply_pack/misc/breacher_rig + name = "unathi breacher hardsuit (empty)" + contains = list( + /obj/item/weapon/rig/breacher = 1 + ) + cost = 250 + containertype = /obj/structure/closet/crate/secure/gear + containername = "unathi breacher hardsuit crate" + access = access_armory +*/ + /datum/supply_pack/misc/zero_rig name = "null hardsuit (jets)" contains = list( diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index eff6fb84fd..70f8386a91 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -9,18 +9,30 @@ /datum/supply_pack/supply/food name = "Kitchen supply crate" contains = list( - /obj/item/weapon/reagent_containers/food/condiment/flour = 6, + /obj/item/weapon/reagent_containers/food/condiment/carton/flour = 6, /obj/item/weapon/reagent_containers/food/drinks/milk = 3, /obj/item/weapon/reagent_containers/food/drinks/soymilk = 2, /obj/item/weapon/storage/fancy/egg_box = 2, /obj/item/weapon/reagent_containers/food/snacks/tofu = 4, /obj/item/weapon/reagent_containers/food/snacks/meat = 4, - /obj/item/weapon/reagent_containers/food/condiment/yeast = 3 + /obj/item/weapon/reagent_containers/food/condiment/yeast = 3, + /obj/item/weapon/reagent_containers/food/condiment/sprinkles = 1 ) cost = 10 containertype = /obj/structure/closet/crate/freezer/centauri containername = "Food crate" +/datum/supply_pack/supply/fancyfood + name = "Artisanal food delivery" + contains = list( + /obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic = 6, + /obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic = 6 + ) + cost = 25 + containertype = /obj/structure/closet/crate/freezer/centauri + containername = "Artisanal food crate" + + /datum/supply_pack/supply/toner name = "Toner cartridges" contains = list(/obj/item/device/toner = 6) diff --git a/code/datums/uplink/announcements.dm b/code/datums/uplink/announcements.dm index f1db67a647..f6742fb815 100644 --- a/code/datums/uplink/announcements.dm +++ b/code/datums/uplink/announcements.dm @@ -16,10 +16,10 @@ item_cost = 20 /datum/uplink_item/abstract/announcements/fake_centcom/extra_args(var/mob/user) - var/title = sanitize(input(usr, "Enter your announcement title.", "Announcement Title") as null|text) + var/title = sanitize(tgui_input_text(usr, "Enter your announcement title.", "Announcement Title")) if(!title) return - var/message = sanitize(input(usr, "Enter your announcement message.", "Announcement Title") as null|text) + var/message = sanitize(tgui_input_text(usr, "Enter your announcement message.", "Announcement Title")) if(!message) return return list("title" = title, "message" = message) diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index 568eb0f743..858875a982 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -40,7 +40,7 @@ if(!msg_sanitized) message = sanitize(message, extra = 0) - message_title = sanitizeSafe(message_title) + message_title = sanitizeSafe(message_title) var/list/zlevels if(zlevel) diff --git a/code/game/antagonist/antagonist_create.dm b/code/game/antagonist/antagonist_create.dm index 84c5b2317e..3dd683377f 100644 --- a/code/game/antagonist/antagonist_create.dm +++ b/code/game/antagonist/antagonist_create.dm @@ -118,7 +118,7 @@ /datum/antagonist/proc/set_antag_name(var/mob/living/player) // Choose a name, if any. - var/newname = sanitize(input(player, "You are a [role_text]. Would you like to change your name to something else?", "Name change") as null|text, MAX_NAME_LEN) + var/newname = sanitize(tgui_input_text(player, "You are a [role_text]. Would you like to change your name to something else?", "Name change", null, MAX_NAME_LEN), MAX_NAME_LEN) if (newname) player.real_name = newname player.name = player.real_name diff --git a/code/game/antagonist/antagonist_objectives.dm b/code/game/antagonist/antagonist_objectives.dm index c2c56c7be1..223db7dda8 100644 --- a/code/game/antagonist/antagonist_objectives.dm +++ b/code/game/antagonist/antagonist_objectives.dm @@ -41,9 +41,9 @@ to_chat(src, "While you may perhaps have goals, this verb's meant to only be visible \ to antagonists. Please make a bug report!") return - var/new_ambitions = input(src, "Write a short sentence of what your character hopes to accomplish \ + var/new_ambitions = tgui_input_text(src, "Write a short sentence of what your character hopes to accomplish \ today as an antagonist. Remember that this is purely optional. It will be shown at the end of the \ - round for everybody else.", "Ambitions", mind.ambitions) as null|message + round for everybody else.", "Ambitions", mind.ambitions, multiline = TRUE) if(isnull(new_ambitions)) return new_ambitions = sanitize(new_ambitions) diff --git a/code/game/antagonist/station/rogue_ai.dm b/code/game/antagonist/station/rogue_ai.dm index e1b73b064b..fd3ee867f9 100644 --- a/code/game/antagonist/station/rogue_ai.dm +++ b/code/game/antagonist/station/rogue_ai.dm @@ -97,7 +97,7 @@ var/datum/antagonist/rogue_ai/malf testing("rogue_ai set_antag_name called on non-silicon mob [player]!") return // Choose a name, if any. - var/newname = sanitize(input(player, "You are a [role_text]. Would you like to change your name to something else?", "Name change") as null|text, MAX_NAME_LEN) + var/newname = sanitize(tgui_input_text(player, "You are a [role_text]. Would you like to change your name to something else?", "Name change", null, MAX_NAME_LEN), MAX_NAME_LEN) if (newname) player.SetName(newname) if(player.mind) player.mind.name = player.name diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 3df1820fa9..b0703f63a4 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -27,7 +27,7 @@ // Overlays ///Our local copy of (non-priority) overlays without byond magic. Use procs in SSoverlays to manipulate - var/list/our_overlays + var/list/our_overlays ///Overlays that should remain on top and not normally removed when using cut_overlay functions, like c4. var/list/priority_overlays ///vis overlays managed by SSvis_overlays to automaticaly turn them like other overlays @@ -35,7 +35,7 @@ ///Our local copy of filter data so we can add/remove it var/list/filter_data - + //Detective Work, used for the duplicate data points kept in the scanners var/list/original_atom // Track if we are already had initialize() called to prevent double-initialization. @@ -681,7 +681,7 @@ if(!isnull(.)) datum_flags |= DF_VAR_EDITED return - + . = ..() /atom/proc/atom_say(message) @@ -716,7 +716,7 @@ . = ..() SEND_SIGNAL(src, COMSIG_ATOM_EXITED, AM, new_loc) -/atom/proc/get_visible_gender() +/atom/proc/get_visible_gender(mob/user, force) return gender /atom/proc/interact(mob/user) diff --git a/code/game/base_turf.dm b/code/game/base_turf.dm index 3f78c6fba4..238015d6ed 100644 --- a/code/game/base_turf.dm +++ b/code/game/base_turf.dm @@ -19,7 +19,7 @@ if(!holder) return - var/choice = input(usr, "Which Z-level do you wish to set the base turf for?") as num|null + var/choice = tgui_input_number(usr, "Which Z-level do you wish to set the base turf for?") if(!choice) return diff --git a/code/game/gamemodes/changeling/powers/mimic_voice.dm b/code/game/gamemodes/changeling/powers/mimic_voice.dm index 6b84c577ff..be4a055dc1 100644 --- a/code/game/gamemodes/changeling/powers/mimic_voice.dm +++ b/code/game/gamemodes/changeling/powers/mimic_voice.dm @@ -22,7 +22,7 @@ to_chat(src, "We return our vocal glands to their original location.") return - var/mimic_voice = sanitize(input(usr, "Enter a name to mimic.", "Mimic Voice", null), MAX_NAME_LEN) + var/mimic_voice = sanitize(tgui_input_text(usr, "Enter a name to mimic.", "Mimic Voice", null, MAX_NAME_LEN), MAX_NAME_LEN) if(!mimic_voice) return diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index fac7066de4..3ad86499bd 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -611,7 +611,7 @@ var/list/sacrificed = list() // returns 0 if the rune is not used. returns 1 if the rune is used. /obj/effect/rune/proc/communicate() . = 1 // Default output is 1. If the rune is deleted it will return 1 - var/input = input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "")//sanitize() below, say() and whisper() have their own + var/input = tgui_input_text(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "")//sanitize() below, say() and whisper() have their own if(!input) if (istype(src)) fizzle() diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index cee83656cb..9b31ad9a50 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -214,8 +214,8 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t Holiday = list() - var/H = input(src,"What holiday is it today?","Set Holiday") as text - var/B = input(src,"Now explain what the holiday is about","Set Holiday") as message + var/H = tgui_input_text(src,"What holiday is it today?","Set Holiday") + var/B = tgui_input_text(src,"Now explain what the holiday is about","Set Holiday", multiline = TRUE, prevent_enter = TRUE) Holiday[H] = B diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 88efd6154e..7af06d8d33 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -59,23 +59,23 @@ var/global/list/additional_antag_types = list() var/choice = "" switch(href_list["set"]) if("shuttle_delay") - choice = input(usr, "Enter a new shuttle delay multiplier") as num + choice = tgui_input_number(usr, "Enter a new shuttle delay multiplier", null, null, 20, 1) if(!choice || choice < 1 || choice > 20) return shuttle_delay = choice if("antag_scaling") - choice = input(usr, "Enter a new antagonist cap scaling coefficient.") as num + choice = tgui_input_number(usr, "Enter a new antagonist cap scaling coefficient.", null, null, 100, 0) if(isnull(choice) || choice < 0 || choice > 100) return antag_scaling_coeff = choice if("event_modifier_moderate") - choice = input(usr, "Enter a new moderate event time modifier.") as num + choice = tgui_input_number(usr, "Enter a new moderate event time modifier.", null, null, 100, 0) if(isnull(choice) || choice < 0 || choice > 100) return event_delay_mod_moderate = choice refresh_event_modifiers() if("event_modifier_severe") - choice = input(usr, "Enter a new moderate event time modifier.") as num + choice = tgui_input_number(usr, "Enter a new moderate event time modifier.", null, null, 100, 0) if(isnull(choice) || choice < 0 || choice > 100) return event_delay_mod_major = choice diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm index d8229e1562..2ee412194e 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm @@ -93,8 +93,8 @@ if(!ability_prechecks(user, price)) return - var/title = input(usr, "Select message title: ") - var/text = input(usr, "Select message text: ") + var/title = tgui_input_text(usr, "Select message title: ") + var/text = tgui_input_text(usr, "Select message text: ") if(!title || !text || !ability_pay(user, price)) to_chat(user, "Hack Aborted") return diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index aec6442f8d..7c51611bf2 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -124,10 +124,10 @@ if("Location") mode = 1 - var/locationx = input(usr, "Please input the x coordinate to search for.", "Location?" , "") as num + var/locationx = tgui_input_number(usr, "Please input the x coordinate to search for.", "Location?" , "") if(!locationx || !(usr in view(1,src))) return - var/locationy = input(usr, "Please input the y coordinate to search for.", "Location?" , "") as num + var/locationy = tgui_input_number(usr, "Please input the y coordinate to search for.", "Location?" , "") if(!locationy || !(usr in view(1,src))) return @@ -160,7 +160,7 @@ to_chat(usr, "You set the pinpointer to locate [targetitem]") if("DNA") - var/DNAstring = input(usr, "Input DNA string to search for." , "Please Enter String." , "") + var/DNAstring = tgui_input_text(usr, "Input DNA string to search for." , "Please Enter String." , "") if(!DNAstring) return for(var/mob/living/carbon/M in mob_list) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index cb2a3fcb4b..9b6b532f96 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -481,7 +481,7 @@ var/global/list/all_objectives = list() var/tmp_obj = new custom_target var/custom_name = tmp_obj:name qdel(tmp_obj) - custom_name = sanitize(input(usr, "Enter target name:", "Objective target", custom_name) as text|null) + custom_name = sanitize(tgui_input_text(usr, "Enter target name:", "Objective target", custom_name)) if (!custom_name) return target_name = custom_name steal_target = custom_target diff --git a/code/game/gamemodes/technomancer/spells/illusion.dm b/code/game/gamemodes/technomancer/spells/illusion.dm index dcadf53ffb..ab83319bc5 100644 --- a/code/game/gamemodes/technomancer/spells/illusion.dm +++ b/code/game/gamemodes/technomancer/spells/illusion.dm @@ -49,12 +49,12 @@ if("Cancel") return if("Speak") - var/what_to_say = input(user, "What do you want \the [illusion] to say?","Illusion Speak") as null|text + var/what_to_say = tgui_input_text(user, "What do you want \the [illusion] to say?","Illusion Speak") //what_to_say = sanitize(what_to_say) //Sanitize occurs inside say() already. if(what_to_say) illusion.say(what_to_say) if("Emote") - var/what_to_emote = input(user, "What do you want \the [illusion] to do?","Illusion Emote") as null|text + var/what_to_emote = tgui_input_text(user, "What do you want \the [illusion] to do?","Illusion Emote") if(what_to_emote) illusion.emote(what_to_emote) diff --git a/code/game/jobs/job/job_vr.dm b/code/game/jobs/job/job_vr.dm index a416a3af48..0f2599b8aa 100644 --- a/code/game/jobs/job/job_vr.dm +++ b/code/game/jobs/job/job_vr.dm @@ -17,6 +17,9 @@ //Time required in the department as other jobs before playing this one (in hours) var/dept_time_required = 0 + //Do we forbid ourselves from earning PTO? + var/playtime_only = FALSE + // Check client-specific availability rules. /datum/job/proc/player_has_enough_pto(client/C) return timeoff_factor >= 0 || (C && LAZYACCESS(C.department_hours, pto_type) > 0) @@ -39,7 +42,7 @@ if(C && config.use_playtime_restriction_for_jobs && dept_time_required) var/remaining_time_needed = dept_time_required for(var/key in C.play_hours) - if(isnum(C.play_hours[key])) + if(isnum(C.play_hours[key]) && !(key == PTO_TALON)) remaining_time_needed = max(0, remaining_time_needed - C.play_hours[key]) return remaining_time_needed return 0 diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index 6d5ee57c4e..0124acc391 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -71,10 +71,13 @@ /datum/job/paramedic pto_type = PTO_MEDICAL - alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder) + alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder) // YW Edit: removes search and rescue /datum/alt_title/medical_responder title = "Medical Responder" title_blurb = "A Medical Responder is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \ own. They are capable of keeping a patient stabilized until they reach the hands of someone with more training." - title_outfit = /decl/hierarchy/outfit/job/medical/paramedic/emt \ No newline at end of file + title_outfit = /decl/hierarchy/outfit/job/medical/paramedic/emt + +/datum/alt_title/sar + title = "Search and Rescue" \ No newline at end of file diff --git a/code/game/jobs/job/security_vr.dm b/code/game/jobs/job/security_vr.dm index 082531d944..94f1468b6a 100644 --- a/code/game/jobs/job/security_vr.dm +++ b/code/game/jobs/job/security_vr.dm @@ -45,7 +45,7 @@ spawn_positions = 5 pto_type = PTO_SECURITY alt_titles = list("Patrol Officer" = /datum/alt_title/patrol_officer, "Security Guard" = /datum/alt_title/security_guard, - "Security Deputy" = /datum/alt_title/security_guard, "Junior Officer" = /datum/alt_title/junior_officer) + "Security Deputy" = /datum/alt_title/security_guard, "Junior Officer" = /datum/alt_title/junior_officer, "Security Contractor" = /datum/alt_title/security_contractor) /datum/alt_title/patrol_officer title = "Patrol Officer" @@ -54,4 +54,7 @@ title = "Security Guard" /datum/alt_title/security_deputy - title = "Security Deputy" \ No newline at end of file + title = "Security Deputy" + +/datum/alt_title/security_contractor + title = "Security Contractor" \ No newline at end of file diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index dd653d746a..ca40f0dc53 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -675,7 +675,7 @@ var/list/selected = TLV["temperature"] var/max_temperature = min(selected[3] - T0C, MAX_TEMPERATURE) var/min_temperature = max(selected[2] - T0C, MIN_TEMPERATURE) - var/input_temperature = input(usr, "What temperature would you like the system to mantain? (Capped between [min_temperature] and [max_temperature]C)", "Thermostat Controls", target_temperature - T0C) as num|null + var/input_temperature = tgui_input_number(usr, "What temperature would you like the system to mantain? (Capped between [min_temperature] and [max_temperature]C)", "Thermostat Controls", target_temperature - T0C, max_temperature, min_temperature) if(isnum(input_temperature)) if(input_temperature > max_temperature || input_temperature < min_temperature) to_chat(usr, "Temperature must be between [min_temperature]C and [max_temperature]C") @@ -729,7 +729,7 @@ var/env = params["env"] var/name = params["var"] - var/value = input(usr, "New [name] for [env]:", name, TLV[env][name]) as num|null + var/value = tgui_input_number(usr, "New [name] for [env]:", name, TLV[env][name]) if(!isnull(value) && !..()) if(value < 0) TLV[env][name] = -1 diff --git a/code/game/machinery/airconditioner_vr.dm b/code/game/machinery/airconditioner_vr.dm index f9a1437041..364d4bf377 100644 --- a/code/game/machinery/airconditioner_vr.dm +++ b/code/game/machinery/airconditioner_vr.dm @@ -47,7 +47,7 @@ turn_off() return if(istype(I, /obj/item/device/multitool)) - var/new_temp = input(usr, "Input a new target temperature, in degrees C.","Target Temperature", 20) as num + var/new_temp = tgui_input_number(usr, "Input a new target temperature, in degrees C.","Target Temperature", 20) if(!Adjacent(user) || user.incapacitated()) return new_temp = convert_c2k(new_temp) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 783ee16225..cb11dce0b5 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -332,7 +332,7 @@ update_flag pressure = 10*ONE_ATMOSPHERE . = TRUE else if(pressure == "input") - pressure = input(usr, "New release pressure ([ONE_ATMOSPHERE/10]-[10*ONE_ATMOSPHERE] kPa):", name, release_pressure) as num|null + pressure = tgui_input_number(usr, "New release pressure ([ONE_ATMOSPHERE/10]-[10*ONE_ATMOSPHERE] kPa):", name, release_pressure, 10*ONE_ATMOSPHERE, ONE_ATMOSPHERE/10) if(!isnull(pressure) && !..()) . = TRUE else if(text2num(pressure) != null) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 0ecc4e8488..aebf87273d 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -1,371 +1,371 @@ -/obj/machinery/autolathe - name = "autolathe" - desc = "It produces items using metal and glass." - icon_state = "autolathe" - density = TRUE - anchored = TRUE - use_power = USE_POWER_IDLE - idle_power_usage = 10 - active_power_usage = 2000 - clicksound = "keyboard" - clickvol = 30 - - circuit = /obj/item/weapon/circuitboard/autolathe - - var/static/datum/category_collection/autolathe/autolathe_recipes - - var/hacked = 0 - var/disabled = 0 - var/shocked = 0 - var/busy = 0 - - var/input_dir = NORTH //YWedit - var/input_dir_name = "North"//YWEdit - - var/mat_efficiency = 1 - var/build_time = 50 - - var/datum/wires/autolathe/wires = null - - var/mb_rating = 0 - var/man_rating = 0 - - var/filtertext - -/obj/machinery/autolathe/Initialize() - AddComponent(/datum/component/material_container, subtypesof(/datum/material), 0, MATCONTAINER_EXAMINE, _after_insert = CALLBACK(src, .proc/AfterMaterialInsert)) - . = ..() - if(!autolathe_recipes) - autolathe_recipes = new() - wires = new(src) - - default_apply_parts() - RefreshParts() - -/obj/machinery/autolathe/Destroy() - qdel(wires) - wires = null - return ..() - -/obj/machinery/autolathe/tgui_interact(mob/user, datum/tgui/ui) - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "Autolathe", name) - ui.open() - -/obj/machinery/autolathe/tgui_status(mob/user) - if(disabled) - return STATUS_CLOSE - return ..() - -/obj/machinery/autolathe/tgui_static_data(mob/user) - var/list/data = ..() - - var/list/categories = list() - var/list/recipes = list() - for(var/datum/category_group/autolathe/A in autolathe_recipes.categories) - categories += A.name - for(var/datum/category_item/autolathe/M in A.items) - if(M.hidden && !hacked) - continue - if(M.man_rating > man_rating) - continue - recipes.Add(list(list( - "category" = A.name, - "name" = M.name, - "ref" = REF(M), - "requirements" = M.resources, - "hidden" = M.hidden, - "coeff_applies" = !M.no_scale, - "is_stack" = M.is_stack, - ))) - data["recipes"] = recipes - data["categories"] = categories - - return data - -/obj/machinery/autolathe/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/spritesheet/sheetmaterials) - ) - -/obj/machinery/autolathe/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) - var/list/data = ..() - data["busy"] = busy - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - data["materials"] = materials.tgui_data() - data["mat_efficiency"] = mat_efficiency - return data - -/obj/machinery/autolathe/interact(mob/user) - if(panel_open) - return wires.Interact(user) - - if(disabled) - to_chat(user, "\The [src] is disabled!") - return - - if(shocked) - shock(user, 50) - - tgui_interact(user) - -/obj/machinery/autolathe/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(busy) - to_chat(user, "\The [src] is busy. Please wait for completion of previous operation.") - return - - if(default_deconstruction_screwdriver(user, O)) - interact(user) - return - if(default_deconstruction_crowbar(user, O)) - return - if(default_part_replacement(user, O)) - return - - if(stat) - return - - if(panel_open) - //Don't eat multitools or wirecutters used on an open lathe. - if(O.is_multitool() || O.is_wirecutter()) - wires.Interact(user) - return - - if(is_robot_module(O)) - return 0 - - if(istype(O,/obj/item/ammo_magazine/clip) || istype(O,/obj/item/ammo_magazine/s357) || istype(O,/obj/item/ammo_magazine/s38) || istype (O,/obj/item/ammo_magazine/s44)/* VOREstation Edit*/) // Prevents ammo recycling exploit with speedloaders. - to_chat(user, "\The [O] is too hazardous to recycle with the autolathe!") - return - - return ..() - -/obj/machinery/autolathe/attack_hand(mob/user as mob) - user.set_machine(src) - interact(user) - -/obj/machinery/autolathe/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) - if(..()) - return TRUE - - usr.set_machine(src) - add_fingerprint(usr) - - if(busy) - to_chat(usr, "The autolathe is busy. Please wait for completion of previous operation.") - return - switch(action) - if("make") - var/datum/category_item/autolathe/making = locate(params["make"]) - if(!istype(making)) - return - if(making.hidden && !hacked) - return - - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - - var/list/materials_used = list() - - var/multiplier = (params["multiplier"] || 1) - - if(making.is_stack) - var/max_sheets - for(var/material in making.resources) - var/coeff = (making.no_scale ? 1 : mat_efficiency) //stacks are unaffected by production coefficient - var/sheets = round(materials.get_material_amount(material) / round(making.resources[material] * coeff)) - if(isnull(max_sheets) || max_sheets > sheets) - max_sheets = sheets - if(!isnull(materials.get_material_amount(material)) && materials.get_material_amount(material) < round(making.resources[material] * coeff)) - max_sheets = 0 - //Build list of multipliers for sheets. - multiplier = input(usr, "How many do you want to print? (0-[max_sheets])") as num|null - if(!multiplier || multiplier <= 0 || multiplier > max_sheets || tgui_status(usr, state) != STATUS_INTERACTIVE) - return FALSE - - //Check if we still have the materials. - var/coeff = (making.no_scale ? 1 : mat_efficiency) //stacks are unaffected by production coefficient - - for(var/datum/material/used_material as anything in making.resources) - var/amount_needed = making.resources[used_material] * coeff * multiplier - materials_used[used_material] = amount_needed - - if(LAZYLEN(materials_used)) - if(!materials.has_materials(materials_used)) - return - - materials.use_materials(materials_used) - - busy = making.name - update_use_power(USE_POWER_ACTIVE) - - update_icon() // So lid closes - - sleep(build_time) - - busy = 0 - update_use_power(USE_POWER_IDLE) - update_icon() // So lid opens - - //Sanity check. - if(!making || !src) - return - - //Create the desired item. - var/obj/item/I = new making.path(src.loc) - - if(LAZYLEN(I.matter)) // Sadly we must obey the laws of equivalent exchange. - I.matter.Cut() - else - I.matter = list() - - for(var/material in making.resources) // Handle the datum's autoscaling for waste, so we're properly wasting material, but not so much if we have efficiency. - I.matter[material] = round(making.resources[material] / (making.no_scale ? 1 : 1.25)) * (making.no_scale ? 1 : mat_efficiency) - - flick("[initial(icon_state)]_finish", src) - if(multiplier > 1) - if(istype(I, /obj/item/stack)) - var/obj/item/stack/S = I - S.set_amount(multiplier) - else - for(multiplier; multiplier > 1; --multiplier) // Create multiple items if it's not a stack. - I = new making.path(src.loc) - // We've already deducted the cost of multiple items. Process the matter the same. - if(LAZYLEN(I.matter)) - I.matter.Cut() - - else - I.matter = list() - - for(var/material in making.resources) - I.matter[material] = round(making.resources[material] / (making.no_scale ? 1 : 1.25)) * (making.no_scale ? 1 : mat_efficiency) - return TRUE - return FALSE - -/obj/machinery/autolathe/update_icon() - cut_overlays() - - icon_state = initial(icon_state) - - if(panel_open) - add_overlay("[icon_state]_panel") - if(stat & NOPOWER) - return - if(busy) - icon_state = "[icon_state]_work" - -//Updates overall lathe storage size. -/obj/machinery/autolathe/RefreshParts() - ..() - mb_rating = 0 - man_rating = 0 - for(var/obj/item/weapon/stock_parts/matter_bin/MB in component_parts) - mb_rating += MB.rating - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) - man_rating += M.rating - - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - materials.max_amount = mb_rating * 75000 - - build_time = 50 / man_rating - mat_efficiency = 1.1 - man_rating * 0.1// Normally, price is 1.25 the amount of material, so this shouldn't go higher than 0.6. Maximum rating of parts is 5 - update_tgui_static_data(usr) - -/obj/machinery/autolathe/dismantle() - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - materials.retrieve_all() - return ..() - -/obj/machinery/autolathe/proc/AfterMaterialInsert(obj/item/item_inserted, id_inserted, amount_inserted) - flick("autolathe_loading", src)//plays metal insertion animation - // use_power(min(1000, amount_inserted / 100)) - SStgui.update_uis(src) - -/obj/machinery/autolathe/examine(mob/user) - . = ..() - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Storing up to [materials.max_amount] material units.
Material consumption at [mat_efficiency*100]%." - -//YWAdd start. -/* commented out until i can be assed to actually fix the code -/obj/machinery/autolathe/verb/eatmaterialsnearby() - set name = "Recycle nearby materials" - set category = "Object" - set src in oview(1) - - var/filltype = 0 // Used to determine message. - var/total_used = 0 // Amount of material used. - if(busy) - visible_message("[bicon(src)]\The [src] beeps, \"Autolathe is busy. Please wait for completion of previous operation\"") - return - busy = 1 - for(var/obj/item/eating in get_step(src,input_dir)) - if(istype(eating,/obj/item/ammo_magazine/clip) || istype(eating,/obj/item/ammo_magazine/s357) || istype(eating,/obj/item/ammo_magazine/s38) || istype(eating,/obj/item/ammo_magazine/s44) || istype(eating,/obj/item/stack)) - continue - - if(!eating.matter) - continue - - - var/mass_per_sheet = 0 // Amount of material constituting one sheet. - for(var/material in eating.matter) - - if(isnull(stored_material[material]) || isnull(storage_capacity[material])) - continue - - if(stored_material[material] >= storage_capacity[material]) - continue - - var/total_material = eating.matter[material] - - - if(stored_material[material] + total_material > storage_capacity[material]) - total_material = storage_capacity[material] - stored_material[material] - filltype = 1 - else - filltype = 2 - - stored_material[material] += total_material - total_used += total_material - mass_per_sheet += eating.matter[material] - - if(!filltype) - visible_message("[bicon(src)]\The [src] beeps, \"Storage is full. Operation aborted\"") - break - - flick("autolathe_loading", src) - - if(istype(eating,/obj/item/stack)) - var/obj/item/stack/stack = eating - stack.use(max(1, round(total_used/mass_per_sheet))) // Always use at least 1 to prevent infinite materials. - else - qdel(eating) - sleep(10*mat_efficiency) - - busy = 0 - if(filltype == 1) - visible_message("[bicon(src)] \The [src] beeps, \"Storage capacity full. Operation terminated. Materials recycled: [total_used]\"") - else - visible_message("[bicon(src)] \The [src] beeps, \"All materials recycled. Operation terminated. Materials recycled: [total_used]\"") - - - -/obj/machinery/autolathe/verb/setrecyclepos() - set name = "Set recycle input" - set category = "Object" - set src in oview(1) - - input_dir_name = input("Which direction ?") in list("North", "South", "East", "West") - switch(input_dir_name) - if("North") - input_dir = NORTH - if("South") - input_dir = SOUTH - if("East") - input_dir = EAST - if("West") - input_dir = WEST - to_chat(src, "You set the material input to [input_dir_name]") -*/ +/obj/machinery/autolathe + name = "autolathe" + desc = "It produces items using metal and glass." + icon_state = "autolathe" + density = TRUE + anchored = TRUE + use_power = USE_POWER_IDLE + idle_power_usage = 10 + active_power_usage = 2000 + clicksound = "keyboard" + clickvol = 30 + + circuit = /obj/item/weapon/circuitboard/autolathe + + var/static/datum/category_collection/autolathe/autolathe_recipes + + var/hacked = 0 + var/disabled = 0 + var/shocked = 0 + var/busy = 0 + + var/input_dir = NORTH //YWedit + var/input_dir_name = "North"//YWEdit + + var/mat_efficiency = 1 + var/build_time = 50 + + var/datum/wires/autolathe/wires = null + + var/mb_rating = 0 + var/man_rating = 0 + + var/filtertext + +/obj/machinery/autolathe/Initialize() + AddComponent(/datum/component/material_container, subtypesof(/datum/material), 0, MATCONTAINER_EXAMINE, _after_insert = CALLBACK(src, .proc/AfterMaterialInsert)) + . = ..() + if(!autolathe_recipes) + autolathe_recipes = new() + wires = new(src) + + default_apply_parts() + RefreshParts() + +/obj/machinery/autolathe/Destroy() + qdel(wires) + wires = null + return ..() + +/obj/machinery/autolathe/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Autolathe", name) + ui.open() + +/obj/machinery/autolathe/tgui_status(mob/user) + if(disabled) + return STATUS_CLOSE + return ..() + +/obj/machinery/autolathe/tgui_static_data(mob/user) + var/list/data = ..() + + var/list/categories = list() + var/list/recipes = list() + for(var/datum/category_group/autolathe/A in autolathe_recipes.categories) + categories += A.name + for(var/datum/category_item/autolathe/M in A.items) + if(M.hidden && !hacked) + continue + if(M.man_rating > man_rating) + continue + recipes.Add(list(list( + "category" = A.name, + "name" = M.name, + "ref" = REF(M), + "requirements" = M.resources, + "hidden" = M.hidden, + "coeff_applies" = !M.no_scale, + "is_stack" = M.is_stack, + ))) + data["recipes"] = recipes + data["categories"] = categories + + return data + +/obj/machinery/autolathe/ui_assets(mob/user) + return list( + get_asset_datum(/datum/asset/spritesheet/sheetmaterials) + ) + +/obj/machinery/autolathe/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + data["busy"] = busy + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) + data["materials"] = materials.tgui_data() + data["mat_efficiency"] = mat_efficiency + return data + +/obj/machinery/autolathe/interact(mob/user) + if(panel_open) + return wires.Interact(user) + + if(disabled) + to_chat(user, "\The [src] is disabled!") + return + + if(shocked) + shock(user, 50) + + tgui_interact(user) + +/obj/machinery/autolathe/attackby(var/obj/item/O as obj, var/mob/user as mob) + if(busy) + to_chat(user, "\The [src] is busy. Please wait for completion of previous operation.") + return + + if(default_deconstruction_screwdriver(user, O)) + interact(user) + return + if(default_deconstruction_crowbar(user, O)) + return + if(default_part_replacement(user, O)) + return + + if(stat) + return + + if(panel_open) + //Don't eat multitools or wirecutters used on an open lathe. + if(O.is_multitool() || O.is_wirecutter()) + wires.Interact(user) + return + + if(is_robot_module(O)) + return 0 + + if(istype(O,/obj/item/ammo_magazine/clip) || istype(O,/obj/item/ammo_magazine/s357) || istype(O,/obj/item/ammo_magazine/s38) || istype (O,/obj/item/ammo_magazine/s44)/* VOREstation Edit*/) // Prevents ammo recycling exploit with speedloaders. + to_chat(user, "\The [O] is too hazardous to recycle with the autolathe!") + return + + return ..() + +/obj/machinery/autolathe/attack_hand(mob/user as mob) + user.set_machine(src) + interact(user) + +/obj/machinery/autolathe/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + usr.set_machine(src) + add_fingerprint(usr) + + if(busy) + to_chat(usr, "The autolathe is busy. Please wait for completion of previous operation.") + return + switch(action) + if("make") + var/datum/category_item/autolathe/making = locate(params["make"]) + if(!istype(making)) + return + if(making.hidden && !hacked) + return + + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) + + var/list/materials_used = list() + + var/multiplier = (params["multiplier"] || 1) + + if(making.is_stack) + var/max_sheets + for(var/material in making.resources) + var/coeff = (making.no_scale ? 1 : mat_efficiency) //stacks are unaffected by production coefficient + var/sheets = round(materials.get_material_amount(material) / round(making.resources[material] * coeff)) + if(isnull(max_sheets) || max_sheets > sheets) + max_sheets = sheets + if(!isnull(materials.get_material_amount(material)) && materials.get_material_amount(material) < round(making.resources[material] * coeff)) + max_sheets = 0 + //Build list of multipliers for sheets. + multiplier = tgui_input_number(usr, "How many do you want to print? (0-[max_sheets])", null, null, max_sheets, 0) + if(!multiplier || multiplier <= 0 || multiplier > max_sheets || tgui_status(usr, state) != STATUS_INTERACTIVE) + return FALSE + + //Check if we still have the materials. + var/coeff = (making.no_scale ? 1 : mat_efficiency) //stacks are unaffected by production coefficient + + for(var/datum/material/used_material as anything in making.resources) + var/amount_needed = making.resources[used_material] * coeff * multiplier + materials_used[used_material] = amount_needed + + if(LAZYLEN(materials_used)) + if(!materials.has_materials(materials_used)) + return + + materials.use_materials(materials_used) + + busy = making.name + update_use_power(USE_POWER_ACTIVE) + + update_icon() // So lid closes + + sleep(build_time) + + busy = 0 + update_use_power(USE_POWER_IDLE) + update_icon() // So lid opens + + //Sanity check. + if(!making || !src) + return + + //Create the desired item. + var/obj/item/I = new making.path(src.loc) + + if(LAZYLEN(I.matter)) // Sadly we must obey the laws of equivalent exchange. + I.matter.Cut() + else + I.matter = list() + + for(var/material in making.resources) // Handle the datum's autoscaling for waste, so we're properly wasting material, but not so much if we have efficiency. + I.matter[material] = round(making.resources[material] / (making.no_scale ? 1 : 1.25)) * (making.no_scale ? 1 : mat_efficiency) + + flick("[initial(icon_state)]_finish", src) + if(multiplier > 1) + if(istype(I, /obj/item/stack)) + var/obj/item/stack/S = I + S.set_amount(multiplier) + else + for(multiplier; multiplier > 1; --multiplier) // Create multiple items if it's not a stack. + I = new making.path(src.loc) + // We've already deducted the cost of multiple items. Process the matter the same. + if(LAZYLEN(I.matter)) + I.matter.Cut() + + else + I.matter = list() + + for(var/material in making.resources) + I.matter[material] = round(making.resources[material] / (making.no_scale ? 1 : 1.25)) * (making.no_scale ? 1 : mat_efficiency) + return TRUE + return FALSE + +/obj/machinery/autolathe/update_icon() + cut_overlays() + + icon_state = initial(icon_state) + + if(panel_open) + add_overlay("[icon_state]_panel") + if(stat & NOPOWER) + return + if(busy) + icon_state = "[icon_state]_work" + +//Updates overall lathe storage size. +/obj/machinery/autolathe/RefreshParts() + ..() + mb_rating = 0 + man_rating = 0 + for(var/obj/item/weapon/stock_parts/matter_bin/MB in component_parts) + mb_rating += MB.rating + for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + man_rating += M.rating + + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) + materials.max_amount = mb_rating * 75000 + + build_time = 50 / man_rating + mat_efficiency = 1.1 - man_rating * 0.1// Normally, price is 1.25 the amount of material, so this shouldn't go higher than 0.6. Maximum rating of parts is 5 + update_tgui_static_data(usr) + +/obj/machinery/autolathe/dismantle() + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) + materials.retrieve_all() + return ..() + +/obj/machinery/autolathe/proc/AfterMaterialInsert(obj/item/item_inserted, id_inserted, amount_inserted) + flick("autolathe_loading", src)//plays metal insertion animation + // use_power(min(1000, amount_inserted / 100)) + SStgui.update_uis(src) + +/obj/machinery/autolathe/examine(mob/user) + . = ..() + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) + if(in_range(user, src) || isobserver(user)) + . += "The status display reads: Storing up to [materials.max_amount] material units.
Material consumption at [mat_efficiency*100]%." + +//YWAdd start. +/* commented out until i can be assed to actually fix the code +/obj/machinery/autolathe/verb/eatmaterialsnearby() + set name = "Recycle nearby materials" + set category = "Object" + set src in oview(1) + + var/filltype = 0 // Used to determine message. + var/total_used = 0 // Amount of material used. + if(busy) + visible_message("[bicon(src)]\The [src] beeps, \"Autolathe is busy. Please wait for completion of previous operation\"") + return + busy = 1 + for(var/obj/item/eating in get_step(src,input_dir)) + if(istype(eating,/obj/item/ammo_magazine/clip) || istype(eating,/obj/item/ammo_magazine/s357) || istype(eating,/obj/item/ammo_magazine/s38) || istype(eating,/obj/item/ammo_magazine/s44) || istype(eating,/obj/item/stack)) + continue + + if(!eating.matter) + continue + + + var/mass_per_sheet = 0 // Amount of material constituting one sheet. + for(var/material in eating.matter) + + if(isnull(stored_material[material]) || isnull(storage_capacity[material])) + continue + + if(stored_material[material] >= storage_capacity[material]) + continue + + var/total_material = eating.matter[material] + + + if(stored_material[material] + total_material > storage_capacity[material]) + total_material = storage_capacity[material] - stored_material[material] + filltype = 1 + else + filltype = 2 + + stored_material[material] += total_material + total_used += total_material + mass_per_sheet += eating.matter[material] + + if(!filltype) + visible_message("[bicon(src)]\The [src] beeps, \"Storage is full. Operation aborted\"") + break + + flick("autolathe_loading", src) + + if(istype(eating,/obj/item/stack)) + var/obj/item/stack/stack = eating + stack.use(max(1, round(total_used/mass_per_sheet))) // Always use at least 1 to prevent infinite materials. + else + qdel(eating) + sleep(10*mat_efficiency) + + busy = 0 + if(filltype == 1) + visible_message("[bicon(src)] \The [src] beeps, \"Storage capacity full. Operation terminated. Materials recycled: [total_used]\"") + else + visible_message("[bicon(src)] \The [src] beeps, \"All materials recycled. Operation terminated. Materials recycled: [total_used]\"") + + + +/obj/machinery/autolathe/verb/setrecyclepos() + set name = "Set recycle input" + set category = "Object" + set src in oview(1) + + input_dir_name = input("Which direction ?") in list("North", "South", "East", "West") + switch(input_dir_name) + if("North") + input_dir = NORTH + if("South") + input_dir = SOUTH + if("East") + input_dir = EAST + if("West") + input_dir = WEST + to_chat(src, "You set the material input to [input_dir_name]") +*/ //YWAdd END. \ No newline at end of file diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 0660bff759..a73eb6fe91 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -80,7 +80,7 @@ if(W.is_screwdriver()) playsound(src, W.usesound, 50, 1) - var/input = sanitize(input(usr, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: "+using_map.station_short+",Security,Secret ", "Set Network", camera_network ? camera_network : NETWORK_DEFAULT)) + var/input = sanitize(tgui_input_text(usr, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: "+using_map.station_short+",Security,Secret ", "Set Network", camera_network ? camera_network : NETWORK_DEFAULT)) if(!input) to_chat(usr, "No input found please hang up and try your call again.") return @@ -92,7 +92,7 @@ var/area/camera_area = get_area(src) var/temptag = "[sanitize(camera_area.name)] ([rand(1, 999)])" - input = sanitizeSafe(input(usr, "How would you like to name the camera?", "Set Camera Name", camera_name ? camera_name : temptag), MAX_NAME_LEN) + input = sanitizeSafe(tgui_input_text(usr, "How would you like to name the camera?", "Set Camera Name", camera_name ? camera_name : temptag), MAX_NAME_LEN) state = 4 var/obj/machinery/camera/C = new(src.loc) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 1e6cc6030a..5bc0272997 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -1182,7 +1182,7 @@ // Have the customer punch in the PIN before checking if there's enough money. Prevents people from figuring out acct is // empty at high security levels if(customer_account.security_level != 0) //If card requires pin authentication (ie seclevel 1 or 2) - var/attempt_pin = input(usr, "Enter pin code", "Vendor transaction") as num + var/attempt_pin = tgui_input_number(usr, "Enter pin code", "Vendor transaction") customer_account = attempt_account_access(I.associated_account_number, attempt_pin, 2) if(!customer_account) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index c15a9d1524..75b860330d 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -205,7 +205,7 @@ if(is_authenticated() && modify) var/t1 = params["assign_target"] if(t1 == "Custom") - var/temp_t = sanitize(input(usr, "Enter a custom job assignment.","Assignment"), 45) + var/temp_t = sanitize(tgui_input_text(usr, "Enter a custom job assignment.","Assignment"), 45) //let custom jobs function as an impromptu alt title, mainly for sechuds if(temp_t && modify) modify.assignment = temp_t diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index fb8507074d..1984171af6 100644 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -170,15 +170,15 @@ mode = params["mode"] if("giv_name") - var/nam = sanitizeName(input(usr, "Person pass is issued to", "Name", giv_name) as text|null) + var/nam = sanitizeName(tgui_input_text(usr, "Person pass is issued to", "Name", giv_name)) if(nam) giv_name = nam if("reason") - var/reas = sanitize(input(usr, "Reason why pass is issued", "Reason", reason) as text|null) + var/reas = sanitize(tgui_input_text(usr, "Reason why pass is issued", "Reason", reason)) if(reas) reason = reas if("duration") - var/dur = input(usr, "Duration (in minutes) during which pass is valid (up to 360 minutes).", "Duration") as num|null //VOREStation Edit + var/dur = tgui_input_number(usr, "Duration (in minutes) during which pass is valid (up to 360 minutes).", "Duration", null, 360, 0) if(dur) if(dur > 0 && dur <= 360) //VOREStation Edit duration = dur diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 5962f9aa8f..27009d097b 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -243,10 +243,10 @@ . = TRUE //Change the password - KEY REQUIRED if("pass") - var/dkey = trim(input(usr, "Please enter the current decryption key.") as text|null) + var/dkey = trim(tgui_input_text(usr, "Please enter the current decryption key.")) if(dkey && dkey != "") if(linkedServer.decryptkey == dkey) - var/newkey = trim(input(usr,"Please enter the new key (3 - 16 characters max):")) + var/newkey = trim(tgui_input_text(usr,"Please enter the new key (3 - 16 characters max):",null,null,16)) if(length(newkey) <= 3) set_temp("NOTICE: Decryption key too short!", "average") else if(length(newkey) > 16) @@ -325,7 +325,7 @@ . = TRUE if("addtoken") - linkedServer.spamfilter += input(usr,"Enter text you want to be filtered out","Token creation") as text|null + linkedServer.spamfilter += tgui_input_text(usr,"Enter text you want to be filtered out","Token creation") . = TRUE if("deltoken") diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index ac4868bc17..ceae88e54d 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -82,7 +82,7 @@ to_chat(usr, "Unauthorized Access.") . = TRUE if("warn") - var/warning = sanitize(input(usr, "Message:", "Enter your message here!", "")) + var/warning = sanitize(tgui_input_text(usr, "Message:", "Enter your message here!", "")) if(!warning) return var/obj/item/weapon/implant/I = locate(params["imp"]) diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm index e805e151bd..ce345e429e 100644 --- a/code/game/machinery/computer/supply.dm +++ b/code/game/machinery/computer/supply.dm @@ -221,12 +221,12 @@ visible_message("[src]'s monitor flashes, \"[reqtime - world.time] seconds remaining until another requisition form may be printed.\"") return FALSE - var/amount = clamp(input(usr, "How many crates? (0 to 20)") as num|null, 0, 20) + var/amount = clamp(tgui_input_number(usr, "How many crates? (0 to 20)", null, null, 20, 0), 0, 20) if(!amount) return FALSE var/timeout = world.time + 600 - var/reason = sanitize(input(usr, "Reason:","Why do you require this item?","") as null|text) + var/reason = sanitize(tgui_input_text(usr, "Reason:","Why do you require this item?","")) if(world.time > timeout) to_chat(usr, "Error. Request timed out.") return FALSE @@ -280,7 +280,7 @@ return FALSE var/timeout = world.time + 600 - var/reason = sanitize(input(usr, "Reason:","Why do you require this item?","") as null|text) + var/reason = sanitize(tgui_input_text(usr, "Reason:","Why do you require this item?","")) if(world.time > timeout) to_chat(usr, "Error. Request timed out.") return FALSE @@ -323,7 +323,7 @@ return FALSE if(!(authorization & SUP_ACCEPT_ORDERS)) return FALSE - var/new_val = sanitize(input(usr, params["edit"], "Enter the new value for this field:", params["default"]) as null|text) + var/new_val = sanitize(tgui_input_text(usr, params["edit"], "Enter the new value for this field:", params["default"])) if(!new_val) return FALSE @@ -396,7 +396,7 @@ var/list/L = E.contents[params["index"]] var/field = tgui_alert(usr, "Select which field to edit", "Field Choice", list("Name", "Quantity", "Value")) - var/new_val = sanitize(input(usr, field, "Enter the new value for this field:", L[lowertext(field)]) as null|text) + var/new_val = sanitize(tgui_input_text(usr, field, "Enter the new value for this field:", L[lowertext(field)])) if(!new_val) return @@ -439,7 +439,7 @@ return FALSE if(!(authorization & SUP_ACCEPT_ORDERS)) return FALSE - var/new_val = sanitize(input(usr, params["edit"], "Enter the new value for this field:", params["default"]) as null|text) + var/new_val = sanitize(tgui_input_text(usr, params["edit"], "Enter the new value for this field:", params["default"])) if(!new_val) return diff --git a/code/game/machinery/computer3/computers/card.dm b/code/game/machinery/computer3/computers/card.dm index d2f6074c78..7412f6b464 100644 --- a/code/game/machinery/computer3/computers/card.dm +++ b/code/game/machinery/computer3/computers/card.dm @@ -305,7 +305,7 @@ if(auth) var/t1 = href_list["assign"] if(t1 == "Custom") - var/temp_t = sanitize(input(usr, "Enter a custom job assignment.","Assignment")) + var/temp_t = sanitize(tgui_input_text(usr, "Enter a custom job assignment.","Assignment")) if(temp_t) t1 = temp_t set_default_access(t1) diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm index d90a46000f..906c41ea6d 100644 --- a/code/game/machinery/doorbell_vr.dm +++ b/code/game/machinery/doorbell_vr.dm @@ -129,7 +129,7 @@ if(default_deconstruction_screwdriver(user, W)) return else if(panel_open && istype(W, /obj/item/weapon/pen)) - var/t = sanitizeSafe(input(user, "Enter the name for \the [src].", src.name, initial(src.name)), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter the name for \the [src].", src.name, initial(src.name), MAX_NAME_LEN), MAX_NAME_LEN) if(t && in_range(src, user)) name = t else if(panel_open && istype(W, /obj/item/device/multitool)) diff --git a/code/game/machinery/gear_dispenser.dm b/code/game/machinery/gear_dispenser.dm index 70c97af29d..315b56e847 100644 --- a/code/game/machinery/gear_dispenser.dm +++ b/code/game/machinery/gear_dispenser.dm @@ -693,7 +693,7 @@ var/list/dispenser_presets = list() * "gearlist" = array of types (yes the types are not valid json, byond parses them into real types.) * "req_one_access" = array of numbers (accesses) */ - var/input = input(usr, "Paste new gear pack JSON below. See example/code comments.", "Admin-load Dispenser", example) as null|message + var/input = tgui_input_text(usr, "Paste new gear pack JSON below. See example/code comments.", "Admin-load Dispenser", example, multiline = TRUE) if(!input) return diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 955b99009a..0e184683ec 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -401,20 +401,20 @@ return // Required - var/url = input(C, "REQUIRED: Provide URL for track", "Track URL") as text|null + var/url = tgui_input_text(C, "REQUIRED: Provide URL for track", "Track URL") if(!url) return - var/title = input(C, "REQUIRED: Provide title for track", "Track Title") as text|null + var/title = tgui_input_text(C, "REQUIRED: Provide title for track", "Track Title") if(!title) return - var/duration = input(C, "REQUIRED: Provide duration for track (in deciseconds, aka seconds*10)", "Track Duration") as num|null + var/duration = tgui_input_number(C, "REQUIRED: Provide duration for track (in deciseconds, aka seconds*10)", "Track Duration") if(!duration) return // Optional - var/artist = input(C, "Optional: Provide artist for track", "Track Artist") as text|null + var/artist = tgui_input_text(C, "Optional: Provide artist for track", "Track Artist") if(isnull(artist)) // Cancel rather than empty string return @@ -428,7 +428,7 @@ if(!check_rights(R_FUN|R_ADMIN)) return - var/track = input(C, "Input track title or URL to remove (must be exact)", "Remove Track") as text|null + var/track = tgui_input_text(C, "Input track title or URL to remove (must be exact)", "Remove Track") if(!track) return diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index f713cea2d0..e2b76f3632 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -314,7 +314,7 @@ if(speed <= 0) speed = 1 if("setpath") - var/newpath = sanitize(input(usr, "Please define a new path!",,path) as text|null) + var/newpath = sanitize(tgui_input_text(usr, "Please define a new path!",,path)) if(newpath && newpath != "") moving = 0 // stop moving path = newpath diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 7e6721f109..1002e3fa21 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -28,7 +28,7 @@ if(istype(I, /obj/item/device/multitool)) if(panel_open) - var/input = sanitize(input(usr, "What id would you like to give this conveyor?", "Multitool-Conveyor interface", id)) + var/input = sanitize(tgui_input_text(usr, "What id would you like to give this conveyor?", "Multitool-Conveyor interface", id)) if(!input) to_chat(usr, "No input found please hang up and try your call again.") return diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 90a623d0b9..1e1fff180e 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -150,7 +150,7 @@ Transponder Codes:
- "}
usr.set_machine(src)
if(href_list["locedit"])
- var/newloc = sanitize(input(usr, "Enter New Location", "Navigation Beacon", location) as text|null)
+ var/newloc = sanitize(tgui_input_text(usr, "Enter New Location", "Navigation Beacon", location))
if(newloc)
location = newloc
updateDialog()
@@ -158,12 +158,12 @@ Transponder Codes:
- Wrench all pieces to the floor -
- Add wires to all the pieces -
- Close all the panels with your screwdriver -
- Open the control panel -
- Set the speed to 2 -
- Start firing at the singularity generator -
- When the singularity reaches a large enough size so it starts moving on it's own set the speed down to 0, but don't shut it off -
- Remember to wear a radiation suit when working with this machine... we did tell you that at the start, right? -
- The supermatter crystal serves as the fundamental power source of the engine. Upon being charged, it begins to emit large amounts of heat and radiation, as well and oxygen and phoron gas. As oxygen accelerates the reaction and reacts with phoron to start a fire, it must be filtered out. It's recommended to filter out all gases besides nitrogen for standard operation. -
- Gas in the reactor chamber housing the supermatter is circulated through the reactor loop, which passes through the filters and thermoelectric generators. The thermoelectric generators transfer heat from the reactor loop to the colder radiator loop, thereby generating power. Additional power is generated from internal turbines in the circulators. -
- Gas in the radiator loop is circulated through the radiator bank, located in space. This rapidly cools the air, preserving the temperature differential needed for power generation. -
- The MK 1 Prototype Thermoelectric Supermatter Engine is designed to operate at reactor temperatures of 3000K to 4000K and generate up to 1MW of power. Beyond 1MW, the thermoelectric generators will begin to lose power through electrical discharge, reducing efficiency, but additional power generation remains feasible. -
- The crystal structure of the supermatter will begin to liquefy if its temperature exceeds 5000K. This eventually results in a massive release of light, heat and radiation, disintegration of both the supermatter crystal and most of the surrounding area, and as as-of-yet poorly documented psychological effects on all animals within a 2km radius. Appropriate action should be taken to stabilize or eject the supermatter before such occurs. -
- Do not expose supermatter to oxygen. -
- Do not allow supermatter to contact any solid object apart from specially-designed supporting pallet. -
- Do not directly view supermatter without meson goggles. -
- While handles on pallet allow moving the supermatter via pulling, pushing should not be attempted. -
- Note that prosthetics do not protect against radiation or viewing the supermatter. -
- Fill reactor loop and radiator loop with three (3) standard canisters of nitrogen gas each. -
- Fill the waste handling radiator loop with one (1) standard canister of carbon dioxide gas. -
- Enable both the high power gas pumps near the thermo-electric generators and maximize the desired output. -
- Enable both the omni-filters and ensure they are set to filter nitrogen back into the system. -
- Enable the gas pump from the filters to waste handling and maximize the desired output. -
- Close the monitoring room blast doors and open the reactor blast doors, -
- Fire 8-9 pulses from emitter at supermatter crystal. The expected power output is around a megawatt. NOTE: It will take a few minutes to heat up. -
- Close the reactor blast doors and keep the monitoring room blast doors closed to prevent radiation leaking. -
- Ensure that radiation protection and meson goggles are worn at all times while working in the engine room. -
- Ensure that reactor and radiator loops are undamaged and unobstructed. -
- Ensure that, in a standard setup, only nitrogen is being filtered back into the system. Do not allow exhaust pressure to exceed 4500 kPa. -
- Ensure that engine room Area Power Controller (APC) and engine Superconducting Magnetic Energy Storage unit (SMES) are properly charged. -
- Ensure that reactor temperature does not exceed 5000K. In event of reactor temperature exceeding 5000K, see EMERGENCY COOLING PROCEDURE. -
- In event of imminent and/or unavoidable delamination, see EJECTION PROCEDURE. -
- Open Emergency Cooling Valve 1 and Emergency Cooling Valve 2. -
- When reactor temperature returns to safe operating levels, close Emergency Cooling Valve 1 and Emergency Cooling Valve 2. -
- Adding additional gas to the loops can have a positive effect in reducing reactor temperature. -
- If reactor temperature does not return to safe operating levels, see EJECTION PROCEDURE. -
- Ensure the engine room has power. The blast doors and ejection platform are unresponsive without power. -
- Press Engine Ventilatory Control button to open engine core blast door to space. -
- Press Emergency Core Eject button to eject supermatter crystal. NOTE: Attempting crystal ejection while engine core vent is closed will result in ejection failure. -
- In event of ejection failure, pending -
- Tesla coils -
- Grounding rods -
- People and animals -
- Machines -
- Bolt and weld down the Field Generators, ensuring they form a complete rectangle. -
- Bolt and weld down the Emitters, ensuring their fire will strike the corner Field Generators -
- Bolt down the Tesla Generator inside the rectangle formed by the Field Generators in a spot where it will be struck by fire from the Particle Accelerator -
- Bolt down Telsa Coils and Grounding Rods -
- Activate the Emitters -
- Activate each of the Field Generators, then wait until the containment field has completely formed. -
- Setup the Particle Accelerator (see our best seller "Particle Accelerator User's Guide"!) and activate it. -
- After a short time the Telsa Generator will create an energy ball, being consumed in the process. -
- Ensure that electrical protection and meson goggles are worn at all times while working in the engine room. -
- Ensure that Telsa Coils and/or Grounding Rods are placed to safely collect or ground any and all shock. -
- Ensure that all Emitters remain activated and have unobstructed lines of fire to the Field Generators. -
- Do not let the Emitters run out of power. -
- De-activate the Particle Accelerator. The energy ball will begin to shrink and lose mini-balls. -
- When the energy ball has completely dissipated, the Emitters can be de-activated. -
- Do not let it escape. -
- Have someone ready to blame when it does escape. -
- Buy our forthcoming manual "Celebrity Grounding Rod Shelters of the Galaxy" -
- Go to engine gas storage to the south of the engine room and fetch two Canisters of Nitrogen. and two canisters of Phoron. -
- Secure the Phoron canister to the port that pumps into the Cold (Green/Cyan) loop, and the Nitrogen canister into the Hot(Yellow/Red) loop. long story short, The reactor doesn't like Phoron. -
- DO NOT OPEN THE VALVE ON THE GAS CANISTERS, OR SPACE GOD WILL HATE YOU. Turn both pumps on to maximum input, Swap the canisters for full ones when necessary. Each loop only needs 2 canisters of gas. -
- Turn on the pump just to the West of the Pump Station and set it to maximum pressure. -
- Now Coolant is flowing, lets actually start the reactor. -
- Go into the Engine Monitoring room and close the Monitoring room Blast Doors. -
- Get the PACMAN from hard storage and Secure it in the Engine SMES room, and load it with Phoron. -
- Go into the Reactor Control room and open the reactor shroud. -
- Enable max input and output on the engine SMES and shut off the input off on the Station SMES. This is to make sure the Gyrotron gets as much power as it can during start up. -
- Turn the PACMAN on, setting it to power 4/5. -
- Go into the reactor Control Room (East of the reactor) and take the stack of Deuterium off the table, and click it on the compressor twice, this should make two Deuterium Fuel rods. Ignore the Tritium. -
- In the Control room go to the Core Control console, Access the field, and set its strength/size to 600, then bring the field on-line. This will give you a field of about 7x7 tiles. Make note of the field size, A bigger field can EMP machinery or doors around it, a smaller field may allow Gyrotron shots to miss, and punch holes in the back wall. -
- In the Control room go to the Gyrotron Control console and turn the Gyrotrons on, delay 3 power 3. -
- In the Control room go to the Fuel Injector console and start injecting fuel. -
- Go back to the Core Control Console, and now wait for the temperature to spike from 296 Kelvin up to 3,000 to 10,000 Kelvin. When the temperature spikes it means you have achieved fusion -
- Now turn the Gyrotrons off, You can turn off one of the two fuel injectors as well if you wish to conserve fuel. -
- Now close the Reactor Shroud and the Control Room Shroud. -
- You should be producing power now, a lot of it. Now go turn on the Station SMES and turn off the PACMAN before it explodes. -
- PANIC! -
- Get your ass over to engineering! QUICKLY!!! -
- Get to the Area Power Controller which controls the power to the emitters. -
- Swipe it with your ID card - if it doesn't unlock, continue with step 15. -
- Open the console and disengage the cover lock. -
- Pry open the APC with a Crowbar. -
- Take out the empty power cell. -
- Put in the new, full power cell - if you don't have one, continue with step 15. -
- Quickly put on a Radiation suit. -
- Check if the singularity field generators withstood the down-time - if they didn't, continue with step 15. -
- Since disaster was averted you now have to ensure it doesn't repeat. If it was a powersink which caused it and if the engineering APC is wired to the same powernet, which the powersink is on, you have to remove the piece of wire which links the APC to the powernet. If it wasn't a powersink which caused it, then skip to step 14. -
- Grab your crowbar and pry away the tile closest to the APC. -
- Use the wirecutters to cut the wire which is connecting the grid to the terminal. -
- Go to the bar and tell the guys how you saved them all. Stop reading this guide here. -
- GET THE FUCK OUT OF THERE!!! -
- GET THE FUCK OUT OF THERE!!! FORGET THE WOMEN AND CHILDREN, SAVE YOURSELF!!! -
- Take a syringe of blood from the body you wish to turn into a Diona. -
- Inject 5 units of blood into the pack of dionaea-replicant seeds. -
- Plant the seeds. -
- Tend to the plants water and nutrition levels until it is time to harvest the Diona. -
- Acquire body -
- Strip body -
- Put body in cloning machine -
- Scan body -
- Clone body -
- Get clean Structural Enzymes for the body -
- Put body in morgue -
- Await cloned body -
- Cryo and use the clean SE injector -
- Give person clothes back -
- Send person on their way -
- Class: Autonomous Power Loader -
- Scope: Logistics and Construction -
- Weight: 820kg (without operator and with empty cargo compartment) -
- Height: 2.5m -
- Width: 1.8m -
- Top speed: 5km/hour -
- Operation in vacuum/hostile environment: Possible -
- Airtank volume: 500 liters -
- Devices:
-
-
-
- Hydraulic clamp -
- High-speed drill -
- - Propulsion device: Powercell-powered electro-hydraulic system -
- Powercell capacity: Varies -
- Connect all exosuit parts to the chassis frame. -
- Connect all hydraulic fittings and tighten them up with a wrench. -
- Adjust the servohydraulics with a screwdriver. -
- Wire the chassis (Cable is not included). -
- Use the wirecutters to remove the excess cable if needed. -
- Install the central control module (Not included. Use supplied datadisk to create one). -
- Secure the mainboard with a screwdriver. -
- Install the peripherals control module (Not included. Use supplied datadisk to create one). -
- Secure the peripherals control module with a screwdriver. -
- Install the internal armor plating (Not included due to corporate regulations. Can be made using 5 metal sheets). -
- Secure the internal armor plating with a wrench. -
- Weld the internal armor plating to the chassis. -
- Install the external reinforced armor plating (Not included due to corporate regulations. Can be made using 5 reinforced metal sheets). -
- Secure the external reinforced armor plating with a wrench. -
- Weld the external reinforced armor plating to the chassis. -
- The firefighting variation is made in a similar fashion. -
- A firesuit must be connected to the firefighter chassis for heat shielding. -
- Internal armor is plasteel for additional strength. -
- External armor must be installed in 2 parts, totalling 10 sheets. -
- Completed mech is more resilient against fire, and is a bit more durable overall. -
- The Company is determined to ensure the safety of its
investmentsemployees.
- - Deconstruct items in the Destructive Analyzer to advance technology or improve the design. -
- Build unlocked designs in the Protolathe and Circuit Imprinter. -
- Repeat! -
- Cyborg Related Equipment -
- Cyborg Modules -
- Cyborg Construction -
- Cyborg Maintenance -
- Cyborg Repairs -
- In Case of Emergency -
- Crowbar -
- Stun Baton -
- Health Analyzer -
- Fire Extinguisher -
- A basic set of engineering tools -
- Metal Synthesizer -
- Reinforced Glass Synthesizer -
- An RCD -
- Wire Synthesizer -
- Fire Extinguisher -
- Built-in Optical Meson Scanners -
- Jackhammer -
- Shovel -
- Mining Satchel -
- Built-in Optical Meson Scanners -
- Stun Baton -
- Handcuffs -
- Taser -
- Mop -
- Hand Bucket -
- Cleaning Spray Synthesizer and Spray Nozzle -
- Shaker -
- Industrial Dropper -
- Platter -
- Beer Synthesizer -
- Zippo Lighter -
- Rapid-Service-Fabricator (Produces various entertainment and refreshment objects) -
- Pen -
- Metal -
- Two Flashes -
- One Power Cell (Preferably rated to 15000w) -
- Some electrical wires -
- One Human Brain -
- One Man-Machine Interface -
- Start the Exosuit Fabricators constructing all of the cyborg parts -
- While the parts are being constructed, take your human brain, and place it inside the Man-Machine Interface -
- Once you have a Robot Head, place your two flashes inside the eye sockets -
- Once you have your Robot Chest, wire the Robot chest, then insert the power cell -
- Attach all of the Robot parts to the Robot frame -
- Insert the Man-Machine Interface (With the Brain inside) into the Robot Body -
- Congratulations! You have a new cyborg! -
- Unlock the Cyborg's Interface by swiping your ID on it -
- Open the Cyborg's outer panel using a crowbar -
- Remove the old power cell -
- Insert the new power cell -
- Close the Cyborg's outer panel using a crowbar -
- Lock the Cyborg's Interface by swiping your ID on it, this will prevent non-qualified personnel from attempting to remove the power cell -
- Follow Steps 1 - 3 of "Replacing a Cyborg's Power Cell" -
- Open the cyborg's internal wiring panel by using a screwdriver to unsecure the panel -
- Use a screwdriver to secure the cyborg's internal panel -
- Follow steps 4 - 6 of "Replacing a Cyborg's Power Cell" to close up the cyborg -
- Unlock the Cyborg's Interface by swiping your ID -
- Open the Cyborg's External Panel using a crowbar -
- Remove the Cyborg's Power Cell -
- Using a screwdriver, expose the internal wiring of the Cyborg -
- Replace the damaged wires inside the cyborg -
- Secure the internal wiring cover using a screwdriver -
- Insert the Cyborg's Power Cell -
- Close the Cyborg's External Panel using a crowbar -
- Lock the Cyborg's Interface by swiping your ID -
- Locate the nearest robotics console -
- Determine which cyborgs are "Rogue" -
- Press the lockdown button to immobilize the cyborg -
- Locate the cyborg -
- Expose the cyborg's internal wiring -
- Check to make sure the LawSync and AI Sync lights are lit -
- If they are not lit, pulse the LawSync wire using a multitool to enable the cyborg's LawSync -
- Proceed to a cyborg upload console. The Company usually places these in the same location as AI upload consoles. -
- Use a "Reset" upload moduleto reset the cyborg's laws -
- Proceed to a Robotics Control console -
- Remove the lockdown on the cyborg -
- Now, as a new doctor, I solemnly promise that I will, to the best of my ability, serve humanity-caring for the sick, promoting good health, and alleviating pain and suffering. -
- I recognise that the practice of medicine is a privilege with which comes considerable responsibility and I will not abuse my position. -
- I will practise medicine with integrity, humility, honesty, and compassion-working with my fellow doctors and other colleagues to meet the needs of my patients. -
- I shall never intentionally do or administer anything to the overall harm of my patients. -
- I will not permit considerations of gender, race, religion, political affiliation, sexual orientation, nationality, or social standing to influence my duty of care. -
- I will oppose policies in breach of human rights and will not participate in them. I will strive to change laws that are contrary to my profession's ethics and will work towards a fairer distribution of health resources. -
- I will assist my patients to make informed decisions that coincide with their own values and beliefs and will uphold patient confidentiality. -
- I will recognise the limits of my knowledge and seek to maintain and increase my understanding and skills throughout my professional life. I will acknowledge and try to remedy my own mistakes and honestly assess and respond to those of others. -
- I will seek to promote the advancement of medical knowledge through teaching and research. -
- I make this declaration solemnly, freely, and upon my honour. -
- Go to the crime scene. -
- Take your scanner and scan EVERYTHING (Yes, the doors, the tables, even the dog). -
- Once you are reasonably certain you have every scrap of evidence you can use, find all possible entry points and scan them, too. -
- Return to your office. -
- Using your forensic scanning computer, scan your scanner to upload all of your evidence into the database. -
- Browse through the resulting dossiers, looking for the one that either has the most complete set of prints, or the most suspicious items handled. -
- If you have 80% or more of the print (The print is displayed), go to step 10, otherwise continue to step 8. -
- Look for clues from the suit fibres you found on your perpetrator, and go about looking for more evidence with this new information, scanning as you go. -
- Try to get a fingerprint card of your perpetrator, as if used in the computer, the prints will be completed on their dossier. -
- Assuming you have enough of a print to see it, grab the biggest complete piece of the print and search the security records for it. -
- Since you now have both your dossier and the name of the person, print both out as evidence and get security to nab your baddie. -
- Give yourself a pat on the back and a bottle of the ship's finest vodka, you did it! -
- Place the nuclear device in the designated detonation zone. -
- Extend and anchor the nuclear device from its interface. -
- Insert the nuclear authorisation disk into the slot. -
- Type the numeric authorisation code into the keypad. This should have been provided.
- Note: If you make a mistake, press R to reset the device. - - Press the E button to log on to the device. -
- Author's Foreword -
- Basic Piping -
- Insulated Pipes -
- Atmospherics Devices -
- Heat Exchange Systems -
- Final Checks -
- Straight pipes: They're pipes. One-meter sections. Straight line. Pretty simple. Just about every pipe and device is based around this - standard one-meter size, so most things will take up as much space as one of these. -
- Bent pipes: Pipes with a 90 degree bend at the half-meter mark. My goodness. -
- Pipe manifolds: Pipes that are essentially a "T" shape, allowing you to connect three things at one point. -
- 4-way manifold: A four-way junction. -
- Pipe cap: Caps off the end of a pipe. Open ends don't actually vent air, because of the way the pipes are assembled, so, uh, use them to decorate your house or something. -
- Manual valve: A valve that will block off airflow when turned. Can't be used by the AI or cyborgs, because they don't have hands. -
- Manual T-valve: Like a manual valve, but at the center of a manifold instead of a straight pipe.
- Bent pipes: Pipes with a 90 degree bend at the half-meter mark. My goodness. -
- Pipe manifolds: Pipes that are essentially a "T" shape, allowing you to connect three things at one point. -
- 4-way manifold: A four-way junction. -
- Pipe cap: Caps off the end of a pipe. Open ends don't actually vent air, because of the way the pipes are assembled, so, uh. Use them to decorate your house or something. -
- Manual Valve: A valve that will block off airflow when turned. Can't be used by the AI or cyborgs, because they don't have hands. -
- Manual T-Valve: Like a manual valve, but at the center of a manifold instead of a straight pipe.
- Gas pump: Take a wild guess. It moves gas in the direction it's pointing (marked by the red line on one end). It moves it based on pressure, the maximum output being 15000 kPa (kilopascals). - Ordinary atmospheric pressure, for comparison, is 101.3 kPa, and the minimum pressure of room-temperature pure oxygen needed to not suffocate in a matter of minutes is 16 kPa - (though 18 kPa is preferred when using internals with pure oxygen, for various reasons). A high-powered variant will move gas more quickly at the expense of consuming more power. Do not turn the distribution loop up to 15000 kPa. - You will make engiborgs cry and the Chief Engineer will beat you. -
- Pressure regulator: These replaced the old passive gates. You can choose to regulate pressure by input or output, and regulate flow rate. Regulating by input means that when input pressure is above the limit, gas will flow. - Regulating by output means that when pressure is below the limit, gas will flow. Flow rate can be controlled. -
- Unary vent: The basic vent used in rooms. It pumps gas into the room, but can't suck it back out. Controlled by the room's air alarm system. -
- Scrubber: The other half of room equipment. Filters air, and can suck it in entirely in what's called a "panic siphon." Activating a panic siphon without very good reason will kill someone. Don't do it. -
- Meter: A little box with some gauges and numbers. Fasten it to any pipe or manifold and it'll read you the pressure in it. Very useful. -
- Gas mixer: Two sides are input, one side is output. Mixes the gases pumped into it at the ratio defined. The side perpendicular to the other two is "node 2," for reference, on non-mirrored mixers.. - Output is controlled by flow rate. There is also an "omni" variant that allows you to set input and output sections freely.. -
- Gas filter: Essentially the opposite of a gas mixer. One side is input. The other two sides are output. One gas type will be filtered into the perpendicular output pipe, - the rest will continue out the other side. Can also output from 0-4500 kPa. The "omni" vairant allows you to set input and output sections freely. -
- Pipe: This is a pipe that will exchange heat with the surrounding atmosphere. Place in fire for superheating. Place in space for supercooling. -
- Bent pipe: Take a wild guess. -
- Junction: The point where you connect your normal pipes to heat exchange pipes. Not necessary for heat exchangers, but necessary for H/E pipes/bent pipes. -
- Heat exchanger: These funky-looking bits attach to an open pipe end. Put another heat exchanger directly across from it, and you can transfer heat across two pipes without having to have the gases touch. - This normally shouldn't exchange with the ambient air, despite being totally exposed. Just don't ask questions.
- A foreword on using EVA gear -
- Use of Softsuits -
- Putting on a Voidsuit -
- Operation of Hardsuits -
- Cyclers and Other Modification Equipment -
- Miscellaneous Advice -
- Final Checks -
- Magboots are important. They can be the difference between keeping your footing and needing a rescue team. A tie-off or a jetpack can substitute if necessary. -
- Be aware of breach hazards, especially in softsuits. Loss of suit pressure can be a fatal disaster. -
- Keep an eye on your internals. Having to make two trips outside is better than running out of air. -
- Similarly, keep an eye on the battery status of cooling units and other equipment. -
- In vacuum, sound doesn't carry. Use a radio or sign language for communication.
- Are all seals fastened correctly? -
- If you have modified it manually, is absolutely everything sealed perfectly? -
- Do you either have shoes on under the suit, or magnetic boots on over it? -
- Do you have internals connected and activated? -
- Do you have a way to communicate with the station in case something goes wrong? -
- Do you have a second person watching if this is a training session?
- Two (2) Level-3 Bio Hoods -
- Two (2) Level-3 Bio Suits -
- Two (2) sets of sealed internals -
- One (1) box of sterile masks -
- One (1) box of latex gloves -
- Create lots of virus sample dishes. -
- If the virus dishes you have already created don't contain the syndromes that you want in
- your custom virus, irradiate them in the Pathogenic Incubator until they do.
- - Create backup dishes of your new viruses. -
- Strip the GNA strands that you want from your virus dishes, saving each one onto a disk. -
- Load a new virus dish into the Disease Splicer. -
- Copy over the virus dish's GNA strands with your disks. -
- Once you have your final product, you can use the Pathogenic Incubator to create a beaker
- of blood containing the virus. Congratulations! You are now officially a bioweapon
- manufacturer.
- - Wrench all pieces to the floor +
- Add wires to all the pieces +
- Close all the panels with your screwdriver +
- Open the control panel +
- Set the speed to 2 +
- Start firing at the singularity generator +
- When the singularity reaches a large enough size so it starts moving on it's own set the speed down to 0, but don't shut it off +
- Remember to wear a radiation suit when working with this machine... we did tell you that at the start, right? +
- The supermatter crystal serves as the fundamental power source of the engine. Upon being charged, it begins to emit large amounts of heat and radiation, as well and oxygen and phoron gas. As oxygen accelerates the reaction and reacts with phoron to start a fire, it must be filtered out. It's recommended to filter out all gases besides nitrogen for standard operation. +
- Gas in the reactor chamber housing the supermatter is circulated through the reactor loop, which passes through the filters and thermoelectric generators. The thermoelectric generators transfer heat from the reactor loop to the colder radiator loop, thereby generating power. Additional power is generated from internal turbines in the circulators. +
- Gas in the radiator loop is circulated through the radiator bank, located in space. This rapidly cools the air, preserving the temperature differential needed for power generation. +
- The MK 1 Prototype Thermoelectric Supermatter Engine is designed to operate at reactor temperatures of 3000K to 4000K and generate up to 1MW of power. Beyond 1MW, the thermoelectric generators will begin to lose power through electrical discharge, reducing efficiency, but additional power generation remains feasible. +
- The crystal structure of the supermatter will begin to liquefy if its temperature exceeds 5000K. This eventually results in a massive release of light, heat and radiation, disintegration of both the supermatter crystal and most of the surrounding area, and as as-of-yet poorly documented psychological effects on all animals within a 2km radius. Appropriate action should be taken to stabilize or eject the supermatter before such occurs. +
- Do not expose supermatter to oxygen. +
- Do not allow supermatter to contact any solid object apart from specially-designed supporting pallet. +
- Do not directly view supermatter without meson goggles. +
- While handles on pallet allow moving the supermatter via pulling, pushing should not be attempted. +
- Note that prosthetics do not protect against radiation or viewing the supermatter. +
- Fill reactor loop and radiator loop with three (3) standard canisters of nitrogen gas each. +
- Fill the waste handling radiator loop with one (1) standard canister of carbon dioxide gas. +
- Enable both the high power gas pumps near the thermo-electric generators and maximize the desired output. +
- Enable both the omni-filters and ensure they are set to filter nitrogen back into the system. +
- Enable the gas pump from the filters to waste handling and maximize the desired output. +
- Close the monitoring room blast doors and open the reactor blast doors, +
- Fire 8-9 pulses from emitter at supermatter crystal. The expected power output is around a megawatt. NOTE: It will take a few minutes to heat up. +
- Close the reactor blast doors and keep the monitoring room blast doors closed to prevent radiation leaking. +
- Ensure that radiation protection and meson goggles are worn at all times while working in the engine room. +
- Ensure that reactor and radiator loops are undamaged and unobstructed. +
- Ensure that, in a standard setup, only nitrogen is being filtered back into the system. Do not allow exhaust pressure to exceed 4500 kPa. +
- Ensure that engine room Area Power Controller (APC) and engine Superconducting Magnetic Energy Storage unit (SMES) are properly charged. +
- Ensure that reactor temperature does not exceed 5000K. In event of reactor temperature exceeding 5000K, see EMERGENCY COOLING PROCEDURE. +
- In event of imminent and/or unavoidable delamination, see EJECTION PROCEDURE. +
- Open Emergency Cooling Valve 1 and Emergency Cooling Valve 2. +
- When reactor temperature returns to safe operating levels, close Emergency Cooling Valve 1 and Emergency Cooling Valve 2. +
- Adding additional gas to the loops can have a positive effect in reducing reactor temperature. +
- If reactor temperature does not return to safe operating levels, see EJECTION PROCEDURE. +
- Ensure the engine room has power. The blast doors and ejection platform are unresponsive without power. +
- Press Engine Ventilatory Control button to open engine core blast door to space. +
- Press Emergency Core Eject button to eject supermatter crystal. NOTE: Attempting crystal ejection while engine core vent is closed will result in ejection failure. +
- In event of ejection failure, pending +
- Tesla coils +
- Grounding rods +
- People and animals +
- Machines +
- Bolt and weld down the Field Generators, ensuring they form a complete rectangle. +
- Bolt and weld down the Emitters, ensuring their fire will strike the corner Field Generators +
- Bolt down the Tesla Generator inside the rectangle formed by the Field Generators in a spot where it will be struck by fire from the Particle Accelerator +
- Bolt down Telsa Coils and Grounding Rods +
- Activate the Emitters +
- Activate each of the Field Generators, then wait until the containment field has completely formed. +
- Setup the Particle Accelerator (see our best seller "Particle Accelerator User's Guide"!) and activate it. +
- After a short time the Telsa Generator will create an energy ball, being consumed in the process. +
- Ensure that electrical protection and meson goggles are worn at all times while working in the engine room. +
- Ensure that Telsa Coils and/or Grounding Rods are placed to safely collect or ground any and all shock. +
- Ensure that all Emitters remain activated and have unobstructed lines of fire to the Field Generators. +
- Do not let the Emitters run out of power. +
- De-activate the Particle Accelerator. The energy ball will begin to shrink and lose mini-balls. +
- When the energy ball has completely dissipated, the Emitters can be de-activated. +
- Do not let it escape. +
- Have someone ready to blame when it does escape. +
- Buy our forthcoming manual "Celebrity Grounding Rod Shelters of the Galaxy" +
- Go to engine gas storage to the south of the engine room and fetch two Canisters of Nitrogen. and two canisters of Phoron. +
- Secure the Phoron canister to the port that pumps into the Cold (Green/Cyan) loop, and the Nitrogen canister into the Hot(Yellow/Red) loop. long story short, The reactor doesn't like Phoron. +
- DO NOT OPEN THE VALVE ON THE GAS CANISTERS, OR SPACE GOD WILL HATE YOU. Turn both pumps on to maximum input, Swap the canisters for full ones when necessary. Each loop only needs 2 canisters of gas. +
- Turn on the pump just to the West of the Pump Station and set it to maximum pressure. +
- Now Coolant is flowing, lets actually start the reactor. +
- Go into the Engine Monitoring room and close the Monitoring room Blast Doors. +
- Get the PACMAN from hard storage and Secure it in the Engine SMES room, and load it with Phoron. +
- Go into the Reactor Control room and open the reactor shroud. +
- Enable max input and output on the engine SMES and shut off the input off on the Station SMES. This is to make sure the Gyrotron gets as much power as it can during start up. +
- Turn the PACMAN on, setting it to power 4/5. +
- Go into the reactor Control Room (East of the reactor) and take the stack of Deuterium off the table, and click it on the compressor twice, this should make two Deuterium Fuel rods. Ignore the Tritium. +
- In the Control room go to the Core Control console, Access the field, and set its strength/size to 600, then bring the field on-line. This will give you a field of about 7x7 tiles. Make note of the field size, A bigger field can EMP machinery or doors around it, a smaller field may allow Gyrotron shots to miss, and punch holes in the back wall. +
- In the Control room go to the Gyrotron Control console and turn the Gyrotrons on, delay 3 power 3. +
- In the Control room go to the Fuel Injector console and start injecting fuel. +
- Go back to the Core Control Console, and now wait for the temperature to spike from 296 Kelvin up to 3,000 to 10,000 Kelvin. When the temperature spikes it means you have achieved fusion +
- Now turn the Gyrotrons off, You can turn off one of the two fuel injectors as well if you wish to conserve fuel. +
- Now close the Reactor Shroud and the Control Room Shroud. +
- You should be producing power now, a lot of it. Now go turn on the Station SMES and turn off the PACMAN before it explodes. +
- PANIC! +
- Get your ass over to engineering! QUICKLY!!! +
- Get to the Area Power Controller which controls the power to the emitters. +
- Swipe it with your ID card - if it doesn't unlock, continue with step 15. +
- Open the console and disengage the cover lock. +
- Pry open the APC with a Crowbar. +
- Take out the empty power cell. +
- Put in the new, full power cell - if you don't have one, continue with step 15. +
- Quickly put on a Radiation suit. +
- Check if the singularity field generators withstood the down-time - if they didn't, continue with step 15. +
- Since disaster was averted you now have to ensure it doesn't repeat. If it was a powersink which caused it and if the engineering APC is wired to the same powernet, which the powersink is on, you have to remove the piece of wire which links the APC to the powernet. If it wasn't a powersink which caused it, then skip to step 14. +
- Grab your crowbar and pry away the tile closest to the APC. +
- Use the wirecutters to cut the wire which is connecting the grid to the terminal. +
- Go to the bar and tell the guys how you saved them all. Stop reading this guide here. +
- GET THE FUCK OUT OF THERE!!! +
- GET THE FUCK OUT OF THERE!!! FORGET THE WOMEN AND CHILDREN, SAVE YOURSELF!!! +
- Take a syringe of blood from the body you wish to turn into a Diona. +
- Inject 5 units of blood into the pack of dionaea-replicant seeds. +
- Plant the seeds. +
- Tend to the plants water and nutrition levels until it is time to harvest the Diona. +
- Acquire body +
- Strip body +
- Put body in cloning machine +
- Scan body +
- Clone body +
- Get clean Structural Enzymes for the body +
- Put body in morgue +
- Await cloned body +
- Cryo and use the clean SE injector +
- Give person clothes back +
- Send person on their way +
- Class: Autonomous Power Loader +
- Scope: Logistics and Construction +
- Weight: 820kg (without operator and with empty cargo compartment) +
- Height: 2.5m +
- Width: 1.8m +
- Top speed: 5km/hour +
- Operation in vacuum/hostile environment: Possible +
- Airtank volume: 500 liters +
- Devices:
+
-
+
- Hydraulic clamp +
- High-speed drill +
+ - Propulsion device: Powercell-powered electro-hydraulic system +
- Powercell capacity: Varies +
- Connect all exosuit parts to the chassis frame. +
- Connect all hydraulic fittings and tighten them up with a wrench. +
- Adjust the servohydraulics with a screwdriver. +
- Wire the chassis (Cable is not included). +
- Use the wirecutters to remove the excess cable if needed. +
- Install the central control module (Not included. Use supplied datadisk to create one). +
- Secure the mainboard with a screwdriver. +
- Install the peripherals control module (Not included. Use supplied datadisk to create one). +
- Secure the peripherals control module with a screwdriver. +
- Install the internal armor plating (Not included due to corporate regulations. Can be made using 5 metal sheets). +
- Secure the internal armor plating with a wrench. +
- Weld the internal armor plating to the chassis. +
- Install the external reinforced armor plating (Not included due to corporate regulations. Can be made using 5 reinforced metal sheets). +
- Secure the external reinforced armor plating with a wrench. +
- Weld the external reinforced armor plating to the chassis. +
- The firefighting variation is made in a similar fashion. +
- A firesuit must be connected to the firefighter chassis for heat shielding. +
- Internal armor is plasteel for additional strength. +
- External armor must be installed in 2 parts, totalling 10 sheets. +
- Completed mech is more resilient against fire, and is a bit more durable overall. +
- The Company is determined to ensure the safety of its
investmentsemployees.
+ - Deconstruct items in the Destructive Analyzer to advance technology or improve the design. +
- Build unlocked designs in the Protolathe and Circuit Imprinter. +
- Repeat! +
- Cyborg Related Equipment +
- Cyborg Modules +
- Cyborg Construction +
- Cyborg Maintenance +
- Cyborg Repairs +
- In Case of Emergency +
- Crowbar +
- Stun Baton +
- Health Analyzer +
- Fire Extinguisher +
- A basic set of engineering tools +
- Metal Synthesizer +
- Reinforced Glass Synthesizer +
- An RCD +
- Wire Synthesizer +
- Fire Extinguisher +
- Built-in Optical Meson Scanners +
- Jackhammer +
- Shovel +
- Mining Satchel +
- Built-in Optical Meson Scanners +
- Stun Baton +
- Handcuffs +
- Taser +
- Mop +
- Hand Bucket +
- Cleaning Spray Synthesizer and Spray Nozzle +
- Shaker +
- Industrial Dropper +
- Platter +
- Beer Synthesizer +
- Zippo Lighter +
- Rapid-Service-Fabricator (Produces various entertainment and refreshment objects) +
- Pen +
- Metal +
- Two Flashes +
- One Power Cell (Preferably rated to 15000w) +
- Some electrical wires +
- One Human Brain +
- One Man-Machine Interface +
- Start the Exosuit Fabricators constructing all of the cyborg parts +
- While the parts are being constructed, take your human brain, and place it inside the Man-Machine Interface +
- Once you have a Robot Head, place your two flashes inside the eye sockets +
- Once you have your Robot Chest, wire the Robot chest, then insert the power cell +
- Attach all of the Robot parts to the Robot frame +
- Insert the Man-Machine Interface (With the Brain inside) into the Robot Body +
- Congratulations! You have a new cyborg! +
- Unlock the Cyborg's Interface by swiping your ID on it +
- Open the Cyborg's outer panel using a crowbar +
- Remove the old power cell +
- Insert the new power cell +
- Close the Cyborg's outer panel using a crowbar +
- Lock the Cyborg's Interface by swiping your ID on it, this will prevent non-qualified personnel from attempting to remove the power cell +
- Follow Steps 1 - 3 of "Replacing a Cyborg's Power Cell" +
- Open the cyborg's internal wiring panel by using a screwdriver to unsecure the panel +
- Use a screwdriver to secure the cyborg's internal panel +
- Follow steps 4 - 6 of "Replacing a Cyborg's Power Cell" to close up the cyborg +
- Unlock the Cyborg's Interface by swiping your ID +
- Open the Cyborg's External Panel using a crowbar +
- Remove the Cyborg's Power Cell +
- Using a screwdriver, expose the internal wiring of the Cyborg +
- Replace the damaged wires inside the cyborg +
- Secure the internal wiring cover using a screwdriver +
- Insert the Cyborg's Power Cell +
- Close the Cyborg's External Panel using a crowbar +
- Lock the Cyborg's Interface by swiping your ID +
- Locate the nearest robotics console +
- Determine which cyborgs are "Rogue" +
- Press the lockdown button to immobilize the cyborg +
- Locate the cyborg +
- Expose the cyborg's internal wiring +
- Check to make sure the LawSync and AI Sync lights are lit +
- If they are not lit, pulse the LawSync wire using a multitool to enable the cyborg's LawSync +
- Proceed to a cyborg upload console. The Company usually places these in the same location as AI upload consoles. +
- Use a "Reset" upload moduleto reset the cyborg's laws +
- Proceed to a Robotics Control console +
- Remove the lockdown on the cyborg +
- Now, as a new doctor, I solemnly promise that I will, to the best of my ability, serve humanity-caring for the sick, promoting good health, and alleviating pain and suffering. +
- I recognise that the practice of medicine is a privilege with which comes considerable responsibility and I will not abuse my position. +
- I will practise medicine with integrity, humility, honesty, and compassion-working with my fellow doctors and other colleagues to meet the needs of my patients. +
- I shall never intentionally do or administer anything to the overall harm of my patients. +
- I will not permit considerations of gender, race, religion, political affiliation, sexual orientation, nationality, or social standing to influence my duty of care. +
- I will oppose policies in breach of human rights and will not participate in them. I will strive to change laws that are contrary to my profession's ethics and will work towards a fairer distribution of health resources. +
- I will assist my patients to make informed decisions that coincide with their own values and beliefs and will uphold patient confidentiality. +
- I will recognise the limits of my knowledge and seek to maintain and increase my understanding and skills throughout my professional life. I will acknowledge and try to remedy my own mistakes and honestly assess and respond to those of others. +
- I will seek to promote the advancement of medical knowledge through teaching and research. +
- I make this declaration solemnly, freely, and upon my honour. +
- Go to the crime scene. +
- Take your scanner and scan EVERYTHING (Yes, the doors, the tables, even the dog). +
- Once you are reasonably certain you have every scrap of evidence you can use, find all possible entry points and scan them, too. +
- Return to your office. +
- Using your forensic scanning computer, scan your scanner to upload all of your evidence into the database. +
- Browse through the resulting dossiers, looking for the one that either has the most complete set of prints, or the most suspicious items handled. +
- If you have 80% or more of the print (The print is displayed), go to step 10, otherwise continue to step 8. +
- Look for clues from the suit fibres you found on your perpetrator, and go about looking for more evidence with this new information, scanning as you go. +
- Try to get a fingerprint card of your perpetrator, as if used in the computer, the prints will be completed on their dossier. +
- Assuming you have enough of a print to see it, grab the biggest complete piece of the print and search the security records for it. +
- Since you now have both your dossier and the name of the person, print both out as evidence and get security to nab your baddie. +
- Give yourself a pat on the back and a bottle of the ship's finest vodka, you did it! +
- Place the nuclear device in the designated detonation zone. +
- Extend and anchor the nuclear device from its interface. +
- Insert the nuclear authorisation disk into the slot. +
- Type the numeric authorisation code into the keypad. This should have been provided.
+ Note: If you make a mistake, press R to reset the device. + - Press the E button to log on to the device. +
- Author's Foreword +
- Basic Piping +
- Insulated Pipes +
- Atmospherics Devices +
- Heat Exchange Systems +
- Final Checks +
- Straight pipes: They're pipes. One-meter sections. Straight line. Pretty simple. Just about every pipe and device is based around this + standard one-meter size, so most things will take up as much space as one of these. +
- Bent pipes: Pipes with a 90 degree bend at the half-meter mark. My goodness. +
- Pipe manifolds: Pipes that are essentially a "T" shape, allowing you to connect three things at one point. +
- 4-way manifold: A four-way junction. +
- Pipe cap: Caps off the end of a pipe. Open ends don't actually vent air, because of the way the pipes are assembled, so, uh, use them to decorate your house or something. +
- Manual valve: A valve that will block off airflow when turned. Can't be used by the AI or cyborgs, because they don't have hands. +
- Manual T-valve: Like a manual valve, but at the center of a manifold instead of a straight pipe.
- Bent pipes: Pipes with a 90 degree bend at the half-meter mark. My goodness. +
- Pipe manifolds: Pipes that are essentially a "T" shape, allowing you to connect three things at one point. +
- 4-way manifold: A four-way junction. +
- Pipe cap: Caps off the end of a pipe. Open ends don't actually vent air, because of the way the pipes are assembled, so, uh. Use them to decorate your house or something. +
- Manual Valve: A valve that will block off airflow when turned. Can't be used by the AI or cyborgs, because they don't have hands. +
- Manual T-Valve: Like a manual valve, but at the center of a manifold instead of a straight pipe.
- Gas pump: Take a wild guess. It moves gas in the direction it's pointing (marked by the red line on one end). It moves it based on pressure, the maximum output being 15000 kPa (kilopascals). + Ordinary atmospheric pressure, for comparison, is 101.3 kPa, and the minimum pressure of room-temperature pure oxygen needed to not suffocate in a matter of minutes is 16 kPa + (though 18 kPa is preferred when using internals with pure oxygen, for various reasons). A high-powered variant will move gas more quickly at the expense of consuming more power. Do not turn the distribution loop up to 15000 kPa. + You will make engiborgs cry and the Chief Engineer will beat you. +
- Pressure regulator: These replaced the old passive gates. You can choose to regulate pressure by input or output, and regulate flow rate. Regulating by input means that when input pressure is above the limit, gas will flow. + Regulating by output means that when pressure is below the limit, gas will flow. Flow rate can be controlled. +
- Unary vent: The basic vent used in rooms. It pumps gas into the room, but can't suck it back out. Controlled by the room's air alarm system. +
- Scrubber: The other half of room equipment. Filters air, and can suck it in entirely in what's called a "panic siphon." Activating a panic siphon without very good reason will kill someone. Don't do it. +
- Meter: A little box with some gauges and numbers. Fasten it to any pipe or manifold and it'll read you the pressure in it. Very useful. +
- Gas mixer: Two sides are input, one side is output. Mixes the gases pumped into it at the ratio defined. The side perpendicular to the other two is "node 2," for reference, on non-mirrored mixers.. + Output is controlled by flow rate. There is also an "omni" variant that allows you to set input and output sections freely.. +
- Gas filter: Essentially the opposite of a gas mixer. One side is input. The other two sides are output. One gas type will be filtered into the perpendicular output pipe, + the rest will continue out the other side. Can also output from 0-4500 kPa. The "omni" vairant allows you to set input and output sections freely. +
- Pipe: This is a pipe that will exchange heat with the surrounding atmosphere. Place in fire for superheating. Place in space for supercooling. +
- Bent pipe: Take a wild guess. +
- Junction: The point where you connect your normal pipes to heat exchange pipes. Not necessary for heat exchangers, but necessary for H/E pipes/bent pipes. +
- Heat exchanger: These funky-looking bits attach to an open pipe end. Put another heat exchanger directly across from it, and you can transfer heat across two pipes without having to have the gases touch. + This normally shouldn't exchange with the ambient air, despite being totally exposed. Just don't ask questions.
- A foreword on using EVA gear +
- Use of Softsuits +
- Putting on a Voidsuit +
- Operation of Hardsuits +
- Cyclers and Other Modification Equipment +
- Miscellaneous Advice +
- Final Checks +
- Magboots are important. They can be the difference between keeping your footing and needing a rescue team. A tie-off or a jetpack can substitute if necessary. +
- Be aware of breach hazards, especially in softsuits. Loss of suit pressure can be a fatal disaster. +
- Keep an eye on your internals. Having to make two trips outside is better than running out of air. +
- Similarly, keep an eye on the battery status of cooling units and other equipment. +
- In vacuum, sound doesn't carry. Use a radio or sign language for communication.
- Are all seals fastened correctly? +
- If you have modified it manually, is absolutely everything sealed perfectly? +
- Do you either have shoes on under the suit, or magnetic boots on over it? +
- Do you have internals connected and activated? +
- Do you have a way to communicate with the station in case something goes wrong? +
- Do you have a second person watching if this is a training session?
- Two (2) Level-3 Bio Hoods +
- Two (2) Level-3 Bio Suits +
- Two (2) sets of sealed internals +
- One (1) box of sterile masks +
- One (1) box of latex gloves +
- Create lots of virus sample dishes. +
- If the virus dishes you have already created don't contain the syndromes that you want in
+ your custom virus, irradiate them in the Pathogenic Incubator until they do.
+ - Create backup dishes of your new viruses. +
- Strip the GNA strands that you want from your virus dishes, saving each one onto a disk. +
- Load a new virus dish into the Disease Splicer. +
- Copy over the virus dish's GNA strands with your disks. +
- Once you have your final product, you can use the Pathogenic Incubator to create a beaker
+ of blood containing the virus. Congratulations! You are now officially a bioweapon
+ manufacturer.
+ - c_tag match for sec. cameras at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) and \[[C2.x], [C2.y], [C2.z]\] ([C2.loc.loc]) - c_tag is [C1.c_tag] " - if(C1.loc == C2.loc && C1.dir == C2.dir && C1.pixel_x == C2.pixel_x && C1.pixel_y == C2.pixel_y) - output += "
- FULLY overlapping sec. cameras at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) Networks: [C1.network] and [C2.network] " - if(C1.loc == C2.loc) - output += "
- overlapping sec. cameras at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) Networks: [C1.network] and [C2.network] " - var/turf/T = get_step(C1,turn(C1.dir,180)) - if(!T || !isturf(T) || !T.density ) - if(!(locate(/obj/structure/grille,T))) - var/window_check = 0 - for(var/obj/structure/window/W in T) - if (W.dir == turn(C1.dir,180) || (W.dir in list(5,6,9,10)) ) - window_check = 1 - break - if(!window_check) - output += "
- Camera not connected to wall at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) Network: [C1.network] " - - output += "
- c_tag match for sec. cameras at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) and \[[C2.x], [C2.y], [C2.z]\] ([C2.loc.loc]) - c_tag is [C1.c_tag] " + if(C1.loc == C2.loc && C1.dir == C2.dir && C1.pixel_x == C2.pixel_x && C1.pixel_y == C2.pixel_y) + output += "
- FULLY overlapping sec. cameras at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) Networks: [C1.network] and [C2.network] " + if(C1.loc == C2.loc) + output += "
- overlapping sec. cameras at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) Networks: [C1.network] and [C2.network] " + var/turf/T = get_step(C1,turn(C1.dir,180)) + if(!T || !isturf(T) || !T.density ) + if(!(locate(/obj/structure/grille,T))) + var/window_check = 0 + for(var/obj/structure/window/W in T) + if (W.dir == turn(C1.dir,180) || (W.dir in list(5,6,9,10)) ) + window_check = 1 + break + if(!window_check) + output += "
- Camera not connected to wall at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) Network: [C1.network] " + + output += "
- - [trait.name] ([trait.cost]) " - . += "
- - [trait.name] ([trait.cost]) " + . += "
- - [trait.name] ([trait.cost]) " - . += "
- - [trait.name] ([trait.cost]) " . += "
- - [trait.name] ([trait.cost]) " + . += "
- "}
else if(href_list["edit"])
var/codekey = href_list["code"]
- var/newkey = input(usr, "Enter Transponder Code Key", "Navigation Beacon", codekey) as text|null
+ var/newkey = tgui_input_text(usr, "Enter Transponder Code Key", "Navigation Beacon", codekey)
if(!newkey)
return
var/codeval = codes[codekey]
- var/newval = input(usr, "Enter Transponder Code Value", "Navigation Beacon", codeval) as text|null
+ var/newval = tgui_input_text(usr, "Enter Transponder Code Value", "Navigation Beacon", codeval)
if(!newval)
newval = codekey
return
@@ -180,11 +180,11 @@ Transponder Codes:
- "}
else if(href_list["add"])
- var/newkey = input(usr, "Enter New Transponder Code Key", "Navigation Beacon") as text|null
+ var/newkey = tgui_input_text(usr, "Enter New Transponder Code Key", "Navigation Beacon")
if(!newkey)
return
- var/newval = input(usr, "Enter New Transponder Code Value", "Navigation Beacon") as text|null
+ var/newval = tgui_input_text(usr, "Enter New Transponder Code Value", "Navigation Beacon")
if(!newval)
newval = "1"
return
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index b91d7ffdda..8e6aee9b79 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -447,7 +447,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster)
return TRUE
if("set_new_message")
- msg = sanitize(tgui_input_message(usr, "Write your Feed story", "Network Channel Handler"))
+ msg = sanitize(tgui_input_text(usr, "Write your Feed story", "Network Channel Handler", multiline = TRUE, prevent_enter = TRUE))
return TRUE
if("set_new_title")
diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm
index 9577bfcd17..b4406f5a0b 100644
--- a/code/game/machinery/pointdefense.dm
+++ b/code/game/machinery/pointdefense.dm
@@ -94,7 +94,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense)
/obj/machinery/pointdefense_control/attackby(var/obj/item/W, var/mob/user)
if(W?.is_multitool())
- var/new_ident = input(user, "Enter a new ident tag.", "[src]", id_tag) as null|text
+ var/new_ident = tgui_input_text(user, "Enter a new ident tag.", "[src]", id_tag)
if(new_ident && new_ident != id_tag && user.Adjacent(src) && CanInteract(user, GLOB.tgui_physical_state))
// Check for duplicate controllers with this ID
for(var/obj/machinery/pointdefense_control/PC as anything in GLOB.pointdefense_controllers)
@@ -211,7 +211,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense)
/obj/machinery/power/pointdefense/attackby(var/obj/item/W, var/mob/user)
if(W?.is_multitool())
- var/new_ident = input(user, "Enter a new ident tag.", "[src]", id_tag) as null|text
+ var/new_ident = tgui_input_text(user, "Enter a new ident tag.", "[src]", id_tag)
if(new_ident && new_ident != id_tag && user.Adjacent(src) && CanInteract(user, GLOB.tgui_physical_state))
to_chat(user, "You register [src] with the [new_ident] network.")
id_tag = new_ident
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 359410f494..87e39ac937 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -1092,7 +1092,7 @@
return
if(istype(I, /obj/item/weapon/pen)) //you can rename turrets like bots!
- var/t = sanitizeSafe(input(user, "Enter new turret name", name, finish_name) as text, MAX_NAME_LEN)
+ var/t = sanitizeSafe(tgui_input_text(user, "Enter new turret name", name, finish_name, MAX_NAME_LEN), MAX_NAME_LEN)
if(!t)
return
if(!in_range(src, usr) && loc != usr)
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 491aa22457..ea2854480a 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -10,7 +10,7 @@
active_power_usage = 40000 //40 kW
var/efficiency = 40000 //will provide the modified power rate when upgraded
var/obj/item/charging = null
- var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/modular_computer, /obj/item/weapon/computer_hardware/battery_module, /obj/item/weapon/cell, /obj/item/device/suit_cooling_unit/emergency, /obj/item/device/flashlight, /obj/item/device/electronic_assembly, /obj/item/weapon/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/device/flash, /obj/item/device/defib_kit, /obj/item/ammo_casing/microbattery) //VOREStation Add - NSFW Batteries
+ var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/modular_computer, /obj/item/weapon/computer_hardware/battery_module, /obj/item/weapon/cell, /obj/item/device/suit_cooling_unit/emergency, /obj/item/device/flashlight, /obj/item/device/electronic_assembly, /obj/item/weapon/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/device/flash, /obj/item/device/defib_kit, /obj/item/ammo_casing/microbattery, /obj/item/device/paicard) //VOREStation Add - NSFW Batteries
var/icon_state_charged = "recharger2"
var/icon_state_charging = "recharger1"
var/icon_state_idle = "recharger0" //also when unpowered
@@ -68,9 +68,21 @@
if(EW.use_external_power)
to_chat(user, "\The [EW] has no recharge port.")
return
- if(!G.get_cell() && !istype(G, /obj/item/ammo_casing/microbattery)) //VOREStation Edit: NSFW charging
+ if(!G.get_cell() && !istype(G, /obj/item/ammo_casing/microbattery) && !istype(G, /obj/item/device/paicard)) //VOREStation Edit: NSFW charging
to_chat(user, "\The [G] does not have a battery installed.")
return
+ if(istype(G, /obj/item/device/paicard))
+ var/obj/item/device/paicard/ourcard = G
+ if(ourcard.panel_open)
+ to_chat(user, "\The [ourcard] won't fit in the recharger with its panel open.")
+ return
+ if(ourcard.pai)
+ if(ourcard.pai.stat == CONSCIOUS)
+ to_chat(user, "\The [ourcard] boops... it doesn't need to be recharged!")
+ return
+ else
+ to_chat(user, "\The [ourcard] doesn't have a personality!")
+ return
user.drop_item()
G.loc = src
@@ -122,6 +134,25 @@
if(!charging)
update_use_power(USE_POWER_IDLE)
icon_state = icon_state_idle
+ //VOREStation Edit Start - pAI revival!
+ else if(istype(charging, /obj/item/device/paicard))
+ var/obj/item/device/paicard/pcard = charging
+ if(pcard.is_damage_critical())
+ pcard.forceMove(get_turf(src))
+ charging = null
+ pcard.damage_random_component()
+ update_icon()
+ else if(pcard.pai.bruteloss)
+ pcard.pai.adjustBruteLoss(-5)
+ else if(pcard.pai.fireloss)
+ pcard.pai.adjustFireLoss(-5)
+ else
+ charging = null
+ update_icon()
+ src.visible_message("\The [src] ejects the [pcard]!")
+ pcard.forceMove(get_turf(src))
+ pcard.pai.full_restore()
+ //VOREStation Edit End
else
var/obj/item/weapon/cell/C = charging.get_cell()
if(istype(C))
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index a8c4e21dbc..7350ca0c1e 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -153,7 +153,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
if(reject_bad_text(params["write"]))
recipient = params["write"] //write contains the string of the receiving department's name
- var/new_message = sanitize(input(usr, "Write your message:", "Awaiting Input", ""))
+ var/new_message = sanitize(tgui_input_text(usr, "Write your message:", "Awaiting Input", ""))
if(new_message)
message = new_message
screen = RCS_MESSAUTH
@@ -169,7 +169,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
. = TRUE
if("writeAnnouncement")
- var/new_message = sanitize(input(usr, "Write your message:", "Awaiting Input", ""))
+ var/new_message = sanitize(tgui_input_text(usr, "Write your message:", "Awaiting Input", ""))
if(new_message)
message = new_message
else
@@ -238,7 +238,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
if(computer_deconstruction_screwdriver(user, O))
return
if(istype(O, /obj/item/device/multitool))
- var/input = sanitize(input(usr, "What Department ID would you like to give this request console?", "Multitool-Request Console Interface", department))
+ var/input = sanitize(tgui_input_text(usr, "What Department ID would you like to give this request console?", "Multitool-Request Console Interface", department))
if(!input)
to_chat(usr, "No input found. Please hang up and try your call again.")
return
diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm
index ba63655b9c..461a200481 100644
--- a/code/game/machinery/telecomms/logbrowser.dm
+++ b/code/game/machinery/telecomms/logbrowser.dm
@@ -128,7 +128,7 @@
. = TRUE
if("network")
- var/newnet = input(usr, "Which network do you want to view?", "Comm Monitor", network) as null|text
+ var/newnet = tgui_input_text(usr, "Which network do you want to view?", "Comm Monitor", network)
if(newnet && ((usr in range(1, src) || issilicon(usr))))
if(length(newnet) > 15)
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index aeb2578cac..000383eede 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -1,387 +1,387 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
-
-/*
-
- All telecommunications interactions:
-
-*/
-
-#define STATION_Z 2
-#define TELECOMM_Z 4
-
-/obj/machinery/telecomms
- var/list/temp = null // output message
-
-/obj/machinery/telecomms/attackby(obj/item/P as obj, mob/user as mob)
-
- // Using a multitool lets you access the receiver's interface
- if(istype(P, /obj/item/device/multitool))
- attack_hand(user)
-
- // REPAIRING: Use Nanopaste to repair 10-20 integrity points.
- if(istype(P, /obj/item/stack/nanopaste))
- var/obj/item/stack/nanopaste/T = P
- if (integrity < 100) //Damaged, let's repair!
- if (T.use(1))
- integrity = between(0, integrity + rand(10,20), 100)
- to_chat(usr, "You apply the Nanopaste to [src], repairing some of the damage.")
- else
- to_chat(usr, "This machine is already in perfect condition.")
- return
-
-
- if(default_deconstruction_screwdriver(user, P))
- return
- if(default_deconstruction_crowbar(user, P))
- return
-
-/obj/machinery/telecomms/attack_ai(var/mob/user as mob)
- attack_hand(user)
-
-/obj/machinery/telecomms/tgui_data(mob/user)
- var/list/data = list()
-
- data["temp"] = temp
- data["on"] = on
-
- data["id"] = null
- data["tag"] = null //YW EDIT: aac
- data["network"] = null
- data["autolinkers"] = FALSE
- data["shadowlink"] = FALSE
- data["options"] = list()
- data["linked"] = list()
- data["filter"] = list()
- data["multitool"] = FALSE
- data["multitool_buffer"] = null
-
- if(on || interact_offline)
- data["id"] = id
- data["tag"] = tag //YW EDIT: aac
- data["network"] = network
- data["autolinkers"] = !!LAZYLEN(autolinkers)
- data["shadowlink"] = !!hide
-
- data["options"] = Options_Menu()
-
- var/obj/item/device/multitool/P = get_multitool(user)
- data["multitool"] = !!P
- data["multitool_buffer"] = null
- if(P && P.buffer)
- P.update_icon()
- data["multitool_buffer"] = list("name" = "[P.buffer]", "id" = "[P.buffer.id]", "tag" = "[P.buffer.id_tag]") //YW EDIT: aac
-
- var/i = 0
- var/list/linked = list()
- for(var/obj/machinery/telecomms/T in links)
- i++
- linked.Add(list(list(
- "ref" = "\ref[T]",
- "name" = "[T]",
- "id" = T.id,
- "index" = i,
- )))
- data["linked"] = linked
-
- var/list/filter = list()
- for(var/x in freq_listening)
- filter.Add(list(list(
- "name" = "[format_frequency(x)]",
- "freq" = x,
- )))
- data["filter"] = filter
-
- return data
-
-/obj/machinery/telecomms/tgui_status(mob/user)
- if(!issilicon(user))
- if(!istype(user.get_active_hand(), /obj/item/device/multitool))
- return STATUS_CLOSE
- . = ..()
-
-/obj/machinery/telecomms/attack_hand(var/mob/user as mob)
- tgui_interact(user)
-
-/obj/machinery/telecomms/tgui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "TelecommsMultitoolMenu", name)
- ui.open()
-
-// Off-Site Relays
-//
-// You are able to send/receive signals from the station's z level (changeable in the STATION_Z #define) if
-// the relay is on the telecomm satellite (changable in the TELECOMM_Z #define)
-
-
-/obj/machinery/telecomms/relay/proc/toggle_level()
-
- var/turf/position = get_turf(src)
-
- // Toggle on/off getting signals from the station or the current Z level
- if(src.listening_level == STATION_Z) // equals the station
- src.listening_level = position.z
- return 1
- else if(position.z == TELECOMM_Z)
- src.listening_level = STATION_Z
- return 1
- return 0
-
-// Returns a multitool from a user depending on their mobtype.
-
-/obj/machinery/proc/get_multitool(mob/user as mob) //No need to have this being a telecomms specific proc.
-
- var/obj/item/device/multitool/P = null
- // Let's double check
- if(!issilicon(user) && istype(user.get_active_hand(), /obj/item/device/multitool))
- P = user.get_active_hand()
- else if(isAI(user))
- var/mob/living/silicon/ai/U = user
- P = U.aiMulti
- else if(isrobot(user) && in_range(user, src))
- if(istype(user.get_active_hand(), /obj/item/device/multitool))
- P = user.get_active_hand()
- return P
-
-// Additional Options for certain machines. Use this when you want to add an option to a specific machine.
-// Example of how to use below.
-
-/obj/machinery/telecomms/proc/Options_Menu()
- return list()
-
-/*
-// Add an option to the processor to switch processing mode. (COMPRESS -> UNCOMPRESS or UNCOMPRESS -> COMPRESS)
-/obj/machinery/telecomms/processor/Options_Menu()
- var/dat = "
Processing Mode: [process_mode ? "UNCOMPRESS" : "COMPRESS"]" - return dat -*/ -// The topic for Additional Options. Use this for checking href links for your specific option. -// Example of how to use below. -/obj/machinery/telecomms/proc/Options_Act(action, params) - return - -/* -/obj/machinery/telecomms/processor/Options_Act(action, params) - - if(href_list["process"]) - set_temp("-% Processing mode changed. %-", "average") - src.process_mode = !src.process_mode -*/ - -// RELAY - -/obj/machinery/telecomms/relay/Options_Menu() - var/list/data = ..() - data["use_listening_level"] = TRUE - data["use_broadcasting"] = TRUE - data["use_receiving"] = TRUE - data["listening_level"] = (listening_level == STATION_Z) - data["broadcasting"] = broadcasting - data["receiving"] = receiving - return data - -/obj/machinery/telecomms/relay/Options_Act(action, params) - if(..()) - return TRUE - - switch(action) - if("receive") - . = TRUE - receiving = !receiving - set_temp("-% Receiving mode changed. %-", "average") - if("broadcast") - . = TRUE - broadcasting = !broadcasting - set_temp("-% Broadcasting mode changed. %-", "average") - if("change_listening") - . = TRUE - //Lock to the station OR lock to the current position! - //You need at least two receivers and two broadcasters for this to work, this includes the machine. - var/result = toggle_level() - if(result) - set_temp("-% [src]'s signal has been successfully changed.", "average") - else - set_temp("-% [src] could not lock it's signal onto the station. Two broadcasters or receivers required.", "average") - -// BUS - -/obj/machinery/telecomms/bus/Options_Menu() - var/list/data = ..() - data["use_change_freq"] = TRUE - data["change_freq"] = change_frequency - return data - -/obj/machinery/telecomms/bus/Options_Act(action, params) - if(..()) - return TRUE - - switch(action) - if("change_freq") - . = TRUE - var/newfreq = input(usr, "Specify a new frequency for new signals to change to. Enter null to turn off frequency changing. Decimals assigned automatically.", src, network) as null|num - if(canAccess(usr)) - if(newfreq) - if(findtext(num2text(newfreq), ".")) - newfreq *= 10 // shift the decimal one place - if(newfreq < 10000) - change_frequency = newfreq - set_temp("-% New frequency to change to assigned: \"[newfreq] GHz\" %-", "average") - else - change_frequency = 0 - set_temp("-% Frequency changing deactivated %-", "average") - - -// BROADCASTER -/obj/machinery/telecomms/broadcaster/Options_Menu() - var/list/data = ..() - data["use_broadcast_range"] = TRUE - data["range"] = overmap_range - data["minRange"] = overmap_range_min - data["maxRange"] = overmap_range_max - return data - -/obj/machinery/telecomms/broadcaster - interact_offline = TRUE // because you can accidentally nuke power grids with these, need to be able to fix mistake - -/obj/machinery/telecomms/broadcaster/Options_Act(action, params) - if(..()) - return TRUE - - switch(action) - if("range") - var/new_range = params["range"] - overmap_range = clamp(new_range, overmap_range_min, overmap_range_max) - update_idle_power_usage(initial(idle_power_usage)**(overmap_range+1)) - -// RECEIVER -/obj/machinery/telecomms/receiver/Options_Menu() - var/list/data = ..() - data["use_receive_range"] = TRUE - data["range"] = overmap_range - data["minRange"] = overmap_range_min - data["maxRange"] = overmap_range_max - return data - -/obj/machinery/telecomms/receiver - interact_offline = TRUE // because you can accidentally nuke power grids with these, need to be able to fix mistake - -/obj/machinery/telecomms/receiver/Options_Act(action, params) - if(..()) - return TRUE - - switch(action) - if("range") - var/new_range = params["range"] - overmap_range = clamp(new_range, overmap_range_min, overmap_range_max) - update_idle_power_usage(initial(idle_power_usage)**(overmap_range+1)) - -/obj/machinery/telecomms/tgui_act(action, params) - if(..()) - return TRUE - - var/obj/item/device/multitool/P = get_multitool(usr) - - switch(action) - if("toggle") - src.toggled = !src.toggled - set_temp("-% [src] has been [src.toggled ? "activated" : "deactivated"].", "average") - update_power() - . = TRUE - - if("id") - var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID for this machine", src, id) as null|text),1,MAX_MESSAGE_LEN) - if(newid && canAccess(usr)) - id = newid - set_temp("-% New ID assigned: \"[id]\" %-", "average") - . = TRUE - - if("network") - var/newnet = input(usr, "Specify the new network for this machine. This will break all current links.", src, network) as null|text - if(newnet && canAccess(usr)) - - if(length(newnet) > 15) - set_temp("-% Too many characters in new network tag %-", "average") - - else - for(var/obj/machinery/telecomms/T in links) - T.links.Remove(src) - - network = newnet - links = list() - set_temp("-% New network tag assigned: \"[network]\" %-", "average") - . = TRUE - - - if("freq") - var/newfreq = input(usr, "Specify a new frequency to filter (GHz). Decimals assigned automatically.", src, network) as null|num - if(newfreq && canAccess(usr)) - if(findtext(num2text(newfreq), ".")) - newfreq *= 10 // shift the decimal one place - if(!(newfreq in freq_listening) && newfreq < 10000) - freq_listening.Add(newfreq) - set_temp("-% New frequency filter assigned: \"[newfreq] GHz\" %-", "average") - . = TRUE - - if("delete") - var/x = text2num(params["delete"]) - set_temp("-% Removed frequency filter [x] %-", "average") - freq_listening.Remove(x) - . = TRUE - - if("unlink") - if(text2num(params["unlink"]) <= length(links)) - var/obj/machinery/telecomms/T = links[text2num(params["unlink"])] - set_temp("-% Removed \ref[T] [T.name] from linked entities. %-", "average") - - // Remove link entries from both T and src. - - if(src in T.links) - T.links.Remove(src) - links.Remove(T) - . = TRUE - - if("link") - if(P) - if(P.buffer && P.buffer != src) - /*if(!(src in P.buffer.links)) //YW EDIT: aac - P.buffer.links.Add(src) - - if(!(P.buffer in src.links)) - src.links.Add(P.buffer)*/ - - set_temp("-% Successfully linked with \ref[P.buffer] [P.buffer.name] %-", "average") - - else - set_temp("-% Unable to acquire buffer %-", "average") - . = TRUE - - if("buffer") - P.buffer = src - set_temp("-% Successfully stored \ref[P.buffer] [P.buffer.name] in buffer %-", "average") - . = TRUE - - if("flush") - set_temp("-% Buffer successfully flushed. %-", "average") - P.buffer = null - . = TRUE - - if("cleartemp") - temp = null - . = TRUE - - if(Options_Act(action, params)) - . = TRUE - - add_fingerprint(usr) - -/obj/machinery/telecomms/proc/canAccess(var/mob/user) - if(issilicon(user) || in_range(user, src)) - return 1 - return 0 - -/obj/machinery/telecomms/proc/set_temp(var/text, var/color = "average") - temp = list("color" = color, "text" = text) - -#undef TELECOMM_Z -#undef STATION_Z +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 + + +/* + + All telecommunications interactions: + +*/ + +#define STATION_Z 2 +#define TELECOMM_Z 4 + +/obj/machinery/telecomms + var/list/temp = null // output message + +/obj/machinery/telecomms/attackby(obj/item/P as obj, mob/user as mob) + + // Using a multitool lets you access the receiver's interface + if(istype(P, /obj/item/device/multitool)) + attack_hand(user) + + // REPAIRING: Use Nanopaste to repair 10-20 integrity points. + if(istype(P, /obj/item/stack/nanopaste)) + var/obj/item/stack/nanopaste/T = P + if (integrity < 100) //Damaged, let's repair! + if (T.use(1)) + integrity = between(0, integrity + rand(10,20), 100) + to_chat(usr, "You apply the Nanopaste to [src], repairing some of the damage.") + else + to_chat(usr, "This machine is already in perfect condition.") + return + + + if(default_deconstruction_screwdriver(user, P)) + return + if(default_deconstruction_crowbar(user, P)) + return + +/obj/machinery/telecomms/attack_ai(var/mob/user as mob) + attack_hand(user) + +/obj/machinery/telecomms/tgui_data(mob/user) + var/list/data = list() + + data["temp"] = temp + data["on"] = on + + data["id"] = null + data["tag"] = null //YW EDIT: aac + data["network"] = null + data["autolinkers"] = FALSE + data["shadowlink"] = FALSE + data["options"] = list() + data["linked"] = list() + data["filter"] = list() + data["multitool"] = FALSE + data["multitool_buffer"] = null + + if(on || interact_offline) + data["id"] = id + data["tag"] = tag //YW EDIT: aac + data["network"] = network + data["autolinkers"] = !!LAZYLEN(autolinkers) + data["shadowlink"] = !!hide + + data["options"] = Options_Menu() + + var/obj/item/device/multitool/P = get_multitool(user) + data["multitool"] = !!P + data["multitool_buffer"] = null + if(P && P.buffer) + P.update_icon() + data["multitool_buffer"] = list("name" = "[P.buffer]", "id" = "[P.buffer.id]", "tag" = "[P.buffer.id_tag]") //YW EDIT: aac + + var/i = 0 + var/list/linked = list() + for(var/obj/machinery/telecomms/T in links) + i++ + linked.Add(list(list( + "ref" = "\ref[T]", + "name" = "[T]", + "id" = T.id, + "index" = i, + ))) + data["linked"] = linked + + var/list/filter = list() + for(var/x in freq_listening) + filter.Add(list(list( + "name" = "[format_frequency(x)]", + "freq" = x, + ))) + data["filter"] = filter + + return data + +/obj/machinery/telecomms/tgui_status(mob/user) + if(!issilicon(user)) + if(!istype(user.get_active_hand(), /obj/item/device/multitool)) + return STATUS_CLOSE + . = ..() + +/obj/machinery/telecomms/attack_hand(var/mob/user as mob) + tgui_interact(user) + +/obj/machinery/telecomms/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "TelecommsMultitoolMenu", name) + ui.open() + +// Off-Site Relays +// +// You are able to send/receive signals from the station's z level (changeable in the STATION_Z #define) if +// the relay is on the telecomm satellite (changable in the TELECOMM_Z #define) + + +/obj/machinery/telecomms/relay/proc/toggle_level() + + var/turf/position = get_turf(src) + + // Toggle on/off getting signals from the station or the current Z level + if(src.listening_level == STATION_Z) // equals the station + src.listening_level = position.z + return 1 + else if(position.z == TELECOMM_Z) + src.listening_level = STATION_Z + return 1 + return 0 + +// Returns a multitool from a user depending on their mobtype. + +/obj/machinery/proc/get_multitool(mob/user as mob) //No need to have this being a telecomms specific proc. + + var/obj/item/device/multitool/P = null + // Let's double check + if(!issilicon(user) && istype(user.get_active_hand(), /obj/item/device/multitool)) + P = user.get_active_hand() + else if(isAI(user)) + var/mob/living/silicon/ai/U = user + P = U.aiMulti + else if(isrobot(user) && in_range(user, src)) + if(istype(user.get_active_hand(), /obj/item/device/multitool)) + P = user.get_active_hand() + return P + +// Additional Options for certain machines. Use this when you want to add an option to a specific machine. +// Example of how to use below. + +/obj/machinery/telecomms/proc/Options_Menu() + return list() + +/* +// Add an option to the processor to switch processing mode. (COMPRESS -> UNCOMPRESS or UNCOMPRESS -> COMPRESS) +/obj/machinery/telecomms/processor/Options_Menu() + var/dat = "
Processing Mode: [process_mode ? "UNCOMPRESS" : "COMPRESS"]" + return dat +*/ +// The topic for Additional Options. Use this for checking href links for your specific option. +// Example of how to use below. +/obj/machinery/telecomms/proc/Options_Act(action, params) + return + +/* +/obj/machinery/telecomms/processor/Options_Act(action, params) + + if(href_list["process"]) + set_temp("-% Processing mode changed. %-", "average") + src.process_mode = !src.process_mode +*/ + +// RELAY + +/obj/machinery/telecomms/relay/Options_Menu() + var/list/data = ..() + data["use_listening_level"] = TRUE + data["use_broadcasting"] = TRUE + data["use_receiving"] = TRUE + data["listening_level"] = (listening_level == STATION_Z) + data["broadcasting"] = broadcasting + data["receiving"] = receiving + return data + +/obj/machinery/telecomms/relay/Options_Act(action, params) + if(..()) + return TRUE + + switch(action) + if("receive") + . = TRUE + receiving = !receiving + set_temp("-% Receiving mode changed. %-", "average") + if("broadcast") + . = TRUE + broadcasting = !broadcasting + set_temp("-% Broadcasting mode changed. %-", "average") + if("change_listening") + . = TRUE + //Lock to the station OR lock to the current position! + //You need at least two receivers and two broadcasters for this to work, this includes the machine. + var/result = toggle_level() + if(result) + set_temp("-% [src]'s signal has been successfully changed.", "average") + else + set_temp("-% [src] could not lock it's signal onto the station. Two broadcasters or receivers required.", "average") + +// BUS + +/obj/machinery/telecomms/bus/Options_Menu() + var/list/data = ..() + data["use_change_freq"] = TRUE + data["change_freq"] = change_frequency + return data + +/obj/machinery/telecomms/bus/Options_Act(action, params) + if(..()) + return TRUE + + switch(action) + if("change_freq") + . = TRUE + var/newfreq = input(usr, "Specify a new frequency for new signals to change to. Enter null to turn off frequency changing. Decimals assigned automatically.", src, network) as null|num + if(canAccess(usr)) + if(newfreq) + if(findtext(num2text(newfreq), ".")) + newfreq *= 10 // shift the decimal one place + if(newfreq < 10000) + change_frequency = newfreq + set_temp("-% New frequency to change to assigned: \"[newfreq] GHz\" %-", "average") + else + change_frequency = 0 + set_temp("-% Frequency changing deactivated %-", "average") + + +// BROADCASTER +/obj/machinery/telecomms/broadcaster/Options_Menu() + var/list/data = ..() + data["use_broadcast_range"] = TRUE + data["range"] = overmap_range + data["minRange"] = overmap_range_min + data["maxRange"] = overmap_range_max + return data + +/obj/machinery/telecomms/broadcaster + interact_offline = TRUE // because you can accidentally nuke power grids with these, need to be able to fix mistake + +/obj/machinery/telecomms/broadcaster/Options_Act(action, params) + if(..()) + return TRUE + + switch(action) + if("range") + var/new_range = params["range"] + overmap_range = clamp(new_range, overmap_range_min, overmap_range_max) + update_idle_power_usage(initial(idle_power_usage)**(overmap_range+1)) + +// RECEIVER +/obj/machinery/telecomms/receiver/Options_Menu() + var/list/data = ..() + data["use_receive_range"] = TRUE + data["range"] = overmap_range + data["minRange"] = overmap_range_min + data["maxRange"] = overmap_range_max + return data + +/obj/machinery/telecomms/receiver + interact_offline = TRUE // because you can accidentally nuke power grids with these, need to be able to fix mistake + +/obj/machinery/telecomms/receiver/Options_Act(action, params) + if(..()) + return TRUE + + switch(action) + if("range") + var/new_range = params["range"] + overmap_range = clamp(new_range, overmap_range_min, overmap_range_max) + update_idle_power_usage(initial(idle_power_usage)**(overmap_range+1)) + +/obj/machinery/telecomms/tgui_act(action, params) + if(..()) + return TRUE + + var/obj/item/device/multitool/P = get_multitool(usr) + + switch(action) + if("toggle") + src.toggled = !src.toggled + set_temp("-% [src] has been [src.toggled ? "activated" : "deactivated"].", "average") + update_power() + . = TRUE + + if("id") + var/newid = copytext(reject_bad_text(tgui_input_text(usr, "Specify the new ID for this machine", src, id)),1,MAX_MESSAGE_LEN) + if(newid && canAccess(usr)) + id = newid + set_temp("-% New ID assigned: \"[id]\" %-", "average") + . = TRUE + + if("network") + var/newnet = tgui_input_text(usr, "Specify the new network for this machine. This will break all current links.", src, network) + if(newnet && canAccess(usr)) + + if(length(newnet) > 15) + set_temp("-% Too many characters in new network tag %-", "average") + + else + for(var/obj/machinery/telecomms/T in links) + T.links.Remove(src) + + network = newnet + links = list() + set_temp("-% New network tag assigned: \"[network]\" %-", "average") + . = TRUE + + + if("freq") + var/newfreq = input(usr, "Specify a new frequency to filter (GHz). Decimals assigned automatically.", src, network) as null|num + if(newfreq && canAccess(usr)) + if(findtext(num2text(newfreq), ".")) + newfreq *= 10 // shift the decimal one place + if(!(newfreq in freq_listening) && newfreq < 10000) + freq_listening.Add(newfreq) + set_temp("-% New frequency filter assigned: \"[newfreq] GHz\" %-", "average") + . = TRUE + + if("delete") + var/x = text2num(params["delete"]) + set_temp("-% Removed frequency filter [x] %-", "average") + freq_listening.Remove(x) + . = TRUE + + if("unlink") + if(text2num(params["unlink"]) <= length(links)) + var/obj/machinery/telecomms/T = links[text2num(params["unlink"])] + set_temp("-% Removed \ref[T] [T.name] from linked entities. %-", "average") + + // Remove link entries from both T and src. + + if(src in T.links) + T.links.Remove(src) + links.Remove(T) + . = TRUE + + if("link") + if(P) + if(P.buffer && P.buffer != src) + /*if(!(src in P.buffer.links)) //YW EDIT: aac + P.buffer.links.Add(src) + + if(!(P.buffer in src.links)) + src.links.Add(P.buffer)*/ + + set_temp("-% Successfully linked with \ref[P.buffer] [P.buffer.name] %-", "average") + + else + set_temp("-% Unable to acquire buffer %-", "average") + . = TRUE + + if("buffer") + P.buffer = src + set_temp("-% Successfully stored \ref[P.buffer] [P.buffer.name] in buffer %-", "average") + . = TRUE + + if("flush") + set_temp("-% Buffer successfully flushed. %-", "average") + P.buffer = null + . = TRUE + + if("cleartemp") + temp = null + . = TRUE + + if(Options_Act(action, params)) + . = TRUE + + add_fingerprint(usr) + +/obj/machinery/telecomms/proc/canAccess(var/mob/user) + if(issilicon(user) || in_range(user, src)) + return 1 + return 0 + +/obj/machinery/telecomms/proc/set_temp(var/text, var/color = "average") + temp = list("color" = color, "text" = text) + +#undef TELECOMM_Z +#undef STATION_Z diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index 384790e60d..3014474b8e 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -26,13 +26,13 @@ data["network"] = network data["temp"] = temp - var/list/machinelistData = list() + var/list/machinelistData = list() for(var/obj/machinery/telecomms/T in machinelist) - machinelistData.Add(list(list( + machinelistData.Add(list(list( "id" = T.id, "name" = T.name, ))) - data["machinelist"] = machinelistData + data["machinelist"] = machinelistData data["selectedMachine"] = null if(SelectedMachine) @@ -100,7 +100,7 @@ . = TRUE if("network") - var/newnet = input(usr, "Which network do you want to view?", "Comm Monitor", network) as null|text + var/newnet = tgui_input_text(usr, "Which network do you want to view?", "Comm Monitor", network) if(newnet && ((usr in range(1, src) || issilicon(usr)))) if(length(newnet) > 15) set_temp("FAILED: NETWORK TAG STRING TOO LENGTHY", "bad") diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 4565ab1668..cf7f9946aa 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -192,7 +192,7 @@ if(href_list["network"]) - var/newnet = input(usr, "Which network do you want to view?", "Comm Monitor", network) as null|text + var/newnet = tgui_input_text(usr, "Which network do you want to view?", "Comm Monitor", network) if(newnet && ((usr in range(1, src) || issilicon(usr)))) if(length(newnet) > 15) diff --git a/code/game/machinery/virtual_reality/ar_console.dm b/code/game/machinery/virtual_reality/ar_console.dm index 6cf182e106..904c439596 100644 --- a/code/game/machinery/virtual_reality/ar_console.dm +++ b/code/game/machinery/virtual_reality/ar_console.dm @@ -103,7 +103,7 @@ occupant.enter_vr(avatar) - var/newname = sanitize(input(avatar, "Your mind feels foggy. You're certain your name is [occupant.real_name], but it could also be [avatar.name]. Would you like to change it to something else?", "Name change") as null|text, MAX_NAME_LEN) + var/newname = sanitize(tgui_input_text(avatar, "Your mind feels foggy. You're certain your name is [occupant.real_name], but it could also be [avatar.name]. Would you like to change it to something else?", "Name change", null, MAX_NAME_LEN), MAX_NAME_LEN) if (newname) avatar.real_name = newname @@ -113,7 +113,7 @@ else // There's only one body per one of these pods, so let's be kind. - var/newname = sanitize(input(avatar, "Your mind feels foggy. You're certain your name is [occupant.real_name], but it feels like it is [avatar.name]. Would you like to change it to something else?", "Name change") as null|text, MAX_NAME_LEN) + var/newname = sanitize(tgui_input_text(avatar, "Your mind feels foggy. You're certain your name is [occupant.real_name], but it feels like it is [avatar.name]. Would you like to change it to something else?", "Name change", null, MAX_NAME_LEN), MAX_NAME_LEN) if(newname) avatar.real_name = newname diff --git a/code/game/machinery/virtual_reality/vr_console.dm b/code/game/machinery/virtual_reality/vr_console.dm index 4a83de34d3..9d165cc7e3 100644 --- a/code/game/machinery/virtual_reality/vr_console.dm +++ b/code/game/machinery/virtual_reality/vr_console.dm @@ -250,7 +250,7 @@ occupant.enter_vr(avatar) // Prompt for username after they've enterred the body. - var/newname = sanitize(input(avatar, "You are entering virtual reality. Your username is currently [src.name]. Would you like to change it to something else?", "Name change") as null|text, MAX_NAME_LEN) + var/newname = sanitize(tgui_input_text(avatar, "You are entering virtual reality. Your username is currently [src.name]. Would you like to change it to something else?", "Name change", null, MAX_NAME_LEN), MAX_NAME_LEN) if (newname) avatar.real_name = newname diff --git a/code/game/magic/archived_book.dm b/code/game/magic/archived_book.dm index ed77f3c90b..1aab354815 100644 --- a/code/game/magic/archived_book.dm +++ b/code/game/magic/archived_book.dm @@ -40,7 +40,7 @@ var/global/datum/book_manager/book_mgr = new() to_chat(src, "Only administrators may use this command.") return - var/isbn = input(usr, "ISBN number?", "Delete Book") as num | null + var/isbn = tgui_input_number(usr, "ISBN number?", "Delete Book") if(!isbn) return diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 01f8a5ef6d..9852db29d5 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -91,4 +91,10 @@ if(!isnull(M.accuracy)) P.accuracy += M.accuracy if(!isnull(M.accuracy_dispersion)) - P.dispersion = max(P.dispersion + M.accuracy_dispersion, 0) \ No newline at end of file + P.dispersion = max(P.dispersion + M.accuracy_dispersion, 0) + + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(H.species) + P.accuracy += H.species.gun_accuracy_mod + P.dispersion = max(P.dispersion + H.species.gun_accuracy_dispersion_mod, 0) \ No newline at end of file diff --git a/code/game/mecha/mech_prosthetics.dm b/code/game/mecha/mech_prosthetics.dm index 3be1fdeec7..2c58350cf9 100644 --- a/code/game/mecha/mech_prosthetics.dm +++ b/code/game/mecha/mech_prosthetics.dm @@ -61,6 +61,7 @@ "Cyborg Parts", "Cyborg Internals", "Cybernetics", + "pAI Parts", //VOREStation Add "Implants", "Control Interfaces", "Other", diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 3c428580f3..8b5b53b168 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -2551,7 +2551,7 @@ return if (href_list["change_name"]) if(usr != src.occupant) return - var/newname = sanitizeSafe(input(occupant,"Choose new exosuit name","Rename exosuit",initial(name)) as text, MAX_NAME_LEN) + var/newname = sanitizeSafe(tgui_input_text(occupant,"Choose new exosuit name","Rename exosuit",initial(name), MAX_NAME_LEN), MAX_NAME_LEN) if(newname) name = newname else @@ -2590,7 +2590,7 @@ if(!in_range(src, usr)) return var/mob/user = top_filter.getMob("user") if(user) - var/new_pressure = input(user,"Input new output pressure","Pressure setting",internal_tank_valve) as num + var/new_pressure = tgui_input_number(user,"Input new output pressure","Pressure setting",internal_tank_valve) if(new_pressure) internal_tank_valve = new_pressure to_chat(user, "The internal pressure valve has been set to [internal_tank_valve]kPa.") diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index aa5226c172..1c5003ac95 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -48,7 +48,7 @@ if("send_message") var/obj/item/mecha_parts/mecha_tracking/MT = locate(params["mt"]) if(istype(MT)) - var/message = sanitize(input(usr, "Input message", "Transmit message") as text) + var/message = sanitize(tgui_input_text(usr, "Input message", "Transmit message")) var/obj/mecha/M = MT.in_mecha() if(message && M) M.occupant_message(message) diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index b3b22fc082..c7fc6962ba 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -7,13 +7,13 @@ var/obj/effect/spawner/newbomb/proto = /obj/effect/spawner/newbomb/radio/custom - var/p = input(usr, "Enter phoron amount (mol):","Phoron", initial(proto.phoron_amt)) as num|null + var/p = tgui_input_number(usr, "Enter phoron amount (mol):","Phoron", initial(proto.phoron_amt)) if(p == null) return - var/o = input(usr, "Enter oxygen amount (mol):","Oxygen", initial(proto.oxygen_amt)) as num|null + var/o = tgui_input_number(usr, "Enter oxygen amount (mol):","Oxygen", initial(proto.oxygen_amt)) if(o == null) return - var/c = input(usr, "Enter carbon dioxide amount (mol):","Carbon Dioxide", initial(proto.carbon_amt)) as num|null + var/c = tgui_input_number(usr, "Enter carbon dioxide amount (mol):","Carbon Dioxide", initial(proto.carbon_amt)) if(c == null) return new /obj/effect/spawner/newbomb/radio/custom(get_turf(mob), p, o, c) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 751d09b8e8..c92bacbb79 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -269,7 +269,7 @@ walk_to(src, target_atom, 5) if(prob(25)) src.visible_message("\The [src] skitters[pick(" away"," around","")].") - else if(prob(5)) + else if(amount_grown < 75 && prob(5)) //vent crawl! for(var/obj/machinery/atmospherics/unary/vent_pump/v in view(7,src)) if(!v.welded) diff --git a/code/game/objects/explosion_recursive.dm b/code/game/objects/explosion_recursive.dm index 400820f49f..a8067805a2 100644 --- a/code/game/objects/explosion_recursive.dm +++ b/code/game/objects/explosion_recursive.dm @@ -1,5 +1,5 @@ /client/proc/kaboom() - var/power = input(src, "power?", "power?") as num + var/power = tgui_input_number(src, "power?", "power?") var/turf/T = get_turf(src.mob) explosion_rec(T, power) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index bdaf5f7d75..c743a60c80 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -812,8 +812,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. standing.alpha = alpha standing.color = color standing.layer = layer2use - if(istype(clip_mask)) //VOREStation Edit - For taur bodies/tails clipping off parts of uniforms and suits. - standing.filters += filter(type = "alpha", icon = clip_mask) if(istype(clip_mask)) //For taur bodies/tails clipping off parts of uniforms and suits. standing.filters += filter(type = "alpha", icon = clip_mask) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 19fb0fa04d..31039c7fbc 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -148,7 +148,7 @@ to_chat(usr, "Error! Please notify administration!") return var/list/turf/turfs = res - var/str = sanitizeSafe(input(usr, "New area name:","Blueprint Editing", ""), MAX_NAME_LEN) + var/str = sanitizeSafe(tgui_input_text(usr, "New area name:","Blueprint Editing", "", MAX_NAME_LEN), MAX_NAME_LEN) if(!str || !length(str)) //cancel return if(length(str) > 50) @@ -207,7 +207,7 @@ /obj/item/blueprints/proc/edit_area() var/area/A = get_area() var/prevname = "[A.name]" - var/str = sanitizeSafe(input(usr, "New area name:","Blueprint Editing", prevname), MAX_NAME_LEN) + var/str = sanitizeSafe(tgui_input_text(usr, "New area name:","Blueprint Editing", prevname, MAX_NAME_LEN), MAX_NAME_LEN) if(!str || !length(str) || str==prevname) //cancel return if(length(str) > 50) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 18c152c770..06099b325a 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -1,283 +1,283 @@ -//Also contains /obj/structure/closet/body_bag because I doubt anyone would think to look for bodybags in /object/structures - -/obj/item/bodybag - name = "body bag" - desc = "A folded bag designed for the storage and transportation of cadavers." - icon = 'icons/obj/closets/bodybag.dmi' - icon_state = "bodybag_folded" - w_class = ITEMSIZE_SMALL - -/obj/item/bodybag/attack_self(mob/user) - var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc) - R.add_fingerprint(user) - qdel(src) - - -/obj/item/weapon/storage/box/bodybags - name = "body bags" - desc = "This box contains body bags." - icon_state = "bodybags" - starts_with = list(/obj/item/bodybag = 7) - -/obj/structure/closet/body_bag - name = "body bag" - desc = "A plastic bag designed for the storage and transportation of cadavers." - icon = 'icons/obj/closets/bodybag.dmi' - closet_appearance = null - open_sound = 'sound/items/zip.ogg' - close_sound = 'sound/items/zip.ogg' - var/item_path = /obj/item/bodybag - density = FALSE - storage_capacity = (MOB_MEDIUM * 2) - 1 - var/contains_body = 0 - -//Yawn add -/obj/item/bodybag/large - name = "mass grave body bag" - desc = "A large folded bag designed for the storage and transportation of cadavers." - icon = 'icons/obj/closets/bodybag_large.dmi' - w_class = ITEMSIZE_LARGE - -/obj/item/bodybag/large/attack_self(mob/user) - var/obj/structure/closet/body_bag/large/R = new /obj/structure/closet/body_bag/large(user.loc) - R.add_fingerprint(user) - qdel(src) - -/obj/structure/closet/body_bag/large - name = "mass grave body bag" - desc = "A massive body bag that holds as much as it does due to bluespace lining on its zipper. Shockingly compact for its storage." - icon = 'icons/obj/closets/bodybag_large.dmi' - storage_capacity = (MOB_MEDIUM * 12) - 1 //Holds 12 bodys - item_path = /obj/item/bodybag/large -//End of Yawn add - -/obj/structure/closet/body_bag/attackby(var/obj/item/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/pen)) - var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text - if (user.get_active_hand() != W) - return - if (!in_range(src, user) && src.loc != user) - return - t = sanitizeSafe(t, MAX_NAME_LEN) - if (t) - src.name = "body bag - " - src.name += t - add_overlay("bodybag_label") - else - src.name = "body bag" - //..() //Doesn't need to run the parent. Since when can fucking bodybags be welded shut? -Agouri - return - else if(W.is_wirecutter()) - to_chat(user, "You cut the tag off the bodybag") - src.name = "body bag" - cut_overlays() - return - -/obj/structure/closet/body_bag/store_mobs(var/stored_units) - contains_body = ..() - return contains_body - -/obj/structure/closet/body_bag/close() - if(..()) - density = FALSE - return 1 - return 0 - -/obj/structure/closet/body_bag/MouseDrop(over_object, src_location, over_location) - ..() - if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) - if(!ishuman(usr)) return 0 - if(opened) return 0 - if(contents.len) return 0 - visible_message("[usr] folds up the [src.name]") - var/folded = new item_path(get_turf(src)) - spawn(0) - qdel(src) - return folded - -/obj/structure/closet/body_bag/relaymove(mob/user,direction) - if(src.loc != get_turf(src)) - src.loc.relaymove(user,direction) - else - ..() - -/obj/structure/closet/body_bag/proc/get_occupants() - var/list/occupants = list() - for(var/mob/living/carbon/human/H in contents) - occupants += H - return occupants - -/obj/structure/closet/body_bag/proc/update(var/broadcast=0) - if(istype(loc, /obj/structure/morgue)) - var/obj/structure/morgue/M = loc - M.update(broadcast) - -/obj/structure/closet/body_bag/update_icon() - if(opened) - icon_state = "open" - else - icon_state = "closed_unlocked" - - cut_overlays() - /* Ours don't have toetags - if(has_label) - add_overlay("bodybag_label") - */ - - -/obj/item/bodybag/cryobag - name = "stasis bag" - desc = "A non-reusable plastic bag designed to slow down bodily functions such as circulation and breathing, \ - especially useful if short on time or in a hostile enviroment." - icon = 'icons/obj/closets/cryobag.dmi' - icon_state = "bodybag_folded" - item_state = "bodybag_cryo_folded" - origin_tech = list(TECH_BIO = 4) - var/obj/item/weapon/reagent_containers/syringe/syringe - -/obj/item/bodybag/cryobag/attack_self(mob/user) - var/obj/structure/closet/body_bag/cryobag/R = new /obj/structure/closet/body_bag/cryobag(user.loc) - R.add_fingerprint(user) - if(syringe) - R.syringe = syringe - syringe = null - qdel(src) - -/obj/structure/closet/body_bag/cryobag - name = "stasis bag" - desc = "A non-reusable plastic bag designed to slow down bodily functions such as circulation and breathing, \ - especially useful if short on time or in a hostile enviroment." - icon = 'icons/obj/closets/cryobag.dmi' - item_path = /obj/item/bodybag/cryobag - store_misc = 0 - store_items = 0 - var/used = 0 - var/obj/item/weapon/tank/tank = null - var/tank_type = /obj/item/weapon/tank/stasis/oxygen - var/stasis_level = 3 //Every 'this' life ticks are applied to the mob (when life_ticks%stasis_level == 1) - var/obj/item/weapon/reagent_containers/syringe/syringe - -/obj/structure/closet/body_bag/cryobag/Initialize() - tank = new tank_type(null) //It's in nullspace to prevent ejection when the bag is opened. - ..() - -/obj/structure/closet/body_bag/cryobag/Destroy() - QDEL_NULL(syringe) - QDEL_NULL(tank) - return ..() - -/obj/structure/closet/body_bag/cryobag/attack_hand(mob/living/user) - if(used) - var/confirm = tgui_alert(user, "Are you sure you want to open \the [src]? \The [src] will expire upon opening it.", "Confirm Opening", list("No", "Yes")) - if(confirm == "Yes") - ..() // Will call `toggle()` and open the bag. - else - ..() - -/obj/structure/closet/body_bag/cryobag/open() - . = ..() - if(used) - new /obj/item/usedcryobag(loc) - qdel(src) - -/obj/structure/closet/body_bag/cryobag/update_icon() - ..() - cut_overlays() - var/image/I = image(icon, "indicator[opened]") - I.appearance_flags = RESET_COLOR - I.color = COLOR_LIME - add_overlay(I) - -/obj/structure/closet/body_bag/cryobag/MouseDrop(over_object, src_location, over_location) - . = ..() - if(. && syringe) - var/obj/item/bodybag/cryobag/folded = . - folded.syringe = syringe - syringe = null - -/obj/structure/closet/body_bag/cryobag/Entered(atom/movable/AM) - if(ishuman(AM)) - var/mob/living/carbon/human/H = AM - H.Stasis(stasis_level) - src.used = 1 - inject_occupant(H) - - if(istype(AM, /obj/item/organ)) - var/obj/item/organ/O = AM - O.preserved = 1 - for(var/obj/item/organ/organ in O) - organ.preserved = 1 - ..() - -/obj/structure/closet/body_bag/cryobag/Exited(atom/movable/AM) - if(ishuman(AM)) - var/mob/living/carbon/human/H = AM - H.Stasis(0) - - if(istype(AM, /obj/item/organ)) - var/obj/item/organ/O = AM - O.preserved = 0 - for(var/obj/item/organ/organ in O) - organ.preserved = 0 - ..() - -/obj/structure/closet/body_bag/cryobag/return_air() //Used to make stasis bags protect from vacuum. - if(tank) - return tank.air_contents - ..() - -/obj/structure/closet/body_bag/cryobag/proc/inject_occupant(var/mob/living/carbon/human/H) - if(!syringe) - return - - if(H.reagents) - syringe.reagents.trans_to_mob(H, 30, CHEM_BLOOD) - -/obj/structure/closet/body_bag/cryobag/examine(mob/user) - . = ..() - if(Adjacent(user)) //The bag's rather thick and opaque from a distance. - . += "You peer into \the [src]." - if(syringe) - . += "It has a syringe added to it." - for(var/mob/living/L in contents) - . += L.examine(user) - -/obj/structure/closet/body_bag/cryobag/attackby(obj/item/W, mob/user) - if(opened) - ..() - else //Allows the bag to respond to a health analyzer by analyzing the mob inside without needing to open it. - if(istype(W,/obj/item/device/healthanalyzer)) - var/obj/item/device/healthanalyzer/analyzer = W - for(var/mob/living/L in contents) - analyzer.attack(L,user) - - else if(istype(W,/obj/item/weapon/reagent_containers/syringe)) - if(syringe) - to_chat(user,"\The [src] already has an injector! Remove it first.") - else - var/obj/item/weapon/reagent_containers/syringe/syringe = W - to_chat(user,"You insert \the [syringe] into \the [src], and it locks into place.") - user.unEquip(syringe) - src.syringe = syringe - syringe.loc = null - for(var/mob/living/carbon/human/H in contents) - inject_occupant(H) - break - - else if(W.is_screwdriver()) - if(syringe) - if(used) - to_chat(user,"The injector cannot be removed now that the stasis bag has been used!") - else - syringe.forceMove(src.loc) - to_chat(user,"You pry \the [syringe] out of \the [src].") - syringe = null - - else - ..() - -/obj/item/usedcryobag - name = "used stasis bag" - desc = "Pretty useless now.." - icon_state = "bodybag_used" - icon = 'icons/obj/closets/cryobag.dmi' +//Also contains /obj/structure/closet/body_bag because I doubt anyone would think to look for bodybags in /object/structures + +/obj/item/bodybag + name = "body bag" + desc = "A folded bag designed for the storage and transportation of cadavers." + icon = 'icons/obj/closets/bodybag.dmi' + icon_state = "bodybag_folded" + w_class = ITEMSIZE_SMALL + +/obj/item/bodybag/attack_self(mob/user) + var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc) + R.add_fingerprint(user) + qdel(src) + + +/obj/item/weapon/storage/box/bodybags + name = "body bags" + desc = "This box contains body bags." + icon_state = "bodybags" + starts_with = list(/obj/item/bodybag = 7) + +/obj/structure/closet/body_bag + name = "body bag" + desc = "A plastic bag designed for the storage and transportation of cadavers." + icon = 'icons/obj/closets/bodybag.dmi' + closet_appearance = null + open_sound = 'sound/items/zip.ogg' + close_sound = 'sound/items/zip.ogg' + var/item_path = /obj/item/bodybag + density = FALSE + storage_capacity = (MOB_MEDIUM * 2) - 1 + var/contains_body = 0 + +//Yawn add +/obj/item/bodybag/large + name = "mass grave body bag" + desc = "A large folded bag designed for the storage and transportation of cadavers." + icon = 'icons/obj/closets/bodybag_large.dmi' + w_class = ITEMSIZE_LARGE + +/obj/item/bodybag/large/attack_self(mob/user) + var/obj/structure/closet/body_bag/large/R = new /obj/structure/closet/body_bag/large(user.loc) + R.add_fingerprint(user) + qdel(src) + +/obj/structure/closet/body_bag/large + name = "mass grave body bag" + desc = "A massive body bag that holds as much as it does due to bluespace lining on its zipper. Shockingly compact for its storage." + icon = 'icons/obj/closets/bodybag_large.dmi' + storage_capacity = (MOB_MEDIUM * 12) - 1 //Holds 12 bodys + item_path = /obj/item/bodybag/large +//End of Yawn add + +/obj/structure/closet/body_bag/attackby(var/obj/item/W as obj, mob/user as mob) + if (istype(W, /obj/item/weapon/pen)) + var/t = tgui_input_text(user, "What would you like the label to be?", text("[]", src.name), null) + if (user.get_active_hand() != W) + return + if (!in_range(src, user) && src.loc != user) + return + t = sanitizeSafe(t, MAX_NAME_LEN) + if (t) + src.name = "body bag - " + src.name += t + add_overlay("bodybag_label") + else + src.name = "body bag" + //..() //Doesn't need to run the parent. Since when can fucking bodybags be welded shut? -Agouri + return + else if(W.is_wirecutter()) + to_chat(user, "You cut the tag off the bodybag") + src.name = "body bag" + cut_overlays() + return + +/obj/structure/closet/body_bag/store_mobs(var/stored_units) + contains_body = ..() + return contains_body + +/obj/structure/closet/body_bag/close() + if(..()) + density = FALSE + return 1 + return 0 + +/obj/structure/closet/body_bag/MouseDrop(over_object, src_location, over_location) + ..() + if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) + if(!ishuman(usr)) return 0 + if(opened) return 0 + if(contents.len) return 0 + visible_message("[usr] folds up the [src.name]") + var/folded = new item_path(get_turf(src)) + spawn(0) + qdel(src) + return folded + +/obj/structure/closet/body_bag/relaymove(mob/user,direction) + if(src.loc != get_turf(src)) + src.loc.relaymove(user,direction) + else + ..() + +/obj/structure/closet/body_bag/proc/get_occupants() + var/list/occupants = list() + for(var/mob/living/carbon/human/H in contents) + occupants += H + return occupants + +/obj/structure/closet/body_bag/proc/update(var/broadcast=0) + if(istype(loc, /obj/structure/morgue)) + var/obj/structure/morgue/M = loc + M.update(broadcast) + +/obj/structure/closet/body_bag/update_icon() + if(opened) + icon_state = "open" + else + icon_state = "closed_unlocked" + + cut_overlays() + /* Ours don't have toetags + if(has_label) + add_overlay("bodybag_label") + */ + + +/obj/item/bodybag/cryobag + name = "stasis bag" + desc = "A non-reusable plastic bag designed to slow down bodily functions such as circulation and breathing, \ + especially useful if short on time or in a hostile enviroment." + icon = 'icons/obj/closets/cryobag.dmi' + icon_state = "bodybag_folded" + item_state = "bodybag_cryo_folded" + origin_tech = list(TECH_BIO = 4) + var/obj/item/weapon/reagent_containers/syringe/syringe + +/obj/item/bodybag/cryobag/attack_self(mob/user) + var/obj/structure/closet/body_bag/cryobag/R = new /obj/structure/closet/body_bag/cryobag(user.loc) + R.add_fingerprint(user) + if(syringe) + R.syringe = syringe + syringe = null + qdel(src) + +/obj/structure/closet/body_bag/cryobag + name = "stasis bag" + desc = "A non-reusable plastic bag designed to slow down bodily functions such as circulation and breathing, \ + especially useful if short on time or in a hostile enviroment." + icon = 'icons/obj/closets/cryobag.dmi' + item_path = /obj/item/bodybag/cryobag + store_misc = 0 + store_items = 0 + var/used = 0 + var/obj/item/weapon/tank/tank = null + var/tank_type = /obj/item/weapon/tank/stasis/oxygen + var/stasis_level = 3 //Every 'this' life ticks are applied to the mob (when life_ticks%stasis_level == 1) + var/obj/item/weapon/reagent_containers/syringe/syringe + +/obj/structure/closet/body_bag/cryobag/Initialize() + tank = new tank_type(null) //It's in nullspace to prevent ejection when the bag is opened. + ..() + +/obj/structure/closet/body_bag/cryobag/Destroy() + QDEL_NULL(syringe) + QDEL_NULL(tank) + return ..() + +/obj/structure/closet/body_bag/cryobag/attack_hand(mob/living/user) + if(used) + var/confirm = tgui_alert(user, "Are you sure you want to open \the [src]? \The [src] will expire upon opening it.", "Confirm Opening", list("No", "Yes")) + if(confirm == "Yes") + ..() // Will call `toggle()` and open the bag. + else + ..() + +/obj/structure/closet/body_bag/cryobag/open() + . = ..() + if(used) + new /obj/item/usedcryobag(loc) + qdel(src) + +/obj/structure/closet/body_bag/cryobag/update_icon() + ..() + cut_overlays() + var/image/I = image(icon, "indicator[opened]") + I.appearance_flags = RESET_COLOR + I.color = COLOR_LIME + add_overlay(I) + +/obj/structure/closet/body_bag/cryobag/MouseDrop(over_object, src_location, over_location) + . = ..() + if(. && syringe) + var/obj/item/bodybag/cryobag/folded = . + folded.syringe = syringe + syringe = null + +/obj/structure/closet/body_bag/cryobag/Entered(atom/movable/AM) + if(ishuman(AM)) + var/mob/living/carbon/human/H = AM + H.Stasis(stasis_level) + src.used = 1 + inject_occupant(H) + + if(istype(AM, /obj/item/organ)) + var/obj/item/organ/O = AM + O.preserved = 1 + for(var/obj/item/organ/organ in O) + organ.preserved = 1 + ..() + +/obj/structure/closet/body_bag/cryobag/Exited(atom/movable/AM) + if(ishuman(AM)) + var/mob/living/carbon/human/H = AM + H.Stasis(0) + + if(istype(AM, /obj/item/organ)) + var/obj/item/organ/O = AM + O.preserved = 0 + for(var/obj/item/organ/organ in O) + organ.preserved = 0 + ..() + +/obj/structure/closet/body_bag/cryobag/return_air() //Used to make stasis bags protect from vacuum. + if(tank) + return tank.air_contents + ..() + +/obj/structure/closet/body_bag/cryobag/proc/inject_occupant(var/mob/living/carbon/human/H) + if(!syringe) + return + + if(H.reagents) + syringe.reagents.trans_to_mob(H, 30, CHEM_BLOOD) + +/obj/structure/closet/body_bag/cryobag/examine(mob/user) + . = ..() + if(Adjacent(user)) //The bag's rather thick and opaque from a distance. + . += "You peer into \the [src]." + if(syringe) + . += "It has a syringe added to it." + for(var/mob/living/L in contents) + . += L.examine(user) + +/obj/structure/closet/body_bag/cryobag/attackby(obj/item/W, mob/user) + if(opened) + ..() + else //Allows the bag to respond to a health analyzer by analyzing the mob inside without needing to open it. + if(istype(W,/obj/item/device/healthanalyzer)) + var/obj/item/device/healthanalyzer/analyzer = W + for(var/mob/living/L in contents) + analyzer.attack(L,user) + + else if(istype(W,/obj/item/weapon/reagent_containers/syringe)) + if(syringe) + to_chat(user,"\The [src] already has an injector! Remove it first.") + else + var/obj/item/weapon/reagent_containers/syringe/syringe = W + to_chat(user,"You insert \the [syringe] into \the [src], and it locks into place.") + user.unEquip(syringe) + src.syringe = syringe + syringe.loc = null + for(var/mob/living/carbon/human/H in contents) + inject_occupant(H) + break + + else if(W.is_screwdriver()) + if(syringe) + if(used) + to_chat(user,"The injector cannot be removed now that the stasis bag has been used!") + else + syringe.forceMove(src.loc) + to_chat(user,"You pry \the [syringe] out of \the [src].") + syringe = null + + else + ..() + +/obj/item/usedcryobag + name = "used stasis bag" + desc = "Pretty useless now.." + icon_state = "bodybag_used" + icon = 'icons/obj/closets/cryobag.dmi' diff --git a/code/game/objects/items/devices/communicator/UI_tgui.dm b/code/game/objects/items/devices/communicator/UI_tgui.dm index d9c4e3b7ce..f3f13663d8 100644 --- a/code/game/objects/items/devices/communicator/UI_tgui.dm +++ b/code/game/objects/items/devices/communicator/UI_tgui.dm @@ -85,7 +85,7 @@ cam_screen.vis_contents = visible_turfs cam_background.icon_state = "clear" cam_background.fill_rect(1, 1, (video_range * 2), (video_range * 2)) - + local_skybox.cut_overlays() local_skybox.add_overlay(SSskybox.get_skybox(get_z(last_camera_turf))) local_skybox.scale_to_view(video_range * 2) @@ -322,7 +322,7 @@ . = TRUE switch(action) if("rename") - var/new_name = sanitizeSafe(input(usr,"Please enter your name.","Communicator",usr.name) ) + var/new_name = sanitizeSafe(tgui_input_text(usr,"Please enter your name.","Communicator",usr.name) ) if(new_name) register_device(new_name) @@ -376,11 +376,13 @@ to_chat(usr, "Error: Cannot connect to Exonet node.") return FALSE var/their_address = params["message"] - var/text = sanitizeSafe(input(usr,"Enter your message.","Text Message")) + var/text = sanitizeSafe(tgui_input_text(usr,"Enter your message.","Text Message")) if(text) exonet.send_message(their_address, "text", text) im_list += list(list("address" = exonet.address, "to_address" = their_address, "im" = text)) log_pda("(COMM: [src]) sent \"[text]\" to [exonet.get_atom_from_address(their_address)]", usr) + var/obj/item/device/communicator/comm = exonet.get_atom_from_address(their_address) + to_chat(usr, "[bicon(src)] Sent message to [comm.owner], \"[text]\" (Reply)") for(var/mob/M in player_list) if(M.stat == DEAD && M.is_preference_enabled(/datum/client_preference/ghost_ears)) if(istype(M, /mob/new_player) || M.forbid_seeing_deadchat) @@ -424,7 +426,7 @@ selected_tab = params["switch_tab"] if("edit") - var/n = input(usr, "Please enter message", name, notehtml) as message|null + var/n = tgui_input_text(usr, "Please enter message", name, notehtml, multiline = TRUE, prevent_enter = TRUE) n = sanitizeSafe(n, extra = 0) if(n) note = html_decode(n) diff --git a/code/game/objects/items/devices/communicator/messaging.dm b/code/game/objects/items/devices/communicator/messaging.dm index 4195d1db98..bcfe1cf0c3 100644 --- a/code/game/objects/items/devices/communicator/messaging.dm +++ b/code/game/objects/items/devices/communicator/messaging.dm @@ -57,7 +57,7 @@ var/who = null if(isobserver(candidate)) var/mob/observer/dead/ghost = candidate - who = ghost + who = ghost.name im_list += list(list("address" = origin_address, "to_address" = exonet.address, "im" = text)) else if(istype(candidate, /obj/item/device/communicator)) var/obj/item/device/communicator/comm = candidate @@ -95,7 +95,20 @@ L = loc if(L) - to_chat(L, "[bicon(src)] Message from [who].") + to_chat(L, "[bicon(src)] Message from [who]: \"[text]\" (Reply)") + +// This is the only Topic the communicators really uses +/obj/item/device/communicator/Topic(href, href_list) + switch(href_list["action"]) + if("Reply") + var/obj/item/device/communicator/comm = locate(href_list["target"]) + var/message = tgui_input_text(usr, "Enter your message below.", "Reply") + + if(message) + exonet.send_message(comm.exonet.address, "text", message) + im_list += list(list("address" = exonet.address, "to_address" = comm.exonet.address, "im" = message)) + log_pda("(COMM: [src]) sent \"[message]\" to [exonet.get_atom_from_address(comm.exonet.address)]", usr) + to_chat(usr, "[bicon(src)] Sent message to [comm.owner], \"[message]\" (Reply)") // Verb: text_communicator() // Parameters: None @@ -140,7 +153,7 @@ if(choice) var/obj/item/device/communicator/chosen_communicator = choice var/mob/observer/dead/O = src - var/text_message = sanitize(input(src, "What do you want the message to say?") as message) + var/text_message = sanitize(tgui_input_text(src, "What do you want the message to say?", multiline = TRUE)) if(text_message && O.exonet) O.exonet.send_message(chosen_communicator.exonet.address, "text", text_message) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 4a800e9292..f3f8b5c982 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -227,11 +227,12 @@ . = ..() if(!on) return - var/datum/component/overlay_lighting/OL = GetComponent(/datum/component/overlay_lighting) - if(!OL) - return - var/turf/T = get_turf(target) - OL.place_directional_light(T) + if(light_system == MOVABLE_LIGHT_DIRECTIONAL) + var/datum/component/overlay_lighting/OL = GetComponent(/datum/component/overlay_lighting) + if(!OL) + return + var/turf/T = get_turf(target) + OL.place_directional_light(T) /obj/item/device/flashlight/pen name = "penlight" diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index 4fb99a9fc0..21ec2ea3b6 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -323,7 +323,7 @@ var/list/GPS_list = list() . = TRUE if(href_list["tag"]) - var/a = input(usr, "Please enter desired tag.", name, gps_tag) as text + var/a = tgui_input_text(usr, "Please enter desired tag.", name, gps_tag) a = uppertext(copytext(sanitize(a), 1, 11)) if(in_range(src, usr)) gps_tag = a diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 55f92f0cc8..26d58082b6 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -40,7 +40,7 @@ user.audible_message("[user.GetVoice()][user.GetAltName()] broadcasts, \"[message]\"", runemessage = message) /obj/item/device/megaphone/attack_self(var/mob/living/user) - var/message = sanitize(input(user, "Shout a message?", "Megaphone", null) as text) + var/message = sanitize(tgui_input_text(user, "Shout a message?", "Megaphone", null)) if(!message) return message = capitalize(message) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 23d7452f3d..a944d8c172 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -1,3 +1,20 @@ +var/global/list/radio_channels_by_freq = list( + num2text(PUB_FREQ) = "Common", + num2text(AI_FREQ) = "AI Private", + num2text(ENT_FREQ) = "Entertainment", + num2text(ERT_FREQ) = "Response Team", + num2text(COMM_FREQ)= "Command", + num2text(ENG_FREQ) = "Engineering", + num2text(MED_FREQ) = "Medical", + num2text(MED_I_FREQ)="Medical(I)", + num2text(SEC_FREQ) = "Security", + num2text(SEC_I_FREQ)="Security(I)", + num2text(SCI_FREQ) = "Science", + num2text(SUP_FREQ) = "Supply", + num2text(SRV_FREQ) = "Service", + num2text(EXP_FREQ) = "Explorer" + ) + GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) /obj/item/device/paicard @@ -6,16 +23,18 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) icon_state = "pai" item_state = "electronic" w_class = ITEMSIZE_SMALL - slot_flags = SLOT_BELT + slot_flags = SLOT_BELT | SLOT_HOLSTER origin_tech = list(TECH_DATA = 2) show_messages = 0 preserve_item = 1 - var/obj/item/device/radio/radio + var/obj/item/device/radio/borg/pai/radio var/looking_for_personality = 0 var/mob/living/silicon/pai/pai var/image/screen_layer var/screen_color = "#00ff0d" + var/last_notify = 0 + var/screen_msg /obj/item/device/paicard/relaymove(var/mob/user, var/direction) if(user.stat || user.stunned) @@ -39,34 +58,86 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) /obj/item/device/paicard/attack_ghost(mob/user as mob) if(pai != null) //Have a person in them already? return ..() + if(is_damage_critical()) + to_chat(usr, "That card is too damaged to activate!") + return + var/time_till_respawn = user.time_till_respawn() + if(time_till_respawn == -1) // Special case, never allowed to respawn + to_chat(usr, "Respawning is not allowed!") + else if(time_till_respawn) // Nonzero time to respawn + to_chat(usr, "You can't do that yet! You died too recently. You need to wait another [round(time_till_respawn/10/60, 0.1)] minutes.") + return + if(jobban_isbanned(usr, "pAI")) + to_chat(usr,"You cannot join a pAI card when you are banned from playing as a pAI.") + return - var/choice = tgui_alert(user, "You sure you want to inhabit this PAI?", "Confirmation", list("Yes", "No")) - if(choice == "No") + for(var/ourkey in paikeys) + if(ourkey == user.ckey) + to_chat(usr, "You can't just rejoin any old pAI card!!! Your card still exists.") + return + + var/choice = tgui_alert(user, "You sure you want to inhabit this PAI, or submit yourself to being recruited?", "Confirmation", list("Inhabit", "Recruit", "Cancel")) + if(choice == "Cancel") return ..() - - var/pai_name = input(user, "Choose your character's name", "Character Name") as text - var/actual_pai_name = sanitize_name(pai_name, ,1) - if(isnull(actual_pai_name)) + if(choice == "Recruit") + paiController.recruitWindow(user) return ..() - + choice = tgui_alert(user, "Do you want to load your pAI data?", "Load", list("Yes", "No")) + var/actual_pai_name var/turf/location = get_turf(src) - if(istype(src , /obj/item/device/paicard/typeb)) - var/obj/item/device/paicard/typeb/card = new(location) - var/mob/living/silicon/pai/new_pai = new(card) - new_pai.key = user.key - card.setPersonality(new_pai) - new_pai.SetName(actual_pai_name) - else - var/obj/item/device/paicard/card = new(location) - var/mob/living/silicon/pai/new_pai = new(card) - new_pai.key = user.key - card.setPersonality(new_pai) - new_pai.SetName(actual_pai_name) + if(choice == "No") + var/pai_name = tgui_input_text(user, "Choose your character's name", "Character Name") + actual_pai_name = sanitize_name(pai_name, ,1) + if(isnull(actual_pai_name)) + return ..() + if(istype(src , /obj/item/device/paicard/typeb)) + var/obj/item/device/paicard/typeb/card = new(location) + var/mob/living/silicon/pai/new_pai = new(card) + new_pai.key = user.key + paikeys |= new_pai.ckey + card.setPersonality(new_pai) + new_pai.SetName(actual_pai_name) + else + var/obj/item/device/paicard/card = new(location) + var/mob/living/silicon/pai/new_pai = new(card) + new_pai.key = user.key + paikeys |= new_pai.ckey + card.setPersonality(new_pai) + new_pai.SetName(actual_pai_name) + + if(choice == "Yes") + if(istype(src , /obj/item/device/paicard/typeb)) + var/obj/item/device/paicard/typeb/card = new(location) + var/mob/living/silicon/pai/new_pai = new(card) + new_pai.key = user.key + paikeys |= new_pai.ckey + card.setPersonality(new_pai) + if(!new_pai.savefile_load(new_pai)) + var/pai_name = tgui_input_text(new_pai, "Choose your character's name", "Character Name") + actual_pai_name = sanitize_name(pai_name, ,1) + if(isnull(actual_pai_name)) + return ..() + else + var/obj/item/device/paicard/card = new(location) + var/mob/living/silicon/pai/new_pai = new(card) + new_pai.key = user.key + paikeys |= new_pai.ckey + card.setPersonality(new_pai) + if(!new_pai.savefile_load(new_pai)) + var/pai_name = tgui_input_text(new_pai, "Choose your character's name", "Character Name") + actual_pai_name = sanitize_name(pai_name, ,1) + if(isnull(actual_pai_name)) + return ..() + qdel(src) return ..() + // VOREStation Edit End -/obj/item/device/paicard/attack_self(mob/user) +/obj/item/device/paicard/proc/access_screen(mob/user) + if(is_damage_critical()) + to_chat(user, "WARNING: CRITICAL HARDWARE FAILURE, SERVICE DEVICE IMMEDIATELY") + return if (!in_range(src, user)) return user.set_machine(src) @@ -171,8 +242,10 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) Personal AI Device
| Installed Personality: | -[pai.name] | +[pai.name] | +
| Integrity: [pai.health] | ||
| Prime directive: | @@ -232,6 +305,8 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard)
[screen_msg]" else if(looking_for_personality) dat += {" @@ -301,7 +376,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) if(2) radio.ToggleReception() if(href_list["setlaws"]) - var/newlaws = sanitize(input(usr, "Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", pai.pai_laws) as message) + var/newlaws = sanitize(tgui_input_text(usr, "Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", pai.pai_laws, multiline = TRUE, prevent_enter = TRUE)) if(newlaws) pai.pai_laws = newlaws to_chat(pai, "Your supplemental directives have been updated. Your new directives are:") @@ -352,9 +427,11 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) current_emotion = emotion /obj/item/device/paicard/proc/alertUpdate() - var/turf/T = get_turf_or_move(src.loc) - for (var/mob/M in viewers(T)) - M.show_message("\The [src] flashes a message across its screen, \"Additional personalities available for download.\"", 3, "\The [src] bleeps electronically.", 2) + if(pai) + return + if(last_notify == 0 || (5 MINUTES <= world.time - last_notify)) + audible_message("\The [src] flashes a message across its screen, \"Additional personalities available for download.\"", hearing_distance = world.view, runemessage = "bleeps!") + last_notify = world.time /obj/item/device/paicard/emp_act(severity) for(var/mob/M in src) @@ -415,6 +492,34 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) if(user) to_chat(user, span_notice("You eject the card from \the [initial(src.name)].")) +/////////////////////////////// +//////////pAI Radios////////// +/////////////////////////////// +//Thanks heroman! + +/obj/item/device/radio/borg/pai + name = "integrated radio" + icon = 'icons/obj/robot_component.dmi' // Cyborgs radio icons should look like the component. + icon_state = "radio" + loudspeaker = FALSE + +/obj/item/device/radio/borg/pai/attackby(obj/item/weapon/W as obj, mob/user as mob) + return + +/obj/item/device/radio/borg/pai/recalculateChannels() + if(!istype(loc,/obj/item/device/paicard)) + return + var/obj/item/device/paicard/card = loc + secure_radio_connections = list() + channels = list() + + for(var/internal_chan in internal_channels) + var/ch_name = radio_channels_by_freq[internal_chan] + if(has_channel_access(card.pai, internal_chan)) + channels += ch_name + channels[ch_name] = 1 + secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT) + /obj/item/device/paicard/typeb name = "personal AI device" icon = 'icons/obj/paicard.dmi' @@ -428,6 +533,5 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) return pick(/obj/item/device/paicard ,/obj/item/device/paicard/typeb) /obj/item/device/paicard/digest_act(var/atom/movable/item_storage = null) - if(!pai.digestable) - return - . = ..() + if(pai.digestable) + return ..() diff --git a/code/game/objects/items/devices/paicard_vr.dm b/code/game/objects/items/devices/paicard_vr.dm new file mode 100644 index 0000000000..7283966d47 --- /dev/null +++ b/code/game/objects/items/devices/paicard_vr.dm @@ -0,0 +1,385 @@ +#define PP_FUNCTIONAL 0 +#define PP_BROKEN 1 +#define PP_MISSING 2 + +var/global/list/paikeys = list() + +/obj/item/device/paicard + var/panel_open = FALSE + var/cell = PP_FUNCTIONAL //critical- power + var/processor = PP_FUNCTIONAL //critical- the thinky part + var/board = PP_FUNCTIONAL //critical- makes everything work + var/capacitor = PP_FUNCTIONAL //critical- power processing + var/projector = PP_FUNCTIONAL //non-critical- affects unfolding + var/emitter = PP_FUNCTIONAL //non-critical- affects unfolding + var/speech_synthesizer = PP_FUNCTIONAL //non-critical- affects speech + +/obj/item/device/paicard/attackby(var/obj/item/I as obj, mob/user as mob) + if(istype(I,/obj/item/weapon/tool/screwdriver)) + if(panel_open) + panel_open = FALSE + user.visible_message("\The [user] secured \the [src]'s maintenance panel.") + playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) + else if(pai) + if(do_after(user, 3 SECONDS)) + panel_open = TRUE + user.visible_message("\The [user] opened \the [src]'s maintenance panel.") + playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) + if(istype(I,/obj/item/device/robotanalyzer)) + if(!panel_open) + to_chat(user, "The panel isn't open. You will need to unscrew it to open it.") + else + if(cell == PP_FUNCTIONAL) + to_chat(user,"Power cell: functional") + else if(cell == PP_BROKEN) + to_chat(user,"Power cell: damaged - CRITICAL") + else + to_chat(user,"Power cell: missing - CRITICAL") + + if(processor == PP_FUNCTIONAL) + to_chat(user,"Processor: functional") + else if(processor == PP_BROKEN) + to_chat(user,"Processor: damaged - CRITICAL") + else + to_chat(user,"Processor: missing - CRITICAL") + + if(board == PP_FUNCTIONAL) + to_chat(user,"Board: functional") + else if(board == PP_BROKEN) + to_chat(user,"Board: damaged - CRITICAL") + else + to_chat(user,"Board: missing - CRITICAL") + + if(capacitor == PP_FUNCTIONAL) + to_chat(user,"Capacitors: functional") + else if(capacitor == PP_BROKEN) + to_chat(user,"Capacitors: damaged - CRITICAL") + else + to_chat(user,"Capacitors: missing - CRITICAL") + + if(projector == PP_FUNCTIONAL) + to_chat(user,"Projectors: functional") + else if(projector == PP_BROKEN) + to_chat(user,"Projectors: damaged") + else + to_chat(user,"Projectors: missing") + + if(emitter == PP_FUNCTIONAL) + to_chat(user,"Emitters: functional") + else if(emitter == PP_BROKEN) + to_chat(user,"Emitters: damaged") + else + to_chat(user,"Emitters: missing") + + if(speech_synthesizer == PP_FUNCTIONAL) + to_chat(user,"Speech Synthesizer: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Speech Synthesizer: damaged") + else + to_chat(user,"Speech Synthesizer: missing") + + if(istype(I,/obj/item/device/multitool)) + if(!panel_open) + to_chat(user, "You can't do that in this state.") + else + var/list/parts = list() + if(cell != PP_MISSING) + parts |= "cell" + if(processor != PP_MISSING) + parts |= "processor" + if(board != PP_MISSING) + parts |= "board" + if(capacitor != PP_MISSING) + parts |= "capacitor" + if(projector != PP_MISSING) + parts |= "projector" + if(emitter != PP_MISSING) + parts |= "emitter" + if(speech_synthesizer != PP_MISSING) + parts |= "speech synthesizer" + + var/choice = tgui_input_list(user, "Which part would you like to check?", "Check part", parts) + switch(choice) + if("cell") + if(cell == PP_FUNCTIONAL) + to_chat(user,"Power cell: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Power cell: damaged") + else + to_chat(user,"Power cell: missing") + + if("processor") + if(processor == PP_FUNCTIONAL) + to_chat(user,"Processor: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Processor: damaged") + else + to_chat(user,"Processor: missing") + + if("board") + if(board == PP_FUNCTIONAL) + to_chat(user,"Board: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Board: damaged") + else + to_chat(user,"Board: missing") + + if("capacitor") + if(capacitor == PP_FUNCTIONAL) + to_chat(user,"Capacitors: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Capacitors: damaged") + else + to_chat(user,"Capacitors: missing") + + if("projector") + if(projector == PP_FUNCTIONAL) + to_chat(user,"Projectors: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Projectors: damaged") + else + to_chat(user,"Projectors: missing") + + if("emitter") + if(emitter == PP_FUNCTIONAL) + to_chat(user,"Emitters: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Emitters: damaged") + else + to_chat(user,"Emitters: missing") + + if("speech synthesizer") + if(speech_synthesizer == PP_FUNCTIONAL) + to_chat(user,"Speech Synthesizer: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Speech Synthesizer: damaged") + else + to_chat(user,"Speech Synthesizer: missing") + + if(istype(I,/obj/item/paiparts/cell)) + if(cell == PP_MISSING) + if(do_after(user, 3 SECONDS)) + user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + cell = PP_FUNCTIONAL + user.drop_from_inventory(I) + qdel(I) + else + to_chat(user, "You would need to remove the installed [I] first!") + if(istype(I,/obj/item/paiparts/processor)) + if(processor == PP_MISSING) + if(do_after(user, 3 SECONDS)) + user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + processor = PP_FUNCTIONAL + user.drop_from_inventory(I) + qdel(I) + else + to_chat(user, "You would need to remove the installed [I] first!") + if(istype(I,/obj/item/paiparts/board)) + if(board == PP_MISSING) + if(do_after(user, 3 SECONDS)) + user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + board = PP_FUNCTIONAL + user.drop_from_inventory(I) + qdel(I) + else + to_chat(user, "You would need to remove the installed [I] first!") + if(istype(I,/obj/item/paiparts/capacitor)) + if(capacitor == PP_MISSING) + if(do_after(user, 3 SECONDS)) + user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + capacitor = PP_FUNCTIONAL + user.drop_from_inventory(I) + qdel(I) + else + to_chat(user, "You would need to remove the installed [I] first!") + if(istype(I,/obj/item/paiparts/projector)) + if(projector == PP_MISSING) + if(do_after(user, 3 SECONDS)) + user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + projector = PP_FUNCTIONAL + user.drop_from_inventory(I) + qdel(I) + else + to_chat(user, "You would need to remove the installed [I] first!") + if(istype(I,/obj/item/paiparts/emitter)) + if(emitter == PP_MISSING) + if(do_after(user, 3 SECONDS)) + user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + emitter = PP_FUNCTIONAL + user.drop_from_inventory(I) + qdel(I) + else + to_chat(user, "You would need to remove the installed [I] first!") + if(istype(I,/obj/item/paiparts/speech_synthesizer)) + if(speech_synthesizer == PP_MISSING) + if(do_after(user, 3 SECONDS)) + user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + speech_synthesizer = PP_FUNCTIONAL + user.drop_from_inventory(I) + qdel(I) + else + to_chat(user, "You would need to remove the installed [I] first!") + +/obj/item/device/paicard/attack_self(mob/user) + if(!panel_open) + access_screen(user) + return + var/list/parts = list() + if(cell != PP_MISSING) + parts |= "cell" + if(processor != PP_MISSING) + parts |= "processor" + if(board != PP_MISSING) + parts |= "board" + if(capacitor != PP_MISSING) + parts |= "capacitor" + if(projector != PP_MISSING) + parts |= "projector" + if(emitter != PP_MISSING) + parts |= "emitter" + if(speech_synthesizer != PP_MISSING) + parts |= "speech synthesizer" + + var/choice = tgui_input_list(user, "Which part would you like to remove?", "Remove part", parts) + if(choice) + playsound(src, 'sound/items/pickup/component.ogg', vary = TRUE) + else + return + if(!do_after(user, 3 SECONDS)) + return + switch(choice) + if("cell") + if(cell == PP_FUNCTIONAL) + new /obj/item/paiparts/capacitor(get_turf(user)) + else + new /obj/item/paiparts(get_turf(user)) + user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + cell = PP_MISSING + if("processor") + if(processor == PP_FUNCTIONAL) + new /obj/item/paiparts/capacitor(get_turf(user)) + else + new /obj/item/paiparts(get_turf(user)) + user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + processor = PP_MISSING + if("board") + board = PP_MISSING + if(board == PP_FUNCTIONAL) + new /obj/item/paiparts/capacitor(get_turf(user)) + else + new /obj/item/paiparts(get_turf(user)) + user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + + if("capacitor") + if(capacitor == PP_FUNCTIONAL) + new /obj/item/paiparts/capacitor(get_turf(user)) + else + new /obj/item/paiparts(get_turf(user)) + user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + capacitor = PP_MISSING + if("projector") + if(projector == PP_FUNCTIONAL) + new /obj/item/paiparts/capacitor(get_turf(user)) + else + new /obj/item/paiparts(get_turf(user)) + user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + projector = PP_MISSING + if("emitter") + if(emitter == PP_FUNCTIONAL) + new /obj/item/paiparts/capacitor(get_turf(user)) + else + new /obj/item/paiparts(get_turf(user)) + user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + emitter = PP_MISSING + if("speech synthesizer") + if(speech_synthesizer == PP_FUNCTIONAL) + new /obj/item/paiparts/capacitor(get_turf(user)) + else + new /obj/item/paiparts(get_turf(user)) + user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + speech_synthesizer = PP_MISSING + +/obj/item/device/paicard/proc/death_damage() + + var/number = rand(1,4) + while(number) + number -- + switch(rand(1,4)) + if(1) + cell = PP_BROKEN + if(2) + processor = PP_BROKEN + if(3) + board = PP_BROKEN + if(4) + capacitor = PP_BROKEN + + +/obj/item/device/paicard/proc/damage_random_component(nonfatal = FALSE) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(2, 1, src) + s.start() + if(prob(80) || nonfatal) //Way more likely to be non-fatal part damage + switch(rand(1,3)) + if(1) + projector = PP_BROKEN + if(2) + emitter = PP_BROKEN + if(3) + speech_synthesizer = PP_BROKEN + else + switch(rand(1,4)) + if(1) + cell = PP_BROKEN + if(2) + processor = PP_BROKEN + if(3) + board = PP_BROKEN + if(4) + capacitor = PP_BROKEN + +/obj/item/device/paicard/proc/is_damage_critical() + if(cell != PP_FUNCTIONAL || processor != PP_FUNCTIONAL || board != PP_FUNCTIONAL || capacitor != PP_FUNCTIONAL) + return TRUE + return FALSE + +/obj/item/paiparts + name = "broken pAI component" + desc = "It's broken scrap from a pAI card!" + icon = 'icons/obj/paicard.dmi' + icon_state = "broken" + pickup_sound = 'sound/items/pickup/card.ogg' + drop_sound = 'sound/items/drop/card.ogg' +/obj/item/paiparts/Initialize() + . = ..() + pixel_x = rand(-10,10) + pixel_y = rand(-10,10) + +/obj/item/paiparts/cell + name = "pAI power cell" + desc = "It's very small and efficient! It powers the pAI!" + icon_state = "cell" +/obj/item/paiparts/processor + name = "pAI processor" + desc = "It's the brain of your computer friend!" + icon_state = "processor" +/obj/item/paiparts/board + name = "pAI board" + desc = "It's the thing all the other parts get attatched to!" + icon_state = "board" +/obj/item/paiparts/capacitor + name = "pAI capacitor" + desc = "It helps regulate power flow!" + icon_state = "capacitor" +/obj/item/paiparts/projector + name = "pAI projector" + desc = "It projects the pAI's form!" + icon_state = "projector" +/obj/item/paiparts/emitter + name = "pAI emitter" + desc = "It emits the fields to help the pAI get around!" + icon_state = "emitter" +/obj/item/paiparts/speech_synthesizer + name = "pAI speech synthesizer" + desc = "It's a little voice box!" + icon_state = "speech_synthesizer" diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index a4ba173aed..88701319cd 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -417,7 +417,7 @@ return else if(istype(I, /obj/item/weapon/pen)) if(loc == user && !user.incapacitated()) - var/new_name = input(user, "What would you like to label the tape?", "Tape labeling") as null|text + var/new_name = tgui_input_text(user, "What would you like to label the tape?", "Tape labeling") if(isnull(new_name)) return new_name = sanitizeSafe(new_name) if(new_name) diff --git a/code/game/objects/items/devices/text_to_speech.dm b/code/game/objects/items/devices/text_to_speech.dm index 54510fb9a4..330ca97d73 100644 --- a/code/game/objects/items/devices/text_to_speech.dm +++ b/code/game/objects/items/devices/text_to_speech.dm @@ -22,7 +22,7 @@ named = 1 */ - var/message = sanitize(input(user,"Choose a message to relay to those around you.") as text|null) + var/message = sanitize(tgui_input_text(user,"Choose a message to relay to those around you.")) if(message) audible_message("[bicon(src)] \The [src.name] states, \"[message]\"", runemessage = "synthesized speech") if(ismob(loc)) diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm index 02b202574c..12ece32895 100644 --- a/code/game/objects/items/devices/translocator_vr.dm +++ b/code/game/objects/items/devices/translocator_vr.dm @@ -135,7 +135,7 @@ This device records all warnings given and teleport events for admin review in c to_chat(user, "The translocator can't support any more beacons!") return - var/new_name = html_encode(input(user,"New beacon's name (2-20 char):","[src]") as text|null) + var/new_name = html_encode(tgui_input_text(user,"New beacon's name (2-20 char):","[src]",null,20)) if(!check_menu(user)) return diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm index b7d7933a88..849a649894 100644 --- a/code/game/objects/items/devices/tvcamera.dm +++ b/code/game/objects/items/devices/tvcamera.dm @@ -48,7 +48,7 @@ add_fingerprint(user) user.set_machine(src) show_ui(user) - + /obj/item/device/tvcamera/proc/show_ui(mob/user) var/dat = list() dat += "Channel name is: [channel ? channel : "unidentified broadcast"]
" @@ -65,7 +65,7 @@ if(..()) return 1 if(href_list["channel"]) - var/nc = input(usr, "Channel name", "Select new channel name", channel) as text|null + var/nc = tgui_input_text(usr, "Channel name", "Select new channel name", channel) if(nc) channel = nc camera.c_tag = channel @@ -93,7 +93,7 @@ /obj/item/device/tvcamera/proc/show_tvs(atom/thing) if(showing) hide_tvs(showing) - + showing = weakref(thing) showing_name = "[thing]" for(var/obj/machinery/computer/security/telescreen/entertainment/ES as anything in GLOB.entertainment_screens) @@ -126,7 +126,7 @@ /obj/item/device/tvcamera/process() if(!showing) return PROCESS_KILL - + var/atom/A = showing.resolve() if(!A || QDELETED(A)) show_tvs(loc) @@ -148,3 +148,76 @@ H.update_inv_l_hand() H.update_inv_belt() + +//Assembly by roboticist + +/obj/item/robot_parts/head/attackby(var/obj/item/device/assembly/S, mob/user as mob) + if(!istype(S, /obj/item/device/assembly/infra)) + ..() + return + var/obj/item/weapon/TVAssembly/A = new(user) + qdel(S) + user.put_in_hands(A) + to_chat(user, "You add the infrared sensor to the robot head.") + user.drop_from_inventory(src) + qdel(src) + + +/obj/item/weapon/TVAssembly + name = "\improper TV Camera Assembly" + desc = "A robotic head with an infrared sensor inside." + icon = 'icons/obj/robot_parts.dmi' + icon_state = "head" + item_state = "head" + var/buildstep = 0 + w_class = ITEMSIZE_LARGE + +/obj/item/weapon/TVAssembly/attackby(W, mob/user) + switch(buildstep) + if(0) + if(istype(W, /obj/item/robot_parts/robot_component/camera)) + var/obj/item/robot_parts/robot_component/camera/CA = W + to_chat(user, "You add the camera module to [src]") + user.drop_item() + qdel(CA) + desc = "This TV camera assembly has a camera module." + buildstep++ + if(1) + if(istype(W, /obj/item/device/taperecorder)) + var/obj/item/device/taperecorder/T = W + user.drop_item() + qdel(T) + buildstep++ + to_chat(user, "You add the tape recorder to [src]") + if(2) + if(istype(W, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/C = W + if(!C.use(3)) + to_chat(user, "You need six cable coils to wire the devices.") + ..() + return + C.use(3) + buildstep++ + to_chat(user, "You wire the assembly") + desc = "This TV camera assembly has wires sticking out" + return + if(3) + if(istype(W, /obj/item/weapon/tool/wirecutters)) + to_chat(user, " You trim the wires.") + buildstep++ + desc = "This TV camera assembly needs casing." + return + if(4) + if(istype(W, /obj/item/stack/material/steel)) + var/obj/item/stack/material/steel/S = W + buildstep++ + S.use(1) + to_chat(user, "You encase the assembly in a Ward-Takeshi casing.") + var/turf/T = get_turf(src) + new /obj/item/device/tvcamera(T) + user.drop_from_inventory(src) + qdel(src) + return + + ..() + diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index 54ed540475..846fae358d 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -19,7 +19,7 @@ to_chat(usr, "The hailer is fried. The tiny input screen just shows a waving ASCII penis.") return - var/new_message = input(usr, "Please enter new message (leave blank to reset).") as text + var/new_message = tgui_input_text(usr, "Please enter new message (leave blank to reset).") if(!new_message || new_message == "") use_message = "Halt! Security!" else diff --git a/code/game/objects/items/gunbox_vr.dm b/code/game/objects/items/gunbox_vr.dm index 2770745f39..4dbbb98b27 100644 --- a/code/game/objects/items/gunbox_vr.dm +++ b/code/game/objects/items/gunbox_vr.dm @@ -19,3 +19,26 @@ if(istype(AM, /obj/item/weapon/gun)) to_chat(user, "You have chosen \the [AM]. Say hello to your new best friend.") qdel(src) + +/* + * Site Manager's Box + */ +/obj/item/gunbox/captain + name = "Captain's sidearm box" + desc = "A secure box containing a sidearm befitting of the site manager. Includes both lethal and non-lethal munitions, beware what's loaded!" + icon = 'icons/obj/storage.dmi' + icon_state = "gunbox" +/obj/item/gunbox/captain/attack_self(mob/living/user) + var/list/options = list() + options["M1911 (.45)"] = list(/obj/item/weapon/gun/projectile/colt/detective, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45) + options["MT Mk58 (.45)"] = list(/obj/item/weapon/gun/projectile/sec, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45) + options["LAEP80 \"Thor\" (Stun/Laser)"] = list(/obj/item/weapon/gun/energy/gun, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon) + options["MarsTech P92X (9mm)"] = list(/obj/item/weapon/gun/projectile/p92x/rubber, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm) + var/choice = tgui_input_list(user,"Would you prefer a ballistic pistol or an energy gun?", "Gun!", options) + if(src && choice) + var/list/things_to_spawn = options[choice] + for(var/new_type in things_to_spawn) // Spawn all the things, the gun and the ammo. + var/atom/movable/AM = new new_type(get_turf(src)) + if(istype(AM, /obj/item/weapon/gun)) + to_chat(user, "You have chosen \the [AM]. Say hello to your new friend.") + qdel(src) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index ff9bbad216..28c89140d0 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -229,7 +229,7 @@ to_chat(user, "The MMI must go in after everything else!") if (istype(W, /obj/item/weapon/pen)) - var/t = sanitizeSafe(input(user, "Enter new robot name", src.name, src.created_name), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", src.name, src.created_name), MAX_NAME_LEN) if (!t) return if (!in_range(src, usr) && src.loc != usr) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 3938f3c17b..14758aa2f6 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -40,7 +40,7 @@ var/heldname = "default name" /obj/item/borg/upgrade/rename/attack_self(mob/user as mob) - heldname = sanitizeSafe(input(user, "Enter new robot name", "Robot Reclassification", heldname), MAX_NAME_LEN) + heldname = sanitizeSafe(tgui_input_text(user, "Enter new robot name", "Robot Reclassification", heldname, MAX_NAME_LEN), MAX_NAME_LEN) /obj/item/borg/upgrade/rename/action(var/mob/living/silicon/robot/R) if(..()) return 0 @@ -69,6 +69,7 @@ R.key = ghost.key R.set_stat(CONSCIOUS) + R.add_robot_verbs() dead_mob_list -= R living_mob_list |= R R.notify_ai(ROBOT_NOTIFICATION_NEW_UNIT) diff --git a/code/game/objects/items/selectable_item_vr.dm b/code/game/objects/items/selectable_item_vr.dm index 33b810d8d7..56d4778124 100644 --- a/code/game/objects/items/selectable_item_vr.dm +++ b/code/game/objects/items/selectable_item_vr.dm @@ -14,7 +14,7 @@ tgui_alert(user, {"[preface_string]"}, preface_title) var/chosen_item = tgui_input_list(usr, selection_string, selection_title, item_options) chosen_item = item_options[chosen_item] - if(chosen_item) + if(!QDELETED(src) && chosen_item) user.drop_item() var/obj/item/result = new chosen_item(get_turf(user)) user.put_in_active_hand(result) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index b6ad543e6a..aa3cca9b90 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -399,7 +399,7 @@ /obj/item/stack/attack_hand(mob/user as mob) if (user.get_inactive_hand() == src) - var/N = input(usr, "How many stacks of [src] would you like to split off? There are currently [amount].", "Split stacks", 1) as num|null + var/N = tgui_input_number(usr, "How many stacks of [src] would you like to split off? There are currently [amount].", "Split stacks", 1, amount, 1) if(N) var/obj/item/stack/F = src.split(N) if (F) diff --git a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm index 3332adbe0c..0ac18b8ae1 100644 --- a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm +++ b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm @@ -20,14 +20,22 @@ name = "stack of teal carpet" type_to_spawn = /obj/item/stack/tile/carpet/teal -/obj/fiftyspawner/decocarpet - name = "stack of deco carpet" - type_to_spawn = /obj/item/stack/tile/carpet/deco +/obj/fiftyspawner/geocarpet + name = "stack of geometric carpet" + type_to_spawn = /obj/item/stack/tile/carpet/geo /obj/fiftyspawner/retrocarpet - name = "stack of retro carpet" + name = "stack of blue retro carpet" type_to_spawn = /obj/item/stack/tile/carpet/retro +/obj/fiftyspawner/retrocarpet_red + name = "stack of red retro carpet" + type_to_spawn = /obj/item/stack/tile/carpet/retro_red + +/obj/fiftyspawner/happycarpet + name = "stack of happy carpet" + type_to_spawn = /obj/item/stack/tile/carpet/happy + /obj/fiftyspawner/floor name = "stack of floor tiles" type_to_spawn = /obj/item/stack/tile/floor diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 65b1f73c71..caeefd9e10 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -65,6 +65,26 @@ desc = "An easy to fit wooden floor tile. It's blue!" icon_state = "tile-sifwood" +/obj/item/stack/tile/wood/alt + name = "wood floor tile" + singular_name = "wood floor tile" + icon_state = "tile-wood_tile" + +/obj/item/stack/tile/wood/parquet + name = "parquet wood floor tile" + singular_name = "parquet wood floor tile" + icon_state = "tile-wood_parquet" + +/obj/item/stack/tile/wood/panel + name = "large wood floor tile" + singular_name = "large wood floor tile" + icon_state = "tile-wood_large" + +/obj/item/stack/tile/wood/tile + name = "tiled wood floor tile" + singular_name = "tiled wood floor tile" + icon_state = "tile-wood_tile" + /obj/item/stack/tile/wood/cyborg name = "wood floor tile synthesizer" desc = "A device that makes wood floor tiles." @@ -73,6 +93,8 @@ stacktype = /obj/item/stack/tile/wood build_type = /obj/item/stack/tile/wood + + /* * Carpets */ @@ -97,8 +119,25 @@ icon_state = "tile-tealcarpet" no_variants = FALSE -/*/obj/item/stack/tile/carpet/bcarpet //YW EDIT: Commented out to help with upstream merging. Get on this you fucking virgo bois. -yw +/obj/item/stack/tile/carpet/geo + icon_state = "tile-carpet-deco" + desc = "A piece of carpet with a gnarly geometric design. It is the same size as a normal floor tile!" +/obj/item/stack/tile/carpet/retro + icon_state = "tile-carpet-retro" + desc = "A piece of carpet with totally wicked blue space patterns. It is the same size as a normal floor tile!" + +/obj/item/stack/tile/carpet/retro_red + icon_state = "tile-carpet-retro-red" + desc = "A piece of carpet with red-ical space patterns. It is the same size as a normal floor tile!" + +/obj/item/stack/tile/carpet/happy + icon_state = "tile-carpet-happy" + desc = "A piece of carpet with happy patterns. It is the same size as a normal floor tile!" + +/* YW EDIT: Commented out to help with upstream merging. +// TODO - Add descriptions to these +/obj/item/stack/tile/carpet/bcarpet icon_state = "tile-carpet" /obj/item/stack/tile/carpet/blucarpet icon_state = "tile-carpet" @@ -112,10 +151,7 @@ icon_state = "tile-carpet" /obj/item/stack/tile/carpet/oracarpet icon_state = "tile-carpet" -/obj/item/stack/tile/carpet/deco - icon_state = "tile-carpet-deco" -/obj/item/stack/tile/carpet/retro - icon_state = "tile-carpet-retro"*/ +YW Edit end */ /obj/item/stack/tile/floor name = "floor tile" diff --git a/code/game/objects/items/stacks/tiles/tile_types_yw.dm b/code/game/objects/items/stacks/tiles/tile_types_yw.dm index 00bca008f0..97d81333ec 100644 --- a/code/game/objects/items/stacks/tiles/tile_types_yw.dm +++ b/code/game/objects/items/stacks/tiles/tile_types_yw.dm @@ -14,5 +14,3 @@ icon_state = "tile-carpet" /obj/item/stack/tile/carpet/deco icon_state = "tile-carpet-deco" -/obj/item/stack/tile/carpet/retro - icon_state = "tile-carpet-retro" \ No newline at end of file diff --git a/code/game/objects/items/toys/godfigures.dm b/code/game/objects/items/toys/godfigures.dm index 027544a0eb..9801640d54 100644 --- a/code/game/objects/items/toys/godfigures.dm +++ b/code/game/objects/items/toys/godfigures.dm @@ -123,7 +123,7 @@ var/mob/M = usr if(!M.mind) return 0 - var/input = sanitizeSafe(input(usr, "What do you want to name the icon?", ,""), MAX_NAME_LEN) + var/input = sanitizeSafe(tgui_input_text(usr, "What do you want to name the icon?", ,"", null, MAX_NAME_LEN), MAX_NAME_LEN) if(src && input && !M.stat && in_range(M,src)) name = "icon of " + input diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 0b1343d63e..2331485fd1 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -843,7 +843,7 @@ if(!M.mind) return 0 - var/input = sanitizeSafe(input(usr, "What do you want to name the plushie?", ,""), MAX_NAME_LEN) + var/input = sanitizeSafe(tgui_input_text(usr, "What do you want to name the plushie?", ,""), MAX_NAME_LEN) if(src && input && !M.stat && in_range(M,src)) name = input diff --git a/code/game/objects/items/uav.dm b/code/game/objects/items/uav.dm index b1ff2723a8..f534ff9a42 100644 --- a/code/game/objects/items/uav.dm +++ b/code/game/objects/items/uav.dm @@ -136,7 +136,7 @@ cell = I else if(istype(I, /obj/item/weapon/pen) || istype(I, /obj/item/device/flashlight/pen)) - var/tmp_label = sanitizeSafe(input(user, "Enter a nickname for [src]", "Nickname", nickname), MAX_NAME_LEN) + var/tmp_label = sanitizeSafe(tgui_input_text(user, "Enter a nickname for [src]", "Nickname", nickname, MAX_NAME_LEN), MAX_NAME_LEN) if(length(tmp_label) > 50 || length(tmp_label) < 3) to_chat(user, "The nickname must be between 3 and 50 characters.") else diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index e366a3e8ee..0c318fc8dd 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -133,7 +133,7 @@ AI MODULES /obj/item/weapon/aiModule/safeguard/attack_self(var/mob/user as mob) ..() - var/targName = sanitize(input(usr, "Please enter the name of the person to safeguard.", "Safeguard who?", user.name)) + var/targName = sanitize(tgui_input_text(usr, "Please enter the name of the person to safeguard.", "Safeguard who?", user.name)) targetName = targName desc = text("A 'safeguard' AI module: 'Safeguard []. Anyone threatening or attempting to harm [] is no longer to be considered a crew member, and is a threat which must be neutralized.'", targetName, targetName) @@ -159,7 +159,7 @@ AI MODULES /obj/item/weapon/aiModule/oneHuman/attack_self(var/mob/user as mob) ..() - var/targName = sanitize(input(usr, "Please enter the name of the person who is the only crew member.", "Who?", user.real_name)) + var/targName = sanitize(tgui_input_text(usr, "Please enter the name of the person who is the only crew member.", "Who?", user.real_name)) targetName = targName desc = text("A 'one crew member' AI module: 'Only [] is a crew member.'", targetName) @@ -240,11 +240,11 @@ AI MODULES /obj/item/weapon/aiModule/freeform/attack_self(var/mob/user as mob) ..() - var/new_lawpos = input(usr, "Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority (15+)", lawpos) as num + var/new_lawpos = tgui_input_number(usr, "Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority (15+)", lawpos) if(new_lawpos < MIN_SUPPLIED_LAW_NUMBER) return lawpos = min(new_lawpos, MAX_SUPPLIED_LAW_NUMBER) var/newlaw = "" - var/targName = sanitize(input(usr, "Please enter a new law for the AI.", "Freeform Law Entry", newlaw)) + var/targName = sanitize(tgui_input_text(usr, "Please enter a new law for the AI.", "Freeform Law Entry", newlaw)) newFreeFormLaw = targName desc = "A 'freeform' AI module: ([lawpos]) '[newFreeFormLaw]'" @@ -357,7 +357,7 @@ AI MODULES /obj/item/weapon/aiModule/freeformcore/attack_self(var/mob/user as mob) ..() var/newlaw = "" - var/targName = sanitize(input(usr, "Please enter a new core law for the AI.", "Freeform Law Entry", newlaw)) + var/targName = sanitize(tgui_input_text(usr, "Please enter a new core law for the AI.", "Freeform Law Entry", newlaw)) newFreeFormLaw = targName desc = "A 'freeform' Core AI module: '[newFreeFormLaw]'" @@ -381,7 +381,7 @@ AI MODULES /obj/item/weapon/aiModule/syndicate/attack_self(var/mob/user as mob) ..() var/newlaw = "" - var/targName = sanitize(input(usr, "Please enter a new law for the AI.", "Freeform Law Entry", newlaw)) + var/targName = sanitize(tgui_input_text(usr, "Please enter a new law for the AI.", "Freeform Law Entry", newlaw)) newFreeFormLaw = targName desc = "A hacked AI law module: '[newFreeFormLaw]'" diff --git a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm index 9d47a962e7..05ef9a7428 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm @@ -74,7 +74,7 @@ to_chat(user, "Circuit controls are locked.") return var/existing_networks = jointext(network,",") - var/input = sanitize(input(usr, "Which networks would you like to connect this camera console circuit to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Multitool-Circuitboard interface", existing_networks)) + var/input = sanitize(tgui_input_text(usr, "Which networks would you like to connect this camera console circuit to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Multitool-Circuitboard interface", existing_networks)) if(!input) to_chat(usr, "No input found please hang up and try your call again.") return diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index d81e6e444e..5e1d700602 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -39,7 +39,7 @@ ..() /obj/item/weapon/plastique/attack_self(mob/user as mob) - var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num + var/newtime = tgui_input_number(usr, "Please set the timer.", "Timer", 10, 60000, 10) if(user.get_active_hand() == src) newtime = CLAMP(newtime, 10, 60000) timer = newtime diff --git a/code/game/objects/items/weapons/explosives_vr.dm b/code/game/objects/items/weapons/explosives_vr.dm index fb065b7bf9..8d5bb8c961 100644 --- a/code/game/objects/items/weapons/explosives_vr.dm +++ b/code/game/objects/items/weapons/explosives_vr.dm @@ -8,7 +8,7 @@ target = src var/turf/T = get_turf(target) - if(T.z in using_map.station_levels) + if((T.z in using_map.station_levels) || (T.z in using_map.admin_levels)) target.visible_message("\The [src] lets out a loud beep as safeties trigger, before imploding and falling apart.") target.cut_overlay(image_overlay, TRUE) qdel(src) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 8de1fb7f80..52ebd29e7c 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -288,7 +288,7 @@ Implant Specifics:
"} /obj/item/weapon/implant/explosive/post_implant(mob/source as mob) elevel = tgui_alert(usr, "What sort of explosion would you prefer?", "Implant Intent", list("Localized Limb", "Destroy Body", "Full Explosion")) - phrase = input(usr, "Choose activation phrase:") as text + phrase = tgui_input_text(usr, "Choose activation phrase:") var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "") phrase = replace_characters(phrase, replacechars) usr.mind.store_memory("Explosive implant in [source] can be activated by saying something containing the phrase ''[src.phrase]'', say [src.phrase] to attempt to activate.", 0, 0) diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 9162be15eb..1517e2ada3 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -21,7 +21,7 @@ /obj/item/weapon/implantcase/attackby(obj/item/weapon/I as obj, mob/user as mob) ..() if (istype(I, /obj/item/weapon/pen)) - var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text + var/t = tgui_input_text(user, "What would you like the label to be?", text("[]", src.name), null) if (user.get_active_hand() != I) return if((!in_range(src, usr) && src.loc != user)) diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 606b707fce..952e5fa976 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -15,18 +15,22 @@ to_chat(user, "You [active ? "" : "de"]activate \the [src].") update() -/obj/item/weapon/implanter/verb/remove_implant(var/mob/user) +/obj/item/weapon/implanter/verb/remove_implant() set category = "Object" set name = "Remove Implant" set src in usr if(!imp) return - imp.loc = get_turf(src) - user.put_in_hands(imp) - to_chat(user, "You remove \the [imp] from \the [src].") - name = "implanter" - imp = null + if(istype(usr, /mob)) + var/mob/M = usr + imp.loc = get_turf(src) + if(M.get_active_hand() == null) + M.put_in_hands(imp) + to_chat(M, "You remove \the [imp] from \the [src].") + name = "implanter" + imp = null + update() return diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index a450fa3b8d..a100d84cbc 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -1,1834 +1,1851 @@ -/*********************MANUALS (BOOKS)***********************/ - -/obj/item/weapon/book/manual - icon = 'icons/obj/library.dmi' - due_date = 0 // Game time in 1/10th seconds - unique = 1 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified - - -/obj/item/weapon/book/manual/engineering_construction - name = "Station Repairs and Construction" - icon_state ="bookEngineering" - item_state = "book3" - author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned - title = "Station Repairs and Construction" - -/obj/item/weapon/book/manual/engineering_construction/New() - ..() - dat = {" - - - - - - - - - - - "} - -/obj/item/weapon/book/manual/engineering_particle_accelerator - name = "Particle Accelerator User's Guide" - icon_state ="bookParticleAccelerator" - item_state = "book15" - author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned - title = "Particle Accelerator User's Guide" - -/obj/item/weapon/book/manual/engineering_particle_accelerator/New() - ..() - dat = {" - - - - - -
Experienced User's Guide
- -Setting up the accelerator
- --
-
Using the accelerator
- --
-
OPERATING MANUAL FOR MK 1 PROTOTYPE THERMOELECTRIC SUPERMATTER ENGINE 'TOMBOLA'
--
OPERATING PRINCIPLES
--
-
-
-
-
-
SUPERMATTER HANDLING
--
STANDARD STARTUP PROCEDURE
--
-
-
OPERATION AND MAINTENANCE
--
-
-
EMERGENCY COOLING PROCEDURE
--
-
-
EJECTION PROCEDURE
--
-
OPERATING MANUAL FOR MK 2 PROTOTYPE TESLA ENGINE 'EDISON'S BANE'
--
OPERATING PRINCIPLES
-This big floaty ball of pure electricity can only be contained by the containment field. It periodically will discharge energy in the form of an electric shock which can be harvested for energy.
-When you shoot the energy ball with the Particle Accelerator, it gains energy, and when enough energy is accumulated a mini-energy ball that orbits the big energy ball will be formed. This can happen as many times as you let it, each mini-ball will send off an extra shock when the energy ball pulses. Be warned, the more mini-balls the energy ball has, the more shocks it sends out at once and the further it can travel each move.
-An energy ball will shoot bolts of electricity off at conductors, which it prioritizes in this order: -
-
-
Tesla Coils will attract the energy ball's bolts. They will take half the power of the bolt (if they are connected to a wire node), pump it into the powernet it is hooked to, and then will send the other half of the power to the next available conductor, which follows the criteria listed above. Preferably, this will be another coil to harness more of the power and pump it into the grid.
-Grounding Rods are safety precautions to prevent the tesla bolts from hitting machinery or personnel. If the tesla is loose, being near one will usually keep you safe from direct shocks.
--
STARTUP PROCEDURE
--
-
-
OPERATION AND MAINTENANCE
--
-
-
SHUTDOWN PROCEDURE
--
-
-
ENERGY BALL ESCAPE PROCEDURE
--
-
-
-
-
- NOTES FOR NEWBIES -
- Anything touching the field will mess with its stability and eventually cause it to rupture. Rupturing is bad. Use the gyrotron to keep instability down if you're running the engine on unstable fuel. -
- Likewise, no matter how sad the core seems, don't fucking hug it, you'll blow the field out and set the engine room on fire. - - "} - -/obj/item/weapon/book/manual/engineering_hacking - name = "Hacking" - icon_state ="bookHacking" - item_state = "book2" - author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned - title = "Hacking" - -/obj/item/weapon/book/manual/engineering_hacking/New() - ..() - dat = {" - - - - - - - - - - - "} - - -/obj/item/weapon/book/manual/engineering_singularity_safety - name = "Singularity Safety in Special Circumstances" - icon_state ="bookEngineeringSingularitySafety" - item_state = "book15" - author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned - title = "Singularity Safety in Special Circumstances" - - dat = {" - - - - -
Singularity Safety in Special Circumstances
- -Power outage
- - A power problem has made the entire station lose power? Could be station-wide wiring problems or syndicate power sinks. In any case follow these steps: - --
-
Shields get damaged
- --
-
Growing a Diona
- - Growing a Diona is easy! --
-
-
- Note that for a successful harvest, the body from which the blood was taken from must be dead BEFORE harvesting the pod, however the pod can be growing while they are still alive. Otherwise, the soul would not be able to migrate to the new Diona body.
-
- It really is that easy! Good luck!
-
-
-
- "}
-
-
-/obj/item/weapon/book/manual/medical_cloning
- name = "Cloning Techniques of the 26th Century"
- icon_state ="bookCloning"
- item_state = "book9"
- author = "Medical Journal, volume 3" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
- title = "Cloning Techniques of the 26th Century"
-
- dat = {"
-
How to Clone People
- So there are 50 dead people lying on the floor, chairs are spinning like no tomorrow and you haven't the foggiest idea of what to do? Not to worry! - This guide is intended to teach you how to clone people and how to do it right, in a simple, step-by-step process! If at any point of the guide you have a mental meltdown, - genetics probably isn't for you and you should get a job-change as soon as possible before you're sued for malpractice. - --
-
Step 1: Acquire body
- This is pretty much vital for the process because without a body, you cannot clone it. Usually, bodies will be brought to you, so you do not need to worry so much about this step. If you already have a body, great! Move on to the next step. - -Step 2: Strip body
- The cloning machine does not like abiotic items. What this means is you can't clone anyone if they're wearing clothes or holding things, so take all of it off. If it's just one person, it's courteous to put their possessions in the closet. - If you have about seven people awaiting cloning, just leave the piles where they are, but don't mix them around and for God's sake don't let people in to steal them. - -Step 3: Put body in cloning machine
- Grab the body and then put it inside the DNA modifier. If you cannot do this, then you messed up at Step 2. Go back and check you took EVERYTHING off - a commonly missed item is their headset. - -Step 4: Scan body
- Go onto the computer and scan the body by pressing 'Scan - <Subject Name Here>.' If you're successful, they will be added to the records (note that this can be done at any time, even with living people, - so that they can be cloned without a body in the event that they are lying dead on port solars and didn't turn on their suit sensors)! - If not, and it says "Error: Mental interface failure.", then they have left their bodily confines and are one with the spirits. If this happens, just shout at them to get back in their body, - click 'Refresh' and try scanning them again. If there's no success, threaten them with gibbing. - Still no success? Skip over to Step 7 and don't continue after it, as you have an unresponsive body and it cannot be cloned. - If you got "Error: Unable to locate valid genetic data.", you are trying to clone a monkey - start over. - -Step 5: Clone body
- Now that the body has a record, click 'View Records,' click the subject's name, and then click 'Clone' to start the cloning process. Congratulations! You're halfway there. - Remember not to 'Eject' the cloning pod as this will kill the developing clone and you'll have to start the process again. - -Step 6: Get clean SEs for body
- Cloning is a finicky and unreliable process. Whilst it will most certainly bring someone back from the dead, they can have any number of nasty disabilities given to them during the cloning process! - For this reason, you need to prepare a clean, defect-free Structural Enzyme (SE) injection for when they're done. If you're a competent Geneticist, you will already have one ready on your working computer. - If, for any reason, you do not, then eject the body from the DNA modifier (NOT THE CLONING POD) and take it next door to the Genetics research room. Put the body in one of those DNA modifiers and then go onto the console. - Go into View/Edit/Transfer Buffer, find an open slot and click "SE" to save it. Then click 'Injector' to get the SEs in syringe form. Put this in your pocket or something for when the body is done. - -Step 7: Put body in morgue
- Now that the cloning process has been initiated and you have some clean Structural Enzymes, you no longer need the body! Drag it to the morgue and tell the Chef over the radio that they have some fresh meat waiting for them in there. - To put a body in a morgue bed, simply open the tray, grab the body, put it on the open tray, then close the tray again. Use one of the nearby pens to label the bed "CHEF MEAT" in order to avoid confusion. - -Step 8: Await cloned body
- Now go back to the lab and wait for your patient to be cloned. It won't be long now, I promise. - -Step 9: Cryo and clean SE injector on person
- Has your body been cloned yet? Great! As soon as the guy pops out, grab them and stick them in cryo. Clonexadone and Cryoxadone help rebuild their genetic material. Then grab your clean SE injector and jab it in them. Once you've injected them, - they now have clean Structural Enzymes and their defects, if any, will disappear in a short while. - -Step 10: Give person clothes back
- Obviously the person will be naked after they have been cloned. Provided you weren't an irresponsible little shit, you should have protected their possessions from thieves and should be able to give them back to the patient. - No matter how cruel you are, it's simply against protocol to force your patients to walk outside naked. - -Step 11: Send person on their way
- Give the patient one last check-over - make sure they don't still have any defects and that they have all their possessions. Ask them how they died, if they know, so that you can report any foul play over the radio. - Once you're done, your patient is ready to go back to work! Chances are they do not have Medbay access, so you should let them out of Genetics and the Medbay main entrance. - -If you've gotten this far, congratulations! You have mastered the art of cloning. Now, the real problem is how to resurrect yourself after that traitor had his way with you for cloning his target. - - - - "} - - -/obj/item/weapon/book/manual/ripley_build_and_repair - name = "APLU \"Ripley\" Construction and Operation Manual" - icon_state ="book" - item_state = "book" - author = "Randall Varn, Einstein Engines Senior Mechanic" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned - title = "APLU \"Ripley\" Construction and Operation Manual" - - dat = {" -
- - - -- Weyland-Yutani - Building Better Worlds -
Autonomous Power Loader Unit \"Ripley\"
-Specifications:
--
-
Construction:
--
-
Additional Information:
--
-
Science For Dummies
- So you want to further SCIENCE? Good man/woman/thing! However, SCIENCE is a complicated process even though it's quite easy. For the most part, it's a three step process: --
-
The R&D Console
- The R&D console is the cornerstone of any research lab. It is the central system from which the Destructive Analyzer, Protolathe, and Circuit Imprinter (your R&D systems) are controlled. More on those systems in their own sections. - On its own, the R&D console acts as a database for all your technological gains and new devices you discover. So long as the R&D console remains intact, you'll retain all that SCIENCE you've discovered. Protect it though, - because if it gets damaged, you'll lose your data! - In addition to this important purpose, the R&D console has a disk menu that lets you transfer data from the database onto disk or from the disk into the database. - It also has a settings menu that lets you re-sync with nearby R&D devices (if they've become disconnected), lock the console from the unworthy, - upload the data to all other R&D consoles in the network (all R&D consoles are networked by default), connect/disconnect from the network, and purge all data from the database.- - NOTE: The technology list screen, circuit imprinter, and protolathe menus are accessible by non-scientists. This is intended to allow 'public' systems for the plebians to utilize some new devices. - -
Destructive Analyzer
- This is the source of all technology. Whenever you put a handheld object in it, it analyzes it and determines what sort of technological advancements you can discover from it. If the technology of the object is equal or higher then your current knowledge, - you can destroy the object to further those sciences. - Some devices (notably, some devices made from the protolathe and circuit imprinter) aren't 100% reliable when you first discover them. If these devices break down, you can put them into the Destructive Analyzer and improve their reliability rather than further science. - If their reliability is high enough, it'll also advance their related technologies. - -Circuit Imprinter
- This machine, along with the Protolathe, is used to actually produce new devices. The Circuit Imprinter takes glass and various chemicals (depends on the design) to produce new circuit boards to build new machines or computers. It can even be used to print AI modules. - -Protolathe
- This machine is an advanced form of the Autolathe that produce non-circuit designs. Unlike the Autolathe, it can use processed metal, glass, solid phoron, silver, gold, and diamonds along with a variety of chemicals to produce devices. - The downside is that, again, not all devices you make are 100% reliable when you first discover them. - -Reliability and You
- As it has been stated, many devices, when they're first discovered, do not have a 100% reliability. Instead, - the reliability of the device is dependent upon a base reliability value, whatever improvements to the design you've discovered through the Destructive Analyzer, - and any advancements you've made with the device's source technologies. To be able to improve the reliability of a device, you have to use the device until it breaks beyond repair. Once that happens, you can analyze it in a Destructive Analyzer. - Once the device reaches a certain minimum reliability, you'll gain technological advancements from it. - -Building a Better Machine
- Many machines produced from circuit boards inserted into a machine frames require a variety of parts to construct. These are parts like capacitors, batteries, matter bins, and so forth. As your knowledge of science improves, more advanced versions are unlocked. - If you use these parts when constructing something, its attributes may be improved. - For example, if you use an advanced matter bin when constructing an autolathe (rather than a regular one), it'll hold more materials. Experiment around with stock parts of various qualities to see how they affect the end results! Be warned, however: - Tier 3 and higher stock parts don't have 100% reliability and their low reliability may affect the reliability of the end machine. - - - "} - - -/obj/item/weapon/book/manual/robotics_cyborgs - name = "Cyborgs for Dummies" - icon_state = "borgbook" - item_state = "book1" - author = "XISC" - title = "Cyborgs for Dummies" - - dat = {" - - - - - -Cyborgs for Dummies
- -Chapters
- --
-
Cyborg Related Equipment
- -Exosuit Fabricator
- The Exosuit Fabricator is the most important piece of equipment related to cyborgs. It allows the construction of the core cyborg parts. Without these machines, cyborgs cannot be built. It seems that they may also benefit from advanced research techniques. - -Cyborg Recharging Station
- This useful piece of equipment will suck power out of the power systems to charge a cyborg's power cell back up to full charge. - -Robotics Control Console
- This useful piece of equipment can be used to immobilize or destroy a cyborg. A word of warning: Cyborgs are expensive pieces of equipment, do not destroy them without good reason, or the Company may see to it that it never happens again. - - -Cyborg Modules
- When a cyborg is created it picks out of an array of modules to designate its purpose. There are 6 different cyborg modules. - -Standard Cyborg
- The standard cyborg module is a multi-purpose cyborg. It is equipped with various modules, allowing it to do basic tasks.A Standard Cyborg comes with: -
-
-
Engineering Cyborg
- The Engineering cyborg module comes equipped with various engineering-related tools to help with engineering-related tasks.An Engineering Cyborg comes with: -
-
-
Mining Cyborg
- The Mining Cyborg module comes equipped with the latest in mining equipment. They are efficient at mining due to no need for oxygen, but their power cells limit their time in the mines.A Mining Cyborg comes with: -
-
-
Security Cyborg
- The Security Cyborg module is equipped with effective security measures used to apprehend and arrest criminals without harming them a bit.A Security Cyborg comes with: -
-
-
Janitor Cyborg
- The Janitor Cyborg module is equipped with various cleaning-facilitating devices.A Janitor Cyborg comes with: -
-
-
Service Cyborg
- The service cyborg module comes ready to serve your human needs. It includes various entertainment and refreshment devices. Occasionally some service cyborgs may have been referred to as "Bros."A Service Cyborg comes with: -
-
-
Cyborg Construction
- Cyborg construction is a rather easy process, requiring a decent amount of metal and a few other supplies.The required materials to make a cyborg are: -
-
-
To construct a cyborg, follow the steps below: -
-
-
Cyborg Maintenance
- Occasionally Cyborgs may require maintenance of a couple types, this could include replacing a power cell with a charged one, or possibly maintaining the cyborg's internal wiring. - -Replacing a Power Cell
- Replacing a Power cell is a common type of maintenance for cyborgs. It usually involves replacing the cell with a fully charged one, or upgrading the cell with a larger capacity cell.The steps to replace a cell are as follows: -
-
-
Exposing the Internal Wiring
- Exposing the internal wiring of a cyborg is fairly easy to do, and is mainly used for cyborg repairs.You can easily expose the internal wiring by following the steps below: -
-
-
-
-
Cyborg Repairs
- Occasionally a Cyborg may become damaged. This could be in the form of impact damage from a heavy or fast-travelling object, or it could be heat damage from high temperatures, or even lasers or Electromagnetic Pulses (EMPs). - -Dents
- If a cyborg becomes damaged due to impact from heavy or fast-moving objects, it will become dented. Sure, a dent may not seem like much, but it can compromise the structural integrity of the cyborg, possibly causing a critical failure. - Dents in a cyborg's frame are rather easy to repair, all you need is to apply a welding tool to the dented area, and the high-tech cyborg frame will repair the dent under the heat of the welder. - -Excessive Heat Damage
- If a cyborg becomes damaged due to excessive heat, it is likely that the internal wires will have been damaged. You must replace those wires to ensure that the cyborg remains functioning properly.To replace the internal wiring follow the steps below: -
-
-
In Case of Emergency
- In case of emergency, there are a few steps you can take. - -"Rogue" Cyborgs
- If the cyborgs seem to become "rogue", they may have non-standard laws. In this case, use extreme caution. - To repair the situation, follow these steps: --
-
As a last resort
- If all else fails in a case of cyborg-related emergency, there may be only one option. Using a Robotics Control console, you may have to remotely detonate the cyborg. -WARNING:
Do not detonate a borg without an explicit reason for doing so. Cyborgs are expensive pieces of company equipment, and you may be punished for detonating them without reason. - - - - "} - - -/obj/item/weapon/book/manual/security_space_law - name = "Corporate Regulations" - desc = "A set of corporate guidelines for keeping law and order on privately-owned space stations." - icon_state = "bookSpaceLaw" - item_state = "book13" - author = "The Company" - title = "Corporate Regulations" - -/obj/item/weapon/book/manual/security_space_law/New() - ..() - dat = {" - - - - - - - - - - - "} - - - -/obj/item/weapon/book/manual/medical_diagnostics_manual - name = "Medical Diagnostics Manual" - desc = "First, do no harm. A detailed medical practitioner's guide." - icon_state = "bookMedical" - item_state = "book12" - author = "Medical Department" - title = "Medical Diagnostics Manual" - -/obj/item/weapon/book/manual/medical_diagnostics_manual/New() - ..() - dat = {" - - - - --
The Oath
- - The Medical Oath sworn by recognised medical practitioners in the employ of [using_map.company_name]- -
-
-
- -
- - - - - - "} - - -/obj/item/weapon/book/manual/engineering_guide - name = "Engineering Textbook" - icon_state ="bookEngineering2" - item_state = "book3" - author = "Engineering Encyclopedia" - title = "Engineering Textbook" - -/obj/item/weapon/book/manual/engineering_guide/New() - ..() - dat = {" - - - - - - - - - - "} - - -/obj/item/weapon/book/manual/chef_recipes - name = "Chef Recipes" - icon_state = "cooked_book" - item_state = "book16" - author = "Victoria Ponsonby" - title = "Chef Recipes" - - dat = {" - - - - - -
Food for Dummies
- Here is a guide on basic food recipes and also how to not poison your customers accidentally. - -Basics:
- Knead an egg and some flour to make dough. Bake that to make a bun or flatten and cut it. - -Burger:
- Put a bun and some meat into the microwave and turn it on. Then wait. - -Bread:
- Put some dough and an egg into the microwave and then wait. - -Waffles:
- Add two lumps of dough and 10 units of sugar to the microwave and then wait. - -Popcorn:
- Add 1 corn to the microwave and wait. - -Meat Steak:
- Put a slice of meat, 1 unit of salt, and 1 unit of pepper into the microwave and wait. - -Meat Pie:
- Put a flattened piece of dough and some meat into the microwave and wait. - -Boiled Spaghetti:
- Put the spaghetti (processed flour) and 5 units of water into the microwave and wait. - -Donuts:
- Add some dough and 5 units of sugar to the microwave and wait. - -Fries:
- Add one potato to the processor, then bake them in the microwave. - - - - - "} - - -/obj/item/weapon/book/manual/barman_recipes - name = "Barman Recipes" - desc = "For the enterprising drink server." - icon_state = "barbook" - item_state = "book14" - author = "Sir John Rose" - title = "Barman Recipes" - - dat = {" - - - - - -Drinks for Dummies
- Here's a guide for some basic drinks. - -Black Russian:
- Mix vodka and Kahlua into a glass. - -Cafe Latte:
- Mix milk and coffee into a glass. - -Classic Martini:
- Mix vermouth and gin into a glass. - -Gin Tonic:
- Mix gin and tonic into a glass. - -Grog:
- Mix rum and water into a glass. - -Irish Cream:
- Mix cream and whiskey into a glass. - -The Manly Dorf:
- Mix ale and beer into a glass. - -Mead:
- Mix enzyme, water, and sugar into a glass. - -Screwdriver:
- Mix vodka and orange juice into a glass. - - - - "} - - -/obj/item/weapon/book/manual/detective - name = "The Film Noir: Proper Procedures for Investigations" - icon_state ="bookDetective" - item_state = "book8" - author = "The Company" - title = "The Film Noir: Proper Procedures for Investigations" - - dat = {" - - - - -Detective Work
- - Between your bouts of self-narration and drinking whiskey on the rocks, you might get a case or two to solve.- To have the best chance to solve your case, follow these directions: -
-
-
-
- It really is that easy! Good luck! - - - "} - -/obj/item/weapon/book/manual/nuclear - name = "Fission Mailed: Nuclear Sabotage 101" - icon_state ="bookNuclear" - item_state = "book8" - author = "Syndicate" - title = "Fission Mailed: Nuclear Sabotage 101" - - dat = {" -
- - - -Nuclear Explosives 101
- Hello and thank you for choosing the Syndicate for your nuclear information needs. Today's crash course will deal with the operation of a Nuclear Fission Device.- - First and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE. Pressing any button on the compacted bomb will cause it to extend and bolt itself into place. If this is done, to unbolt it, one must completely log in, which at this time may not be possible.
- -
To make the nuclear device functional
--
-
- - You now have activated the device. To deactivate the buttons at anytime, for example when you've already prepped the bomb for detonation, remove the authentication disk OR press R on the keypad.
- Now the bomb CAN ONLY be detonated using the timer. Manual detonation is not an option. Toggle off the SAFETY.
- Note: You wouldn't believe how many Syndicate Operatives with doctorates have forgotten this step.
- - So use the - - and + + to set a detonation time between 5 seconds and 10 minutes. Then press the timer toggle button to start the countdown. Now remove the authentication disk so that the buttons deactivate.
- Note: THE BOMB IS STILL SET AND WILL DETONATE
- - Now before you remove the disk, if you need to move the bomb, you can toggle off the anchor, move it, and re-anchor.
- - Remember the order:
- Disk, Code, Safety, Timer, Disk, RUN!
- Intelligence Analysts believe that normal corporate procedure is for the Site Manager to secure the nuclear authentication disk.
- - Good luck! - - - "} - -/obj/item/weapon/book/manual/atmospipes - name = "Pipes and You: Getting To Know Your Scary Tools" - icon_state = "pipingbook" - item_state = "book3" - author = "Maria Crash, Senior Atmospherics Technician" - title = "Pipes and You: Getting To Know Your Scary Tools" - dat = {" - - - - - -
Contents
--
-
- -
HOW TO NOT SUCK QUITE SO HARD AT ATMOSPHERICS
- Or: What the fuck does a "pressure regulator" do?
- - Alright. It has come to my attention that a variety of people are unsure of what a "pipe" is and what it does. - Apparently, there is an unnatural fear of these arcane devices and their "gases." Spooky, spooky. So, - this will tell you what every device constructable by an ordinary pipe dispenser within atmospherics actually does. - You are not going to learn what to do with them to be the super best person ever, or how to play guitar with passive gates, - or something like that. Just what stuff does.
- - -
Basic Pipes
- The boring ones.- Most ordinary pipes are pretty straightforward. They hold gas. If gas is moving in a direction for some reason, gas will flow in that direction. - That's about it. Even so, here's all of your wonderful pipe options.
- -
-
-
-
Insulated Pipes
-- -
Insulated Pipes
- Special Public Service Announcement.
- Our regular pipes are already insulated. These are completely worthless. Punch anyone who uses them.
- -
Devices:
- They actually do something.- This is usually where people get frightened, afraid, and start calling on their gods and/or cowering in fear. Yes, I can see you doing that right now. - Stop it. It's unbecoming. Most of these are fairly straightforward.
- -
-
-
Heat Exchange Systems
- Will not set you on fire.- These systems are used to only transfer heat between two pipes. They will not move gases or any other element, but will equalize the temperature (eventually). Note that because of how gases work (remember: pv=nRt), - a higher temperature will raise pressure, and a lower one will lower temperature.
- -
- - That's about it for pipes. Go forth, armed with this knowledge, and try not to break, burn down, or kill anything. Please. - - - - - "} - -/obj/item/weapon/book/manual/evaguide - name = "EVA Gear and You: Not Spending All Day Inside, 2nd Edition" - icon_state = "evabook" - item_state = "book14" - author = "Maria Crash, Senior Atmospherics Technician" - title = "EVA Gear and You: Not Spending All Day Inside, 2nd Edition" - dat = {" - - - - - -
EVA Gear and You: Not Spending All Day Inside, 2nd Edition
- Or: How not to suffocate because there's a hole in your shoes- -
Contents
--
-
- - EVA gear. Wonderful to use. It's useful for mining, engineering, and occasionally just surviving, if things are that bad. Most people have EVA training, - but apparently there are some on a space station who don't. This guide should give you a basic idea of how to use this gear, safely. It's split into three main sections: - softsuits, voidsuits, and hardsuits. General advice and instructions for modification are present as well.
- - One important point for synthetics and people using full-body prosthetics: You obviously don't need oxygen, but you do run the risk of overheating in vacuum. - Rather than oxygen, use a suit cooling unit. Many emergency equipment stores don't hold them, unfortunately, but dedicated EVA stores will. Be aware of your heat tolerances.
- -
Softsuits and Emergency Equipment
- The bulkiest things this side of Alpha Centauri- These suits are the both grey ones that are stored in EVA and orange emergency suits in emergency lockers. They're the more simple to get on, but are also a lot bulkier, and provide less protection from environmental hazards such as radiation or physical impact. - As Medical, Engineering, Security, and Mining all have voidsuits of their own, these don't see much use outside of emergencies. In an emergency, knowing how to put one on can save your life.
- - First, take the suit. It should be in three pieces: A top, a bottom, and a helmet. Put the bottom on first, shoes and the like will fit in it. If you have magnetic boots, however, - put them on on top of the suit's feet. Next, get the top on, as you would a shirt. It can be somewhat awkward putting these pieces on, due to the makeup of the suit, - but to an extent they will adjust to you. You can then find the snaps and seals around the waist, where the two pieces meet. Fasten these, and double-check their tightness. - The red indicators around the waist of the lower half will turn green when this is done correctly. Next, put on whatever breathing apparatus you're using, be it a gas mask or a breath mask. Make sure the oxygen tube is fastened into it. - Put on the helmet now, straightforward, and make sure the tube goes into the small opening specifically for internals. Again, fasten seals around the neck, a small indicator light in the inside of the helmet should go from red to off when all is fastened. - There is a small slot on the side of the suit where an emergency oxygen tank or extended emergency oxygen tank will fit, - but it is recommended to have a full-sized tank on your back for EVA.
- - Important note: When using these, especially in emergencies, be aware of your surroundings! These suits can tear or breach more easily than any other type, especially in an environment with broken glass and metal everywhere. - If your suit is breached, you will be in deep trouble. Pressure issues can inhibit breathing even with internals.
- - These suits tend to be wearable by most species. They're large and flexible. They might be pretty uncomfortable for some, though, so keep that in mind.
- -
Voidsuits
- Heavy, uncomfortable, still the best option.- These suits come in many specialized varieties. The most common are engineering, atmospherics, security, medical, and mining varieties. - These provide a lot more protection than the standard suits, and depending on the specialization, can offer different protections. - For example, security suits have armor plating, engineering suits have radiation protection, and atmospherics suits are rated for extremely high temperatures.
- - Similarly to the softsuits, these are split into three parts. Fastening the pant and top are mostly the same as the softsuits, with the exception that these are a bit heavier, - though not as bulky. The helmet goes on differently, with the air tube feeding into the suit and out a hole near the left shoulder, while the helmet goes on turned ninety degrees counter-clockwise, - and then is turned to face the front and sealed. There is a small button on the right side of the helmet that activates the helmet light. - The tanks that fasten onto the side slot are emergency tanks, as well as full-sized oxygen tanks, leaving your back free for a backpack or satchel.
- - These suits generally only fit one species. NanoTrasen's are usually human-fitting by default, but there's equipment that can make modifications to the hardsuits to fit them to other species.
- - Later-model voidsuits can have magboots and helmets installed into the suit and deployed when needed. Check the operator's manual for individual suits to see how the helmets are installed. - If a helmet is installed, you can skip it while putting the suit on, obviously. When deployed, it will deploy from the back of your neck, covering the head and sealing at the front.
- -
Hardsuits/Rigs
- The fancy stuff.- Proper hardsuits are the most complex sort of EVA equipment available, and blur the line between spacesuits and smaller exosuits. They're sometimes known as 'rigs' or 'powered armor'. - These are the suits with the widest variety of uses, owing to the wide variety of equipment that can be installed on them. Like voidsuits, they come in different, specialized varieties, each one offering different protections and different equipment. - Equipment that can be installed includes weapons, power tools, mining equipment, medical equipment, AI assistants, and more.
- - Putting these on is relatively simple. They come as compact packs, worn like a backpack and secured with a harness. Activating them, though, is a more complex process. The suit deploys from the module similarly to helmets deploying from voidsuits. - After it covers the whole body, the suit can be started. The startup sequence takes some time. The suit will automatically fit itself to your body, sealing each section individually - boots, gloves, pants, torso, and helmet - then connecting them.
- - Operating a hardsuit is a much more complicated proposal than operating other EVA equipment. While putting them on is relatively simple, and operating basic functions like oxygen and magboots is the same as other suits, the rest is far more complex. - Consult the operator's manual for invidual pieces of equipment that you plan to use. Use of these for heavy work is only reccomended for people who have specialized training and extensive EVA experience. - The potential of a suit breach is always there, and the use of powered equipment raises it significantly.
- -
Miscellaneous Advice
- Pro tip: Safety first.- There's a lot of general advice that can be helpful for people who haven't taken a long-form instruction course. Much of this is going to be fairly obvious safety advice, but it's never bad to remind yourself of that.
- -
-
-
-
Modification Equipment
- How to actually make voidsuits fit you.- There's a variety of equipment that can modify hardsuits to fit species that can't fit into them, making life quite a bit easier.
- - The first piece of equipment is a suit cycler. This is a large machine resembling the storage pods that are in place in some places. These are machines that will automatically tailor a suit to certain specifications. - The largest uses of them are for their cleaning functions and their ability to tailor suits for a species. Do not enter them physically. You will die from any of the functions being activated, and it will hurt the whole time you're dying. - These machines can both tailor a suit between species, and between types. This means you can convert engineering hardsuits to atmospherics, or the other way. This is useful. Use it if you can.
- - There's also modification kits that let you modify suits yourself. These are extremely difficult to use unless you understand the actual construction of the suit. I do not reccomend using them unless no other option is available.
- -
Final Checks
--
-
-
A Guide to Virology, 1st Edition
- Welcome to virology!- - A virologist spends much of their time isolated in the virology department fiddling with deadly and annoying plagues. This guide will get you on the right path to properly
- creating and curing the worst of the worst.
- -
Anatomy of a Virus
- Before you jump in to making the next Black Death, you need to understand what's what. When you pop a tray into the disease analyzer you'll get a paper listing quite a few- things about that virus!
- - Antigens
- The first thing you might notice on this analysis is the listed antigens of a virus. This, essentially, is what you need for cures. When a patient develops an antibody that
- matches a disease's antigen, they'll be immune to the virus.
- - Transmission
- This will list one of three methods of transmission: airborne, contact, or blood. Airborne viruses will spread through the air, meaning if a patient is coughing or sneezing
- it will spread quicker. Contactviruses need some sort of, well, contact. Blood on the floor, mucus, and vomit should all be cleaned up. Blood-transmission viruses will only
- spread through actual blood contact, meaning an injection of the virus would be necessary to spread it.
- - Species
- Not all viruses are compatible with all species! This will list off what can be infected by a particular virus. This can be changed through splicing. In rare cases you will
- get a virus that has infected crewmembers but cannot infect your lab monkeys. In these cases, you will likely have to splice different species data to safely make a cure.
- - Symptoms
- This lists what all the virus does, along with the strength of the symptoms and their aggressiveness. A full list of symptoms and their stages can be found below.
- -
Protection
- First off, any good virologist needs to gear up!- Your virology lab should have the following: -
-
-
- Make sure to gear up appropriately and take precautions to not bring the virus out of the lab!
- What needs to be worn varies from race to race, as some species cannot be affected by a virus, but
- precautions should always be taken to prevent accidentally carrying the virus out of containment.
- -
Machinery
- These are the types of machines that you will be expected to use in this department. Study them, know them, and make sure you use them correctly!- - Antibody Scanner
- A device similar to a health analyzer, when scanned over a patient it will tell you any present antibodies in their bloodstream.
- - Pathogenic Isolator
- This device can be loaded with blood samples via a syringe. It will tell you if there is a present viral pathogen, and if so it can isolate the pathogen,
- producing a virus dish for further research. This is the primary means of creating virus dishes.
- - Pathogenic Incubator
- One of the most important machines, you'll be sitting here a lot. Virus trays you produce will start small, and you will need to grow them to get anywhere.
- Load it with virus food (diluted milk, found in a wall mounted dispenser nearby) as well as a virus dish and turn it on. It will slowly grow the virus
- for analysis, splicing, or whatever other use you might find for it. It can also inject the virus into other chemicals (i.e. blood) which will allow you
- to artificially infect a blood sample to infect test subjects.
- - Additionally, it can irradiate a virus dish to cause mutation. This randomly alters the syndromes, allowing you to collect new data.
- - Disease Analyser
- Virus dishes may be placed into this machine after it has been incubated sufficiently. It will create a reading of the virus' symptoms, species targeted,
- associated antibodies, and so on. It will also update the disease into the digital database, allowing it to be detected via Medical HUD or health analyzer.
- - Isolation Centrifuge
- Inserting a vial of blood into this machine will allow it to take a present pathogen or antibody, turning it into a pure virus or pure cure for your use.
- It will automatically detect if either are in the blood sample, so it is useful for determining if a sample is infected. The sample will be reusable if creating
- more of the virus, but will be expended upon creating antibodies.
- - Disease Splicer
- As it's name implied, this machine is for splicing the disease symptoms and creating new viruses. Insert an analyzed virus sample to take a symptom which can
- then be saved on a GNA disk (created by the machine), or use an existing disk on the machine to load up a symptom and splice it in.
- -
Syndromes
- While curing patients is the obvious side to virology, there's more you can do! For a variety of reasons you may wish to engineer your own virus through mutations- and splicing. Keep in mind that infecting the whole station with a deadly virus is generally frowned upon in most societies, and even in an antagonistic role simply
- infecting everyone with a very deadly virus is not ideal.
- - Obtaining a Sample
- The first step to making your own virus is to find a virus to start tinkering with. There are two ways of doing this: grabbing the pre-spawned virus dish from the
- freezer create in your laboratory, or taking a blood sample from an infected patient that you haven't cured yet and running it through the Pathogenic Isolator to
- produce a virus dish.
- - In either case, you'll then need to incubate the virus in the Pathogenic Incubator until it is of sufficient size for you to work with, and ideally also run it
- through the Disease Analyzer to get an idea of what it does. This will also keep the rest of Medical from getting on your case about not giving them the ability to
- detect viral outbreaks without you, and will help prevent public lynchings if someone sneezes.
- - Once that's all done, you're ready to start the real work.
- - Obtaining a Sample
- Sometimes you just need to infect somebody. Usually, this is because you're doing some splicing work and want to make sure that you'll have some copies of a virus
- in reserve for future study. Fortunately, the process of deliberately infecting patients, as well as creating backups of your viruses, is actually very simple.
- - If you have a virus dish and wish to infect a patient, place the dish into the Pathogenic Incubator along with a beaker full of blood. Ideally, this is the
- patient's (or test monkey's) blood, though anyone's will do in a pinch - just be aware of the possibility of blood rejection, and be ready to deal with it accordingly.
- The incubator can inject a sample of the virus into the blood, which you can then inject into the patient to infect them. Alternatively, once a blood sample is infected
- you may place it in either the Pathogenic Isolator or Isolation Centrifuge to make as many samples of that virus you need without destroying the sample.
- No infections necessary!
- - Splicing
- To understand splicing, you must know that every virus has 4 GNA strands, each of which is tied to one of the syndromes that it can manifest. Each syndrome, and thus each
- strand, is ranked in order of its appearance when symptoms begin to manifest in a patient, and higher-ranked (and thus slower to appear) syndromes are likely to be more
- powerful than lower-ranked ones. (1) is the lowest, first symptom to manifest, and (4) is the highest, final symptom to manifest.
- - The Disease Splicer will allow you to examine and manipulate a virus' GNA strands to create a virus with any syndromes that you want.
- - The splicer has main three functions which allow you to modify viruses and define which GNA strands they contain. The first of these functions is the splicing function,
- which copies a GNA strand from an inserted virus tray to the disease splicer buffer. This is done by selecting the desired GNA strand under "Reverse Engineering".
- Doing so will destroy the virus tray in the process, so be sure that you have more samples of the virus on hand if you want to preserve it.
- - The disease splicer’s second function is to copy whatever strand it has stored in its buffer to a disk the machine creates. These disks can be re-inserted into
- the disease splicer later, making their stored GNA strand immediately available for use. Unlike virus trays, disks can be reused without destroying them.
- - The final function of the disease splicer is to copy over a GNA strand of its loaded virus dish with the corresponding GNA strand that is currently stored in
- its buffer. This effectively allows you to give a virus any set of symptoms you want, so long as it follows the rules of the ranking. A rank (1) symptom can fill
- any slot, while a (3) can only fill 3 and up, and a (4) can only be in the fourth slot.
- - Mutating
- Sometimes you just don't have any of the symptoms you want. Fortunately, mutating a virus dish is very simple. Simply place a dish in the Pathogenic Incubator
- to get started and click 'add radiation'. This will fill up the radiation bar with each press. When the machine is on, this bar will slowly tick down as the radiation
- is applied to the sample. For any significant mutation the radiation should be over 500k, meaning at least half the bar. When a mutation occurs -- and multiple
- mutations can occur in a single sample -- there will be a ping from the machine. Once it's done growing and mutating, throw it into the analyzer and see what you got!
- - With these functions in mind, the process in order for you to develop your own virus is as follows: -
-
-
Curing
- Curing a virus is relatively simple, but the below will leave you without a sample to work with. If this is a concern, see 'obtaining a sample' above. Alternatively to- the below, spacecillin can be used in a pinch to attempt to treat a virus if no virologist is present and someone decided to roll around in mucus. However this is not
- guaranteed to work, and can in fact simply make the virus more resistant to spacecillin.
- - Quarantine
- If you or a crew member becomes infected by a virus, your first concern should be to isolate them as quickly as possible to prevent the disease from spreading. Ideally,
- this means getting the patient back to Virology and into a holding cell, but failing that, it's important to get them into an isolated room, shut the door, and keep anyone
- else from entering. It is also important to clean up any blood, vomit, or mucus left behind by the patient, as it may spread the virus as well.
- - Antibodies
- Now that your patient is safely hidden away where they can't infect people without your permission, you want to cure them. The basic idea behind that is to get them to start
- synthesizing antibodies.
- - Antibodies are produced by living organisms that have started to fight off a virus in their bloodstream. An organism that has produced antibodies is effectively
- immune to any virus that is weak to those antibodies, which are generally denoted by a short string of letters (say, "KM" or similar) to let you know which viruses they
- are effective against. Even better, once an organism has synthesized antibodies for itself, you can take a blood sample and use that to create more antibodies, which you
- can then inject into other people to cure the virus in them, or even to prevent them from catching it in the first place. And you can take blood samples from those people
- to make even more antibodies.
- - The issue is that, most of the time, a patient's immune system is not powerful enough to create antibodies on its own (space plagues are nasty things), so you have to do that
- for them. You do that by injecting them with Radium.
- - Since Radium is radioactive, this is obviously not something that you want to do to your actual patients. It'll cause major toxin damage when an antibody is
- made and quickly lead to organ failure. You get around this by using monkeys, which you can get from the box of monkey cubes very handily left on the desk in Virology for
- this very purpose.
- - So the process of curing diseases is, really, quite simple. Find an infected patient. Make a monkey (ideally, strap this monkey to a bed in an isolation cell to make the
- rest of this process easier). Take a blood sample from the infected patient, then inject it into the monkey to infect the monkey. Inject the monkey with Radium. Use the antibody
- scanner on the monkey every few seconds until it says that the monkey has begun producing antibodies, then take a blood sample (or two or three or four) from the
- monkey. Put the blood sample(s) into a vial, then put the vial into the isolation centrifuge and isolate the antibodies. Voila: a bottle of virus cure. Inject it into as many
- people as you like, then throw the (likely dead) monkey into the disposals chute to eject its disease-ridden body into space and clean the isolation cell. Or, if you're on
- the ball and wish to be conservative with your limited monkey cubes, save the monkey, too.
- - Congratulations! You have now cured a disease.
- - The important thing to remember is that anyone injected with antibodies becomes a source of those antibodies for the future. You can take a sample of their blood
- and put it into the isolation centrifuge just like you did with the monkey's to produce more antibodies if you ever run out. For this reason, and because you might have
- gotten infected yourself in the process of synthesizing a cure, most Virologists will inject themselves with any antibodies they produce.
- -
Syndromes
- Below are the possible syndromes of a virus and the stages they can appear at. A stage covers that stage and higher, so a stage 1 syndrome can appear at stage 4.- A stage 4 syndrome, however, cannot appear any earlier than stage 4.
- -
| Stage | -Name | -Effects - |
|---|---|---|
| 1 | -Sneezing | -Makes the patient sneeze. Spreads airborne disease! - |
| 1 | -Mucus Buildup | -Makes the patient's throat fill with mucus. - |
| 1 | -Salivary Gland Stimulation | -Makes the patient drool. Spreads the disease! - |
| 1 | -Involuntary Twitching | -Makes the patient twitch. - |
| 1 | -Headache | -Gives the patient a headache. - |
| 1 | -Mlemington's Syndrome | -Makes the patient 'mlem' uncontrollably. - |
| 1 | -Spyndrome | -Makes the patient spin uncontrollably. - |
| 2 | -Involuntary Vocalization | -Makes the patient scream. - |
| 2 | -Vomiting | -Makes the patient vomit. Spreads the disease! - |
| 2 | -Excessive Sleepiness | -Makes the patient drowsy. - |
| 2 | -Narcolepsy | -Makes the patient pass out at random. - |
| 2 | -Vision Loss | -Causes partial blindness. - |
| 2 | -Severe Cough | -Causes coughing. Spreads airborne disease! - |
| 2 | -Digestive Inefficiency | -Makes the patient always hungry. - |
| 2 | -Reduced Circulation | -Makes the patient shiver. - |
| 2 | -Hair Loss | -Causes the patient's hair to fall out. - |
| 2 | -Overactive Adrenal Gland | -Makes the patient jittery, but also faster. - |
| 2 | -Tinnitus | -Causes ringing in the patient's ears. - |
| 2 | -Lingual Dissocation | -Scrambles the patients language center of their brain. - |
| 3 | -Hyperacidity | -Causes small amounts of toxin damage. - |
| 3 | -Nervous Motor Instability | -Makes the patient shaky. - |
| 3 | -Pineal Gland Decalcification | -Gives the patient telepathy. - |
| 3 | -Neurodegeneration | -Causes brain damage. - |
| 3 | -Hallucination | -Causes hallucinations. - |
| 3 | -Hearing Loss | -A less severe hearing damage. - |
| 3 | -Topographical Cretinism | -Makes the patient incapable of walking straight. - |
| 3 | -Uncontrolled Laughter | -Causes the patient to laugh uncontrollably. - |
| 3 | -DNA Degradation | -Causes genetic damage. - |
| 3 | -Phantom Aches | -Causes groaning. - |
| 3 | -Chemical Synthesis | -Causes the synthesis of a certain chemical in the patient's bloodstream. - |
| 3 | -Genetic Chameleonism | -Prevents the patient from experiencing organ rejection. - |
| 3 | -Mass Revectoring | -Causes the patient to suddenly change size. - |
| 3 | -Flipponov's Disease | -Causes the patient to uncontrollably do a flip. - |
| 4 | -Gibbingtons | -Gibs the patients slowly. - |
| 4 | -Radian's Syndrome | -Irradiates the patient from the inside. - |
| 4 | -Deafness | -Causes complete deafness. - |
| 4 | -Genome Regression | -Turns the patient into the primitive form of their species. - |
| 4 | -Windpipe Contraction | -Causes the patient to involuntarily hold their breath. - |
| 4 | -Autoimmune Response | -Adds toxins to the patient's bloodstream. - |
| 4 | -Catastrophic DNA Degeneration | -Causes genetic damage and scrambles the patient's genes. - |
| 4 | -Limb Paralysis | -Temporary loss of use in the patient's individual arms and legs. - |
| 4 | -Organ Shutdown | -Slowly causes internal organ damage at random. - |
| 4 | -Hyperaccelerated Aging | -Ages the patient, causing external damage. - |
| 4 | -Brittle Bones | -Causes bones to break more easily. - |
| 4 | -Organic Ignition | -Slowly causes the patient to burst into flames. - |
- - +/*********************MANUALS (BOOKS)***********************/ + +/obj/item/weapon/book/manual + icon = 'icons/obj/library.dmi' + due_date = 0 // Game time in 1/10th seconds + unique = 1 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified + + +/obj/item/weapon/book/manual/engineering_construction + name = "Station Repairs and Construction" + icon_state ="bookEngineering" + item_state = "book3" + author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned + title = "Station Repairs and Construction" + +/obj/item/weapon/book/manual/engineering_construction/New() + ..() + dat = {" + + + + + + + + + + + "} + +/obj/item/weapon/book/manual/engineering_particle_accelerator + name = "Particle Accelerator User's Guide" + icon_state ="bookParticleAccelerator" + item_state = "book15" + author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned + title = "Particle Accelerator User's Guide" + +/obj/item/weapon/book/manual/engineering_particle_accelerator/New() + ..() + dat = {" + + + + + +
Experienced User's Guide
+ +Setting up the accelerator
+ +-
+
Using the accelerator
+ +-
+
OPERATING MANUAL FOR MK 1 PROTOTYPE THERMOELECTRIC SUPERMATTER ENGINE 'TOMBOLA'
++
OPERATING PRINCIPLES
++
+
+
+
+
+
SUPERMATTER HANDLING
++
STANDARD STARTUP PROCEDURE
+-
+
+
OPERATION AND MAINTENANCE
+-
+
+
EMERGENCY COOLING PROCEDURE
+-
+
+
EJECTION PROCEDURE
+-
+
OPERATING MANUAL FOR MK 2 PROTOTYPE TESLA ENGINE 'EDISON'S BANE'
++
OPERATING PRINCIPLES
+This big floaty ball of pure electricity can only be contained by the containment field. It periodically will discharge energy in the form of an electric shock which can be harvested for energy.
+When you shoot the energy ball with the Particle Accelerator, it gains energy, and when enough energy is accumulated a mini-energy ball that orbits the big energy ball will be formed. This can happen as many times as you let it, each mini-ball will send off an extra shock when the energy ball pulses. Be warned, the more mini-balls the energy ball has, the more shocks it sends out at once and the further it can travel each move.
+An energy ball will shoot bolts of electricity off at conductors, which it prioritizes in this order: +
-
+
Tesla Coils will attract the energy ball's bolts. They will take half the power of the bolt (if they are connected to a wire node), pump it into the powernet it is hooked to, and then will send the other half of the power to the next available conductor, which follows the criteria listed above. Preferably, this will be another coil to harness more of the power and pump it into the grid.
+Grounding Rods are safety precautions to prevent the tesla bolts from hitting machinery or personnel. If the tesla is loose, being near one will usually keep you safe from direct shocks.
++
STARTUP PROCEDURE
+-
+
+
OPERATION AND MAINTENANCE
+-
+
+
SHUTDOWN PROCEDURE
+-
+
+
ENERGY BALL ESCAPE PROCEDURE
+-
+
+
-
+
+ NOTES FOR NEWBIES +
+ Anything touching the field will mess with its stability and eventually cause it to rupture. Rupturing is bad. Use the gyrotron to keep instability down if you're running the engine on unstable fuel. +
+ Likewise, no matter how sad the core seems, don't fucking hug it, you'll blow the field out and set the engine room on fire. + + "} + +/obj/item/weapon/book/manual/engineering_hacking + name = "Hacking" + icon_state ="bookHacking" + item_state = "book2" + author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned + title = "Hacking" + +/obj/item/weapon/book/manual/engineering_hacking/New() + ..() + dat = {" + + + + + + + + + + + "} + + +/obj/item/weapon/book/manual/engineering_singularity_safety + name = "Singularity Safety in Special Circumstances" + icon_state ="bookEngineeringSingularitySafety" + item_state = "book15" + author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned + title = "Singularity Safety in Special Circumstances" + + dat = {" + + + + +
Singularity Safety in Special Circumstances
+ +Power outage
+ + A power problem has made the entire station lose power? Could be station-wide wiring problems or syndicate power sinks. In any case follow these steps: + +-
+
Shields get damaged
+ +-
+
Growing a Diona
+ + Growing a Diona is easy! ++
-
+
+ Note that for a successful harvest, the body from which the blood was taken from must be dead BEFORE harvesting the pod, however the pod can be growing while they are still alive. Otherwise, the soul would not be able to migrate to the new Diona body.
+
+ It really is that easy! Good luck!
+
+
+
+ "}
+
+
+/obj/item/weapon/book/manual/medical_cloning
+ name = "Cloning Techniques of the 26th Century"
+ icon_state ="bookCloning"
+ item_state = "book9"
+ author = "Medical Journal, volume 3" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
+ title = "Cloning Techniques of the 26th Century"
+
+ dat = {"
+
How to Clone People
+ So there are 50 dead people lying on the floor, chairs are spinning like no tomorrow and you haven't the foggiest idea of what to do? Not to worry! + This guide is intended to teach you how to clone people and how to do it right, in a simple, step-by-step process! If at any point of the guide you have a mental meltdown, + genetics probably isn't for you and you should get a job-change as soon as possible before you're sued for malpractice. + +-
+
Step 1: Acquire body
+ This is pretty much vital for the process because without a body, you cannot clone it. Usually, bodies will be brought to you, so you do not need to worry so much about this step. If you already have a body, great! Move on to the next step. + +Step 2: Strip body
+ The cloning machine does not like abiotic items. What this means is you can't clone anyone if they're wearing clothes or holding things, so take all of it off. If it's just one person, it's courteous to put their possessions in the closet. + If you have about seven people awaiting cloning, just leave the piles where they are, but don't mix them around and for God's sake don't let people in to steal them. + +Step 3: Put body in cloning machine
+ Grab the body and then put it inside the DNA modifier. If you cannot do this, then you messed up at Step 2. Go back and check you took EVERYTHING off - a commonly missed item is their headset. + +Step 4: Scan body
+ Go onto the computer and scan the body by pressing 'Scan - <Subject Name Here>.' If you're successful, they will be added to the records (note that this can be done at any time, even with living people, + so that they can be cloned without a body in the event that they are lying dead on port solars and didn't turn on their suit sensors)! + If not, and it says "Error: Mental interface failure.", then they have left their bodily confines and are one with the spirits. If this happens, just shout at them to get back in their body, + click 'Refresh' and try scanning them again. If there's no success, threaten them with gibbing. + Still no success? Skip over to Step 7 and don't continue after it, as you have an unresponsive body and it cannot be cloned. + If you got "Error: Unable to locate valid genetic data.", you are trying to clone a monkey - start over. + +Step 5: Clone body
+ Now that the body has a record, click 'View Records,' click the subject's name, and then click 'Clone' to start the cloning process. Congratulations! You're halfway there. + Remember not to 'Eject' the cloning pod as this will kill the developing clone and you'll have to start the process again. + +Step 6: Get clean SEs for body
+ Cloning is a finicky and unreliable process. Whilst it will most certainly bring someone back from the dead, they can have any number of nasty disabilities given to them during the cloning process! + For this reason, you need to prepare a clean, defect-free Structural Enzyme (SE) injection for when they're done. If you're a competent Geneticist, you will already have one ready on your working computer. + If, for any reason, you do not, then eject the body from the DNA modifier (NOT THE CLONING POD) and take it next door to the Genetics research room. Put the body in one of those DNA modifiers and then go onto the console. + Go into View/Edit/Transfer Buffer, find an open slot and click "SE" to save it. Then click 'Injector' to get the SEs in syringe form. Put this in your pocket or something for when the body is done. + +Step 7: Put body in morgue
+ Now that the cloning process has been initiated and you have some clean Structural Enzymes, you no longer need the body! Drag it to the morgue and tell the Chef over the radio that they have some fresh meat waiting for them in there. + To put a body in a morgue bed, simply open the tray, grab the body, put it on the open tray, then close the tray again. Use one of the nearby pens to label the bed "CHEF MEAT" in order to avoid confusion. + +Step 8: Await cloned body
+ Now go back to the lab and wait for your patient to be cloned. It won't be long now, I promise. + +Step 9: Cryo and clean SE injector on person
+ Has your body been cloned yet? Great! As soon as the guy pops out, grab them and stick them in cryo. Clonexadone and Cryoxadone help rebuild their genetic material. Then grab your clean SE injector and jab it in them. Once you've injected them, + they now have clean Structural Enzymes and their defects, if any, will disappear in a short while. + +Step 10: Give person clothes back
+ Obviously the person will be naked after they have been cloned. Provided you weren't an irresponsible little shit, you should have protected their possessions from thieves and should be able to give them back to the patient. + No matter how cruel you are, it's simply against protocol to force your patients to walk outside naked. + +Step 11: Send person on their way
+ Give the patient one last check-over - make sure they don't still have any defects and that they have all their possessions. Ask them how they died, if they know, so that you can report any foul play over the radio. + Once you're done, your patient is ready to go back to work! Chances are they do not have Medbay access, so you should let them out of Genetics and the Medbay main entrance. + +If you've gotten this far, congratulations! You have mastered the art of cloning. Now, the real problem is how to resurrect yourself after that traitor had his way with you for cloning his target. + + + + "} + + +/obj/item/weapon/book/manual/ripley_build_and_repair + name = "APLU \"Ripley\" Construction and Operation Manual" + icon_state ="book" + item_state = "book" + author = "Randall Varn, Einstein Engines Senior Mechanic" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned + title = "APLU \"Ripley\" Construction and Operation Manual" + + dat = {" +
+ + + ++ Weyland-Yutani - Building Better Worlds +
Autonomous Power Loader Unit \"Ripley\"
+Specifications:
+-
+
Construction:
+-
+
Additional Information:
+-
+
Science For Dummies
+ So you want to further SCIENCE? Good man/woman/thing! However, SCIENCE is a complicated process even though it's quite easy. For the most part, it's a three step process: +-
+
The R&D Console
+ The R&D console is the cornerstone of any research lab. It is the central system from which the Destructive Analyzer, Protolathe, and Circuit Imprinter (your R&D systems) are controlled. More on those systems in their own sections. + On its own, the R&D console acts as a database for all your technological gains and new devices you discover. So long as the R&D console remains intact, you'll retain all that SCIENCE you've discovered. Protect it though, + because if it gets damaged, you'll lose your data! + In addition to this important purpose, the R&D console has a disk menu that lets you transfer data from the database onto disk or from the disk into the database. + It also has a settings menu that lets you re-sync with nearby R&D devices (if they've become disconnected), lock the console from the unworthy, + upload the data to all other R&D consoles in the network (all R&D consoles are networked by default), connect/disconnect from the network, and purge all data from the database.+ + NOTE: The technology list screen, circuit imprinter, and protolathe menus are accessible by non-scientists. This is intended to allow 'public' systems for the plebians to utilize some new devices. + +
Destructive Analyzer
+ This is the source of all technology. Whenever you put a handheld object in it, it analyzes it and determines what sort of technological advancements you can discover from it. If the technology of the object is equal or higher then your current knowledge, + you can destroy the object to further those sciences. + Some devices (notably, some devices made from the protolathe and circuit imprinter) aren't 100% reliable when you first discover them. If these devices break down, you can put them into the Destructive Analyzer and improve their reliability rather than further science. + If their reliability is high enough, it'll also advance their related technologies. + +Circuit Imprinter
+ This machine, along with the Protolathe, is used to actually produce new devices. The Circuit Imprinter takes glass and various chemicals (depends on the design) to produce new circuit boards to build new machines or computers. It can even be used to print AI modules. + +Protolathe
+ This machine is an advanced form of the Autolathe that produce non-circuit designs. Unlike the Autolathe, it can use processed metal, glass, solid phoron, silver, gold, and diamonds along with a variety of chemicals to produce devices. + The downside is that, again, not all devices you make are 100% reliable when you first discover them. + +Reliability and You
+ As it has been stated, many devices, when they're first discovered, do not have a 100% reliability. Instead, + the reliability of the device is dependent upon a base reliability value, whatever improvements to the design you've discovered through the Destructive Analyzer, + and any advancements you've made with the device's source technologies. To be able to improve the reliability of a device, you have to use the device until it breaks beyond repair. Once that happens, you can analyze it in a Destructive Analyzer. + Once the device reaches a certain minimum reliability, you'll gain technological advancements from it. + +Building a Better Machine
+ Many machines produced from circuit boards inserted into a machine frames require a variety of parts to construct. These are parts like capacitors, batteries, matter bins, and so forth. As your knowledge of science improves, more advanced versions are unlocked. + If you use these parts when constructing something, its attributes may be improved. + For example, if you use an advanced matter bin when constructing an autolathe (rather than a regular one), it'll hold more materials. Experiment around with stock parts of various qualities to see how they affect the end results! Be warned, however: + Tier 3 and higher stock parts don't have 100% reliability and their low reliability may affect the reliability of the end machine. + + + "} + +/obj/item/weapon/book/manual/robotics_manual + name = "Guide to Robotics" + icon_state ="evabook" + item_state = "book3" + author = "Simple Robotics" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned + title = "Guide to Robotics" + +/obj/item/weapon/book/manual/robotics_manual/New() + ..() + dat = {" + + + + + + + "} + +/obj/item/weapon/book/manual/robotics_cyborgs + name = "Cyborgs for Dummies" + icon_state = "borgbook" + item_state = "book1" + author = "XISC" + title = "Cyborgs for Dummies" + + dat = {" + + + + + +Cyborgs for Dummies
+ +Chapters
+ +-
+
Cyborg Related Equipment
+ +Exosuit Fabricator
+ The Exosuit Fabricator is the most important piece of equipment related to cyborgs. It allows the construction of the core cyborg parts. Without these machines, cyborgs cannot be built. It seems that they may also benefit from advanced research techniques. + +Cyborg Recharging Station
+ This useful piece of equipment will suck power out of the power systems to charge a cyborg's power cell back up to full charge. + +Robotics Control Console
+ This useful piece of equipment can be used to immobilize or destroy a cyborg. A word of warning: Cyborgs are expensive pieces of equipment, do not destroy them without good reason, or the Company may see to it that it never happens again. + + +Cyborg Modules
+ When a cyborg is created it picks out of an array of modules to designate its purpose. There are 6 different cyborg modules. + +Standard Cyborg
+ The standard cyborg module is a multi-purpose cyborg. It is equipped with various modules, allowing it to do basic tasks.A Standard Cyborg comes with: +
-
+
Engineering Cyborg
+ The Engineering cyborg module comes equipped with various engineering-related tools to help with engineering-related tasks.An Engineering Cyborg comes with: +
-
+
Mining Cyborg
+ The Mining Cyborg module comes equipped with the latest in mining equipment. They are efficient at mining due to no need for oxygen, but their power cells limit their time in the mines.A Mining Cyborg comes with: +
-
+
Security Cyborg
+ The Security Cyborg module is equipped with effective security measures used to apprehend and arrest criminals without harming them a bit.A Security Cyborg comes with: +
-
+
Janitor Cyborg
+ The Janitor Cyborg module is equipped with various cleaning-facilitating devices.A Janitor Cyborg comes with: +
-
+
Service Cyborg
+ The service cyborg module comes ready to serve your human needs. It includes various entertainment and refreshment devices. Occasionally some service cyborgs may have been referred to as "Bros."A Service Cyborg comes with: +
-
+
Cyborg Construction
+ Cyborg construction is a rather easy process, requiring a decent amount of metal and a few other supplies.The required materials to make a cyborg are: +
-
+
To construct a cyborg, follow the steps below: +
-
+
Cyborg Maintenance
+ Occasionally Cyborgs may require maintenance of a couple types, this could include replacing a power cell with a charged one, or possibly maintaining the cyborg's internal wiring. + +Replacing a Power Cell
+ Replacing a Power cell is a common type of maintenance for cyborgs. It usually involves replacing the cell with a fully charged one, or upgrading the cell with a larger capacity cell.The steps to replace a cell are as follows: +
-
+
Exposing the Internal Wiring
+ Exposing the internal wiring of a cyborg is fairly easy to do, and is mainly used for cyborg repairs.You can easily expose the internal wiring by following the steps below: +
-
+
-
+
Cyborg Repairs
+ Occasionally a Cyborg may become damaged. This could be in the form of impact damage from a heavy or fast-travelling object, or it could be heat damage from high temperatures, or even lasers or Electromagnetic Pulses (EMPs). + +Dents
+ If a cyborg becomes damaged due to impact from heavy or fast-moving objects, it will become dented. Sure, a dent may not seem like much, but it can compromise the structural integrity of the cyborg, possibly causing a critical failure. + Dents in a cyborg's frame are rather easy to repair, all you need is to apply a welding tool to the dented area, and the high-tech cyborg frame will repair the dent under the heat of the welder. + +Excessive Heat Damage
+ If a cyborg becomes damaged due to excessive heat, it is likely that the internal wires will have been damaged. You must replace those wires to ensure that the cyborg remains functioning properly.To replace the internal wiring follow the steps below: +
-
+
In Case of Emergency
+ In case of emergency, there are a few steps you can take. + +"Rogue" Cyborgs
+ If the cyborgs seem to become "rogue", they may have non-standard laws. In this case, use extreme caution. + To repair the situation, follow these steps: +-
+
As a last resort
+ If all else fails in a case of cyborg-related emergency, there may be only one option. Using a Robotics Control console, you may have to remotely detonate the cyborg. +WARNING:
Do not detonate a borg without an explicit reason for doing so. Cyborgs are expensive pieces of company equipment, and you may be punished for detonating them without reason. + + + + "} + + +/obj/item/weapon/book/manual/security_space_law + name = "Corporate Regulations" + desc = "A set of corporate guidelines for keeping law and order on privately-owned space stations." + icon_state = "bookSpaceLaw" + item_state = "book13" + author = "The Company" + title = "Corporate Regulations" + +/obj/item/weapon/book/manual/security_space_law/New() + ..() + dat = {" + + + + + + + + + + + "} + + + +/obj/item/weapon/book/manual/medical_diagnostics_manual + name = "Medical Diagnostics Manual" + desc = "First, do no harm. A detailed medical practitioner's guide." + icon_state = "bookMedical" + item_state = "book12" + author = "Medical Department" + title = "Medical Diagnostics Manual" + +/obj/item/weapon/book/manual/medical_diagnostics_manual/New() + ..() + dat = {" + + + + ++
The Oath
+ + The Medical Oath sworn by recognised medical practitioners in the employ of [using_map.company_name]+ +
-
+
+ +
+ + + + + + "} + + +/obj/item/weapon/book/manual/engineering_guide + name = "Engineering Textbook" + icon_state ="bookEngineering2" + item_state = "book3" + author = "Engineering Encyclopedia" + title = "Engineering Textbook" + +/obj/item/weapon/book/manual/engineering_guide/New() + ..() + dat = {" + + + + + + + + + + "} + + +/obj/item/weapon/book/manual/chef_recipes + name = "Chef Recipes" + icon_state = "cooked_book" + item_state = "book16" + author = "Victoria Ponsonby" + title = "Chef Recipes" + + dat = {" + + + + + +
Food for Dummies
+ Here is a guide on basic food recipes and also how to not poison your customers accidentally. + +Basics:
+ Knead an egg and some flour to make dough. Bake that to make a bun or flatten and cut it. + +Burger:
+ Put a bun and some meat into the microwave and turn it on. Then wait. + +Bread:
+ Put some dough and an egg into the microwave and then wait. + +Waffles:
+ Add two lumps of dough and 10 units of sugar to the microwave and then wait. + +Popcorn:
+ Add 1 corn to the microwave and wait. + +Meat Steak:
+ Put a slice of meat, 1 unit of salt, and 1 unit of pepper into the microwave and wait. + +Meat Pie:
+ Put a flattened piece of dough and some meat into the microwave and wait. + +Boiled Spaghetti:
+ Put the spaghetti (processed flour) and 5 units of water into the microwave and wait. + +Donuts:
+ Add some dough and 5 units of sugar to the microwave and wait. + +Fries:
+ Add one potato to the processor, then bake them in the microwave. + + + + + "} + + +/obj/item/weapon/book/manual/barman_recipes + name = "Barman Recipes" + desc = "For the enterprising drink server." + icon_state = "barbook" + item_state = "book14" + author = "Sir John Rose" + title = "Barman Recipes" + + dat = {" + + + + + +Drinks for Dummies
+ Here's a guide for some basic drinks. + +Black Russian:
+ Mix vodka and Kahlua into a glass. + +Cafe Latte:
+ Mix milk and coffee into a glass. + +Classic Martini:
+ Mix vermouth and gin into a glass. + +Gin Tonic:
+ Mix gin and tonic into a glass. + +Grog:
+ Mix rum and water into a glass. + +Irish Cream:
+ Mix cream and whiskey into a glass. + +The Manly Dorf:
+ Mix ale and beer into a glass. + +Mead:
+ Mix enzyme, water, and sugar into a glass. + +Screwdriver:
+ Mix vodka and orange juice into a glass. + + + + "} + + +/obj/item/weapon/book/manual/detective + name = "The Film Noir: Proper Procedures for Investigations" + icon_state ="bookDetective" + item_state = "book8" + author = "The Company" + title = "The Film Noir: Proper Procedures for Investigations" + + dat = {" + + + + +Detective Work
+ + Between your bouts of self-narration and drinking whiskey on the rocks, you might get a case or two to solve.+ To have the best chance to solve your case, follow these directions: +
+
-
+
+ It really is that easy! Good luck! + + + "} + +/obj/item/weapon/book/manual/nuclear + name = "Fission Mailed: Nuclear Sabotage 101" + icon_state ="bookNuclear" + item_state = "book8" + author = "Syndicate" + title = "Fission Mailed: Nuclear Sabotage 101" + + dat = {" +
+ + + +Nuclear Explosives 101
+ Hello and thank you for choosing the Syndicate for your nuclear information needs. Today's crash course will deal with the operation of a Nuclear Fission Device.+ + First and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE. Pressing any button on the compacted bomb will cause it to extend and bolt itself into place. If this is done, to unbolt it, one must completely log in, which at this time may not be possible.
+ +
To make the nuclear device functional
+-
+
+ + You now have activated the device. To deactivate the buttons at anytime, for example when you've already prepped the bomb for detonation, remove the authentication disk OR press R on the keypad.
+ Now the bomb CAN ONLY be detonated using the timer. Manual detonation is not an option. Toggle off the SAFETY.
+ Note: You wouldn't believe how many Syndicate Operatives with doctorates have forgotten this step.
+ + So use the - - and + + to set a detonation time between 5 seconds and 10 minutes. Then press the timer toggle button to start the countdown. Now remove the authentication disk so that the buttons deactivate.
+ Note: THE BOMB IS STILL SET AND WILL DETONATE
+ + Now before you remove the disk, if you need to move the bomb, you can toggle off the anchor, move it, and re-anchor.
+ + Remember the order:
+ Disk, Code, Safety, Timer, Disk, RUN!
+ Intelligence Analysts believe that normal corporate procedure is for the Site Manager to secure the nuclear authentication disk.
+ + Good luck! + + + "} + +/obj/item/weapon/book/manual/atmospipes + name = "Pipes and You: Getting To Know Your Scary Tools" + icon_state = "pipingbook" + item_state = "book3" + author = "Maria Crash, Senior Atmospherics Technician" + title = "Pipes and You: Getting To Know Your Scary Tools" + dat = {" + + + + + +
Contents
+-
+
+ +
HOW TO NOT SUCK QUITE SO HARD AT ATMOSPHERICS
+ Or: What the fuck does a "pressure regulator" do?
+ + Alright. It has come to my attention that a variety of people are unsure of what a "pipe" is and what it does. + Apparently, there is an unnatural fear of these arcane devices and their "gases." Spooky, spooky. So, + this will tell you what every device constructable by an ordinary pipe dispenser within atmospherics actually does. + You are not going to learn what to do with them to be the super best person ever, or how to play guitar with passive gates, + or something like that. Just what stuff does.
+ + +
Basic Pipes
+ The boring ones.+ Most ordinary pipes are pretty straightforward. They hold gas. If gas is moving in a direction for some reason, gas will flow in that direction. + That's about it. Even so, here's all of your wonderful pipe options.
+ +
-
+
+
Insulated Pipes
++ +
Insulated Pipes
+ Special Public Service Announcement.
+ Our regular pipes are already insulated. These are completely worthless. Punch anyone who uses them.
+ +
Devices:
+ They actually do something.+ This is usually where people get frightened, afraid, and start calling on their gods and/or cowering in fear. Yes, I can see you doing that right now. + Stop it. It's unbecoming. Most of these are fairly straightforward.
+ +
-
+
Heat Exchange Systems
+ Will not set you on fire.+ These systems are used to only transfer heat between two pipes. They will not move gases or any other element, but will equalize the temperature (eventually). Note that because of how gases work (remember: pv=nRt), + a higher temperature will raise pressure, and a lower one will lower temperature.
+ +
+ + That's about it for pipes. Go forth, armed with this knowledge, and try not to break, burn down, or kill anything. Please. + + + + + "} + +/obj/item/weapon/book/manual/evaguide + name = "EVA Gear and You: Not Spending All Day Inside, 2nd Edition" + icon_state = "evabook" + item_state = "book14" + author = "Maria Crash, Senior Atmospherics Technician" + title = "EVA Gear and You: Not Spending All Day Inside, 2nd Edition" + dat = {" + + + + + +
EVA Gear and You: Not Spending All Day Inside, 2nd Edition
+ Or: How not to suffocate because there's a hole in your shoes+ +
Contents
+-
+
+ + EVA gear. Wonderful to use. It's useful for mining, engineering, and occasionally just surviving, if things are that bad. Most people have EVA training, + but apparently there are some on a space station who don't. This guide should give you a basic idea of how to use this gear, safely. It's split into three main sections: + softsuits, voidsuits, and hardsuits. General advice and instructions for modification are present as well.
+ + One important point for synthetics and people using full-body prosthetics: You obviously don't need oxygen, but you do run the risk of overheating in vacuum. + Rather than oxygen, use a suit cooling unit. Many emergency equipment stores don't hold them, unfortunately, but dedicated EVA stores will. Be aware of your heat tolerances.
+ +
Softsuits and Emergency Equipment
+ The bulkiest things this side of Alpha Centauri+ These suits are the both grey ones that are stored in EVA and orange emergency suits in emergency lockers. They're the more simple to get on, but are also a lot bulkier, and provide less protection from environmental hazards such as radiation or physical impact. + As Medical, Engineering, Security, and Mining all have voidsuits of their own, these don't see much use outside of emergencies. In an emergency, knowing how to put one on can save your life.
+ + First, take the suit. It should be in three pieces: A top, a bottom, and a helmet. Put the bottom on first, shoes and the like will fit in it. If you have magnetic boots, however, + put them on on top of the suit's feet. Next, get the top on, as you would a shirt. It can be somewhat awkward putting these pieces on, due to the makeup of the suit, + but to an extent they will adjust to you. You can then find the snaps and seals around the waist, where the two pieces meet. Fasten these, and double-check their tightness. + The red indicators around the waist of the lower half will turn green when this is done correctly. Next, put on whatever breathing apparatus you're using, be it a gas mask or a breath mask. Make sure the oxygen tube is fastened into it. + Put on the helmet now, straightforward, and make sure the tube goes into the small opening specifically for internals. Again, fasten seals around the neck, a small indicator light in the inside of the helmet should go from red to off when all is fastened. + There is a small slot on the side of the suit where an emergency oxygen tank or extended emergency oxygen tank will fit, + but it is recommended to have a full-sized tank on your back for EVA.
+ + Important note: When using these, especially in emergencies, be aware of your surroundings! These suits can tear or breach more easily than any other type, especially in an environment with broken glass and metal everywhere. + If your suit is breached, you will be in deep trouble. Pressure issues can inhibit breathing even with internals.
+ + These suits tend to be wearable by most species. They're large and flexible. They might be pretty uncomfortable for some, though, so keep that in mind.
+ +
Voidsuits
+ Heavy, uncomfortable, still the best option.+ These suits come in many specialized varieties. The most common are engineering, atmospherics, security, medical, and mining varieties. + These provide a lot more protection than the standard suits, and depending on the specialization, can offer different protections. + For example, security suits have armor plating, engineering suits have radiation protection, and atmospherics suits are rated for extremely high temperatures.
+ + Similarly to the softsuits, these are split into three parts. Fastening the pant and top are mostly the same as the softsuits, with the exception that these are a bit heavier, + though not as bulky. The helmet goes on differently, with the air tube feeding into the suit and out a hole near the left shoulder, while the helmet goes on turned ninety degrees counter-clockwise, + and then is turned to face the front and sealed. There is a small button on the right side of the helmet that activates the helmet light. + The tanks that fasten onto the side slot are emergency tanks, as well as full-sized oxygen tanks, leaving your back free for a backpack or satchel.
+ + These suits generally only fit one species. NanoTrasen's are usually human-fitting by default, but there's equipment that can make modifications to the hardsuits to fit them to other species.
+ + Later-model voidsuits can have magboots and helmets installed into the suit and deployed when needed. Check the operator's manual for individual suits to see how the helmets are installed. + If a helmet is installed, you can skip it while putting the suit on, obviously. When deployed, it will deploy from the back of your neck, covering the head and sealing at the front.
+ +
Hardsuits/Rigs
+ The fancy stuff.+ Proper hardsuits are the most complex sort of EVA equipment available, and blur the line between spacesuits and smaller exosuits. They're sometimes known as 'rigs' or 'powered armor'. + These are the suits with the widest variety of uses, owing to the wide variety of equipment that can be installed on them. Like voidsuits, they come in different, specialized varieties, each one offering different protections and different equipment. + Equipment that can be installed includes weapons, power tools, mining equipment, medical equipment, AI assistants, and more.
+ + Putting these on is relatively simple. They come as compact packs, worn like a backpack and secured with a harness. Activating them, though, is a more complex process. The suit deploys from the module similarly to helmets deploying from voidsuits. + After it covers the whole body, the suit can be started. The startup sequence takes some time. The suit will automatically fit itself to your body, sealing each section individually - boots, gloves, pants, torso, and helmet - then connecting them.
+ + Operating a hardsuit is a much more complicated proposal than operating other EVA equipment. While putting them on is relatively simple, and operating basic functions like oxygen and magboots is the same as other suits, the rest is far more complex. + Consult the operator's manual for invidual pieces of equipment that you plan to use. Use of these for heavy work is only reccomended for people who have specialized training and extensive EVA experience. + The potential of a suit breach is always there, and the use of powered equipment raises it significantly.
+ +
Miscellaneous Advice
+ Pro tip: Safety first.+ There's a lot of general advice that can be helpful for people who haven't taken a long-form instruction course. Much of this is going to be fairly obvious safety advice, but it's never bad to remind yourself of that.
+ +
-
+
+
Modification Equipment
+ How to actually make voidsuits fit you.+ There's a variety of equipment that can modify hardsuits to fit species that can't fit into them, making life quite a bit easier.
+ + The first piece of equipment is a suit cycler. This is a large machine resembling the storage pods that are in place in some places. These are machines that will automatically tailor a suit to certain specifications. + The largest uses of them are for their cleaning functions and their ability to tailor suits for a species. Do not enter them physically. You will die from any of the functions being activated, and it will hurt the whole time you're dying. + These machines can both tailor a suit between species, and between types. This means you can convert engineering hardsuits to atmospherics, or the other way. This is useful. Use it if you can.
+ + There's also modification kits that let you modify suits yourself. These are extremely difficult to use unless you understand the actual construction of the suit. I do not reccomend using them unless no other option is available.
+ +
Final Checks
+-
+
+
A Guide to Virology, 1st Edition
+ Welcome to virology!+ + A virologist spends much of their time isolated in the virology department fiddling with deadly and annoying plagues. This guide will get you on the right path to properly
+ creating and curing the worst of the worst.
+ +
Anatomy of a Virus
+ Before you jump in to making the next Black Death, you need to understand what's what. When you pop a tray into the disease analyzer you'll get a paper listing quite a few+ things about that virus!
+ + Antigens
+ The first thing you might notice on this analysis is the listed antigens of a virus. This, essentially, is what you need for cures. When a patient develops an antibody that
+ matches a disease's antigen, they'll be immune to the virus.
+ + Transmission
+ This will list one of three methods of transmission: airborne, contact, or blood. Airborne viruses will spread through the air, meaning if a patient is coughing or sneezing
+ it will spread quicker. Contactviruses need some sort of, well, contact. Blood on the floor, mucus, and vomit should all be cleaned up. Blood-transmission viruses will only
+ spread through actual blood contact, meaning an injection of the virus would be necessary to spread it.
+ + Species
+ Not all viruses are compatible with all species! This will list off what can be infected by a particular virus. This can be changed through splicing. In rare cases you will
+ get a virus that has infected crewmembers but cannot infect your lab monkeys. In these cases, you will likely have to splice different species data to safely make a cure.
+ + Symptoms
+ This lists what all the virus does, along with the strength of the symptoms and their aggressiveness. A full list of symptoms and their stages can be found below.
+ +
Protection
+ First off, any good virologist needs to gear up!+ Your virology lab should have the following: +
-
+
+ Make sure to gear up appropriately and take precautions to not bring the virus out of the lab!
+ What needs to be worn varies from race to race, as some species cannot be affected by a virus, but
+ precautions should always be taken to prevent accidentally carrying the virus out of containment.
+ +
Machinery
+ These are the types of machines that you will be expected to use in this department. Study them, know them, and make sure you use them correctly!+ + Antibody Scanner
+ A device similar to a health analyzer, when scanned over a patient it will tell you any present antibodies in their bloodstream.
+ + Pathogenic Isolator
+ This device can be loaded with blood samples via a syringe. It will tell you if there is a present viral pathogen, and if so it can isolate the pathogen,
+ producing a virus dish for further research. This is the primary means of creating virus dishes.
+ + Pathogenic Incubator
+ One of the most important machines, you'll be sitting here a lot. Virus trays you produce will start small, and you will need to grow them to get anywhere.
+ Load it with virus food (diluted milk, found in a wall mounted dispenser nearby) as well as a virus dish and turn it on. It will slowly grow the virus
+ for analysis, splicing, or whatever other use you might find for it. It can also inject the virus into other chemicals (i.e. blood) which will allow you
+ to artificially infect a blood sample to infect test subjects.
+ + Additionally, it can irradiate a virus dish to cause mutation. This randomly alters the syndromes, allowing you to collect new data.
+ + Disease Analyser
+ Virus dishes may be placed into this machine after it has been incubated sufficiently. It will create a reading of the virus' symptoms, species targeted,
+ associated antibodies, and so on. It will also update the disease into the digital database, allowing it to be detected via Medical HUD or health analyzer.
+ + Isolation Centrifuge
+ Inserting a vial of blood into this machine will allow it to take a present pathogen or antibody, turning it into a pure virus or pure cure for your use.
+ It will automatically detect if either are in the blood sample, so it is useful for determining if a sample is infected. The sample will be reusable if creating
+ more of the virus, but will be expended upon creating antibodies.
+ + Disease Splicer
+ As it's name implied, this machine is for splicing the disease symptoms and creating new viruses. Insert an analyzed virus sample to take a symptom which can
+ then be saved on a GNA disk (created by the machine), or use an existing disk on the machine to load up a symptom and splice it in.
+ +
Syndromes
+ While curing patients is the obvious side to virology, there's more you can do! For a variety of reasons you may wish to engineer your own virus through mutations+ and splicing. Keep in mind that infecting the whole station with a deadly virus is generally frowned upon in most societies, and even in an antagonistic role simply
+ infecting everyone with a very deadly virus is not ideal.
+ + Obtaining a Sample
+ The first step to making your own virus is to find a virus to start tinkering with. There are two ways of doing this: grabbing the pre-spawned virus dish from the
+ freezer create in your laboratory, or taking a blood sample from an infected patient that you haven't cured yet and running it through the Pathogenic Isolator to
+ produce a virus dish.
+ + In either case, you'll then need to incubate the virus in the Pathogenic Incubator until it is of sufficient size for you to work with, and ideally also run it
+ through the Disease Analyzer to get an idea of what it does. This will also keep the rest of Medical from getting on your case about not giving them the ability to
+ detect viral outbreaks without you, and will help prevent public lynchings if someone sneezes.
+ + Once that's all done, you're ready to start the real work.
+ + Obtaining a Sample
+ Sometimes you just need to infect somebody. Usually, this is because you're doing some splicing work and want to make sure that you'll have some copies of a virus
+ in reserve for future study. Fortunately, the process of deliberately infecting patients, as well as creating backups of your viruses, is actually very simple.
+ + If you have a virus dish and wish to infect a patient, place the dish into the Pathogenic Incubator along with a beaker full of blood. Ideally, this is the
+ patient's (or test monkey's) blood, though anyone's will do in a pinch - just be aware of the possibility of blood rejection, and be ready to deal with it accordingly.
+ The incubator can inject a sample of the virus into the blood, which you can then inject into the patient to infect them. Alternatively, once a blood sample is infected
+ you may place it in either the Pathogenic Isolator or Isolation Centrifuge to make as many samples of that virus you need without destroying the sample.
+ No infections necessary!
+ + Splicing
+ To understand splicing, you must know that every virus has 4 GNA strands, each of which is tied to one of the syndromes that it can manifest. Each syndrome, and thus each
+ strand, is ranked in order of its appearance when symptoms begin to manifest in a patient, and higher-ranked (and thus slower to appear) syndromes are likely to be more
+ powerful than lower-ranked ones. (1) is the lowest, first symptom to manifest, and (4) is the highest, final symptom to manifest.
+ + The Disease Splicer will allow you to examine and manipulate a virus' GNA strands to create a virus with any syndromes that you want.
+ + The splicer has main three functions which allow you to modify viruses and define which GNA strands they contain. The first of these functions is the splicing function,
+ which copies a GNA strand from an inserted virus tray to the disease splicer buffer. This is done by selecting the desired GNA strand under "Reverse Engineering".
+ Doing so will destroy the virus tray in the process, so be sure that you have more samples of the virus on hand if you want to preserve it.
+ + The disease splicer’s second function is to copy whatever strand it has stored in its buffer to a disk the machine creates. These disks can be re-inserted into
+ the disease splicer later, making their stored GNA strand immediately available for use. Unlike virus trays, disks can be reused without destroying them.
+ + The final function of the disease splicer is to copy over a GNA strand of its loaded virus dish with the corresponding GNA strand that is currently stored in
+ its buffer. This effectively allows you to give a virus any set of symptoms you want, so long as it follows the rules of the ranking. A rank (1) symptom can fill
+ any slot, while a (3) can only fill 3 and up, and a (4) can only be in the fourth slot.
+ + Mutating
+ Sometimes you just don't have any of the symptoms you want. Fortunately, mutating a virus dish is very simple. Simply place a dish in the Pathogenic Incubator
+ to get started and click 'add radiation'. This will fill up the radiation bar with each press. When the machine is on, this bar will slowly tick down as the radiation
+ is applied to the sample. For any significant mutation the radiation should be over 500k, meaning at least half the bar. When a mutation occurs -- and multiple
+ mutations can occur in a single sample -- there will be a ping from the machine. Once it's done growing and mutating, throw it into the analyzer and see what you got!
+ + With these functions in mind, the process in order for you to develop your own virus is as follows: +
-
+
Curing
+ Curing a virus is relatively simple, but the below will leave you without a sample to work with. If this is a concern, see 'obtaining a sample' above. Alternatively to+ the below, spacecillin can be used in a pinch to attempt to treat a virus if no virologist is present and someone decided to roll around in mucus. However this is not
+ guaranteed to work, and can in fact simply make the virus more resistant to spacecillin.
+ + Quarantine
+ If you or a crew member becomes infected by a virus, your first concern should be to isolate them as quickly as possible to prevent the disease from spreading. Ideally,
+ this means getting the patient back to Virology and into a holding cell, but failing that, it's important to get them into an isolated room, shut the door, and keep anyone
+ else from entering. It is also important to clean up any blood, vomit, or mucus left behind by the patient, as it may spread the virus as well.
+ + Antibodies
+ Now that your patient is safely hidden away where they can't infect people without your permission, you want to cure them. The basic idea behind that is to get them to start
+ synthesizing antibodies.
+ + Antibodies are produced by living organisms that have started to fight off a virus in their bloodstream. An organism that has produced antibodies is effectively
+ immune to any virus that is weak to those antibodies, which are generally denoted by a short string of letters (say, "KM" or similar) to let you know which viruses they
+ are effective against. Even better, once an organism has synthesized antibodies for itself, you can take a blood sample and use that to create more antibodies, which you
+ can then inject into other people to cure the virus in them, or even to prevent them from catching it in the first place. And you can take blood samples from those people
+ to make even more antibodies.
+ + The issue is that, most of the time, a patient's immune system is not powerful enough to create antibodies on its own (space plagues are nasty things), so you have to do that
+ for them. You do that by injecting them with Radium.
+ + Since Radium is radioactive, this is obviously not something that you want to do to your actual patients. It'll cause major toxin damage when an antibody is
+ made and quickly lead to organ failure. You get around this by using monkeys, which you can get from the box of monkey cubes very handily left on the desk in Virology for
+ this very purpose.
+ + So the process of curing diseases is, really, quite simple. Find an infected patient. Make a monkey (ideally, strap this monkey to a bed in an isolation cell to make the
+ rest of this process easier). Take a blood sample from the infected patient, then inject it into the monkey to infect the monkey. Inject the monkey with Radium. Use the antibody
+ scanner on the monkey every few seconds until it says that the monkey has begun producing antibodies, then take a blood sample (or two or three or four) from the
+ monkey. Put the blood sample(s) into a vial, then put the vial into the isolation centrifuge and isolate the antibodies. Voila: a bottle of virus cure. Inject it into as many
+ people as you like, then throw the (likely dead) monkey into the disposals chute to eject its disease-ridden body into space and clean the isolation cell. Or, if you're on
+ the ball and wish to be conservative with your limited monkey cubes, save the monkey, too.
+ + Congratulations! You have now cured a disease.
+ + The important thing to remember is that anyone injected with antibodies becomes a source of those antibodies for the future. You can take a sample of their blood
+ and put it into the isolation centrifuge just like you did with the monkey's to produce more antibodies if you ever run out. For this reason, and because you might have
+ gotten infected yourself in the process of synthesizing a cure, most Virologists will inject themselves with any antibodies they produce.
+ +
Syndromes
+ Below are the possible syndromes of a virus and the stages they can appear at. A stage covers that stage and higher, so a stage 1 syndrome can appear at stage 4.+ A stage 4 syndrome, however, cannot appear any earlier than stage 4.
+ +
| Stage | +Name | +Effects + |
|---|---|---|
| 1 | +Sneezing | +Makes the patient sneeze. Spreads airborne disease! + |
| 1 | +Mucus Buildup | +Makes the patient's throat fill with mucus. + |
| 1 | +Salivary Gland Stimulation | +Makes the patient drool. Spreads the disease! + |
| 1 | +Involuntary Twitching | +Makes the patient twitch. + |
| 1 | +Headache | +Gives the patient a headache. + |
| 1 | +Mlemington's Syndrome | +Makes the patient 'mlem' uncontrollably. + |
| 1 | +Spyndrome | +Makes the patient spin uncontrollably. + |
| 2 | +Involuntary Vocalization | +Makes the patient scream. + |
| 2 | +Vomiting | +Makes the patient vomit. Spreads the disease! + |
| 2 | +Excessive Sleepiness | +Makes the patient drowsy. + |
| 2 | +Narcolepsy | +Makes the patient pass out at random. + |
| 2 | +Vision Loss | +Causes partial blindness. + |
| 2 | +Severe Cough | +Causes coughing. Spreads airborne disease! + |
| 2 | +Digestive Inefficiency | +Makes the patient always hungry. + |
| 2 | +Reduced Circulation | +Makes the patient shiver. + |
| 2 | +Hair Loss | +Causes the patient's hair to fall out. + |
| 2 | +Overactive Adrenal Gland | +Makes the patient jittery, but also faster. + |
| 2 | +Tinnitus | +Causes ringing in the patient's ears. + |
| 2 | +Lingual Dissocation | +Scrambles the patients language center of their brain. + |
| 3 | +Hyperacidity | +Causes small amounts of toxin damage. + |
| 3 | +Nervous Motor Instability | +Makes the patient shaky. + |
| 3 | +Pineal Gland Decalcification | +Gives the patient telepathy. + |
| 3 | +Neurodegeneration | +Causes brain damage. + |
| 3 | +Hallucination | +Causes hallucinations. + |
| 3 | +Hearing Loss | +A less severe hearing damage. + |
| 3 | +Topographical Cretinism | +Makes the patient incapable of walking straight. + |
| 3 | +Uncontrolled Laughter | +Causes the patient to laugh uncontrollably. + |
| 3 | +DNA Degradation | +Causes genetic damage. + |
| 3 | +Phantom Aches | +Causes groaning. + |
| 3 | +Chemical Synthesis | +Causes the synthesis of a certain chemical in the patient's bloodstream. + |
| 3 | +Genetic Chameleonism | +Prevents the patient from experiencing organ rejection. + |
| 3 | +Mass Revectoring | +Causes the patient to suddenly change size. + |
| 3 | +Flipponov's Disease | +Causes the patient to uncontrollably do a flip. + |
| 4 | +Gibbingtons | +Gibs the patients slowly. + |
| 4 | +Radian's Syndrome | +Irradiates the patient from the inside. + |
| 4 | +Deafness | +Causes complete deafness. + |
| 4 | +Genome Regression | +Turns the patient into the primitive form of their species. + |
| 4 | +Windpipe Contraction | +Causes the patient to involuntarily hold their breath. + |
| 4 | +Autoimmune Response | +Adds toxins to the patient's bloodstream. + |
| 4 | +Catastrophic DNA Degeneration | +Causes genetic damage and scrambles the patient's genes. + |
| 4 | +Limb Paralysis | +Temporary loss of use in the patient's individual arms and legs. + |
| 4 | +Organ Shutdown | +Slowly causes internal organ damage at random. + |
| 4 | +Hyperaccelerated Aging | +Ages the patient, causing external damage. + |
| 4 | +Brittle Bones | +Causes bones to break more easily. + |
| 4 | +Organic Ignition | +Slowly causes the patient to burst into flames. + |
+ + "} \ No newline at end of file diff --git a/code/game/objects/items/weapons/material/gravemarker.dm b/code/game/objects/items/weapons/material/gravemarker.dm index d3c615e8fd..83d65a6c3b 100644 --- a/code/game/objects/items/weapons/material/gravemarker.dm +++ b/code/game/objects/items/weapons/material/gravemarker.dm @@ -13,14 +13,14 @@ /obj/item/weapon/material/gravemarker/attackby(obj/item/weapon/W, mob/user as mob) if(W.is_screwdriver()) - var/carving_1 = sanitizeSafe(input(user, "Who is \the [src.name] for?", "Gravestone Naming", null) as text, MAX_NAME_LEN) + var/carving_1 = sanitizeSafe(tgui_input_text(user, "Who is \the [src.name] for?", "Gravestone Naming", null, MAX_NAME_LEN), MAX_NAME_LEN) if(carving_1) user.visible_message("[user] starts carving \the [src.name].", "You start carving \the [src.name].") if(do_after(user, material.hardness * W.toolspeed)) user.visible_message("[user] carves something into \the [src.name].", "You carve your message into \the [src.name].") grave_name += carving_1 update_icon() - var/carving_2 = sanitizeSafe(input(user, "What message should \the [src.name] have?", "Epitaph Carving", null) as text, MAX_NAME_LEN) + var/carving_2 = sanitizeSafe(tgui_input_text(user, "What message should \the [src.name] have?", "Epitaph Carving", null, MAX_NAME_LEN), MAX_NAME_LEN) if(carving_2) user.visible_message("[user] starts carving \the [src.name].", "You start carving \the [src.name].") if(do_after(user, material.hardness * W.toolspeed)) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 58ea2ad9d5..3afc5d64a5 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -32,7 +32,10 @@ for(var/obj/item/i in contents) var/i_state = i.item_state if(!i_state) i_state = i.icon_state - standing.add_overlay(image(icon = INV_BELT_DEF_ICON, icon_state = i_state)) + var/image/add_icon = image(icon = INV_BELT_DEF_ICON, icon_state = i_state) + if(istype(clip_mask)) //For taur bodies/tails clipping off parts of uniforms and suits. + standing.filters += filter(type = "alpha", icon = clip_mask) + standing.add_overlay(add_icon) return standing /obj/item/weapon/storage/update_icon() diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 84c1637a3e..2d19634aaf 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -208,7 +208,7 @@ /obj/item/weapon/storage/pill_bottle/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen)) - var/tmp_label = sanitizeSafe(input(user, "Enter a label for [name]", "Label", label_text), MAX_NAME_LEN) + var/tmp_label = sanitizeSafe(tgui_input_text(user, "Enter a label for [name]", "Label", label_text, MAX_NAME_LEN), MAX_NAME_LEN) if(length(tmp_label) > 50) to_chat(user, "The label can be at most 50 characters long.") else if(length(tmp_label) > 10) diff --git a/code/game/objects/random/misc_vr.dm b/code/game/objects/random/misc_vr.dm index 21ca60771a..3f2644348d 100644 --- a/code/game/objects/random/misc_vr.dm +++ b/code/game/objects/random/misc_vr.dm @@ -114,6 +114,7 @@ prob(30);/obj/item/weapon/aliencoin/gold, prob(20);/obj/item/weapon/aliencoin/phoron, prob(5);/obj/item/capture_crystal, + prob(5);/obj/random/mouseray, prob(5);/obj/item/device/perfect_tele, prob(5);/obj/item/weapon/bluespace_harpoon, prob(1);/obj/item/device/paicard, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 63a5613c88..66695f3511 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -3,8 +3,10 @@ req_access = list(access_kitchen) starts_with = list( - /obj/item/weapon/reagent_containers/food/condiment/flour = 7, - /obj/item/weapon/reagent_containers/food/condiment/sugar = 2, + /obj/item/weapon/reagent_containers/food/condiment/carton/flour = 6, + /obj/item/weapon/reagent_containers/food/condiment/carton/sugar = 1, + /obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic = 1, + /obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic = 1, /obj/item/weapon/reagent_containers/food/condiment/spacespice = 2 ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm index cc57459919..b4b2d50f6b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm @@ -191,9 +191,9 @@ /obj/item/weapon/storage/lockbox/medal, /obj/item/device/radio/headset/heads/captain, /obj/item/device/radio/headset/heads/captain/alt, - /obj/item/weapon/gun/energy/gun, + /obj/item/gunbox/captain, /obj/item/weapon/melee/telebaton, /obj/item/device/flash, /obj/item/weapon/storage/box/ids, /obj/item/weapon/melee/rapier, - /obj/item/clothing/accessory/holster/machete/rapier) \ No newline at end of file + /obj/item/clothing/accessory/holster/machete/rapier) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 45cb599429..102e4d23a1 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -1,730 +1,732 @@ -//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 - -/obj/structure/closet/crate - name = "crate" - desc = "A rectangular steel crate." - icon = 'icons/obj/closets/bases/crate.dmi' - closet_appearance = /decl/closet_appearance/crate - climbable = TRUE - dir = 4 //Spawn facing 'forward' by default. - var/points_per_crate = 5 - var/rigged = 0 - - open_sound = 'sound/effects/crate_open.ogg' - close_sound = 'sound/effects/crate_close.ogg' - -/obj/structure/closet/crate/can_open() - return 1 - -/obj/structure/closet/crate/can_close() - return 1 - -/obj/structure/closet/crate/open() - if(src.opened) - return 0 - if(!src.can_open()) - return 0 - - if(rigged && locate(/obj/item/device/radio/electropack) in src) - if(isliving(usr)) - var/mob/living/L = usr - if(L.electrocute_act(17, src)) - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(5, 1, src) - s.start() - if(usr.stunned) - return 2 - - playsound(src, open_sound, 50, 1, -3) - for(var/obj/O in src) - O.forceMove(get_turf(src)) - src.opened = 1 - - if(climbable) - structure_shaken() - update_icon() - return 1 - -/obj/structure/closet/crate/close() - if(!src.opened) - return 0 - if(!src.can_close()) - return 0 - - playsound(src, close_sound, 50, 1, -3) - var/itemcount = 0 - for(var/obj/O in get_turf(src)) - if(itemcount >= storage_capacity) - break - if(O.density || O.anchored || istype(O,/obj/structure/closet)) - continue - if(istype(O, /obj/structure/bed)) //This is only necessary because of rollerbeds and swivel chairs. - var/obj/structure/bed/B = O - if(B.has_buckled_mobs()) - continue - O.forceMove(src) - itemcount++ - - src.opened = 0 - update_icon() - return 1 - -/obj/structure/closet/crate/verb/rotate_clockwise() - set name = "Rotate Crate Clockwise" - set category = "Object" - set src in oview(1) - - if (usr.stat || usr.restrained() || anchored) - return - - src.set_dir(turn(src.dir, 270)) - -/obj/structure/closet/crate/verb/rotate_counterclockwise() - set category = "Object" - set name = "Rotate Crate Counterclockwise" - set src in view(1) - - if (usr.stat || usr.restrained() || anchored) - return - - src.set_dir(turn(src.dir, 90)) - -/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(opened) - if(isrobot(user)) - return - if(W.loc != user) // This should stop mounted modules ending up outside the module. - return - user.drop_item() - if(W) - W.forceMove(src.loc) - else if(istype(W, /obj/item/weapon/packageWrap)) - return - else if(istype(W, /obj/item/stack/cable_coil)) - var/obj/item/stack/cable_coil/C = W - if(rigged) - to_chat(user, "[src] is already rigged!") - return - if (C.use(1)) - to_chat(user , "You rig [src].") - rigged = 1 - return - else if(istype(W, /obj/item/device/radio/electropack)) - if(rigged) - to_chat(user , "You attach [W] to [src].") - user.drop_item() - W.forceMove(src) - return - else if(W.is_wirecutter()) - if(rigged) - to_chat(user , "You cut away the wiring.") - playsound(src, W.usesound, 100, 1) - rigged = 0 - return - else return attack_hand(user) - -/obj/structure/closet/crate/ex_act(severity) - switch(severity) - if(1.0) - for(var/obj/O in src.contents) - qdel(O) - qdel(src) - return - if(2.0) - for(var/obj/O in src.contents) - if(prob(50)) - qdel(O) - qdel(src) - return - if(3.0) - if (prob(50)) - qdel(src) - return - else - return - -/obj/structure/closet/crate/secure - desc = "A secure crate." - name = "Secure crate" - closet_appearance = /decl/closet_appearance/crate/secure - var/broken = 0 - var/locked = 1 - -/obj/structure/closet/crate/secure/can_open() - return !locked - -/obj/structure/closet/crate/secure/update_icon() - if(opened) - icon_state = "open" - else - if(broken) - icon_state = "closed_emagged[sealed ? "_welded" : ""]" - else - if(locked) - icon_state = "closed_locked[sealed ? "_welded" : ""]" - else - icon_state = "closed_unlocked[sealed ? "_welded" : ""]" - -/obj/structure/closet/crate/secure/proc/togglelock(mob/user as mob) - if(src.opened) - to_chat(user, "Close the crate first.") - return - if(src.broken) - to_chat(user, "The crate appears to be broken.") - return - if(src.allowed(user)) - set_locked(!locked, user) - else - to_chat(user, "Access Denied") - -/obj/structure/closet/crate/secure/proc/set_locked(var/newlocked, mob/user = null) - if(locked == newlocked) return - - locked = newlocked - if(user) - for(var/mob/O in viewers(user, 3)) - O.show_message( "The crate has been [locked ? null : "un"]locked by [user].", 1) - update_icon() - -/obj/structure/closet/crate/secure/verb/verb_togglelock() - set src in oview(1) // One square distance - set category = "Object" - set name = "Toggle Lock" - - if(!usr.canmove || usr.stat || usr.restrained()) // Don't use it if you're not able to! Checks for stuns, ghost and restrain - return - - if(ishuman(usr) || isrobot(usr)) - src.add_fingerprint(usr) - src.togglelock(usr) - else - to_chat(usr, "This mob type can't use this verb.") - -/obj/structure/closet/crate/secure/attack_hand(mob/user as mob) - src.add_fingerprint(user) - if(locked) - src.togglelock(user) - else - src.toggle(user) - -/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(is_type_in_list(W, list(/obj/item/weapon/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/tool/wirecutters))) - return ..() - if(istype(W, /obj/item/weapon/melee/energy/blade)) - emag_act(INFINITY, user) - if(!opened) - src.togglelock(user) - return - return ..() - -/obj/structure/closet/crate/secure/emag_act(var/remaining_charges, var/mob/user) - if(!broken) - playsound(src, "sparks", 60, 1) - locked = 0 - broken = 1 - to_chat(user, "You unlock \the [src].") - update_icon() - return 1 - -/obj/structure/closet/crate/secure/emp_act(severity) - for(var/obj/O in src) - O.emp_act(severity) - if(!broken && !opened && prob(50/severity)) - if(!locked) - locked = 1 - else - playsound(src, 'sound/effects/sparks4.ogg', 75, 1) - locked = 0 - if(!opened && prob(20/severity)) - if(!locked) - open() - else - req_access = list() - req_access += pick(get_all_station_access()) - update_icon() - ..() - -/obj/structure/closet/crate/plastic - name = "plastic crate" - desc = "A rectangular plastic crate." - closet_appearance = /decl/closet_appearance/crate/plastic - points_per_crate = 1 //5 crates per ordered crate, +5 for the crate it comes in. - -/obj/structure/closet/crate/internals - name = "internals crate" - desc = "A internals crate." - -/obj/structure/closet/crate/trashcart - name = "trash cart" - desc = "A heavy, metal trashcart with wheels." - closet_appearance = /decl/closet_appearance/cart/trash - -/*these aren't needed anymore -/obj/structure/closet/crate/hat - desc = "A crate filled with Valuable Collector's Hats!." - name = "Hat Crate" - -/obj/structure/closet/crate/contraband - name = "Poster crate" - desc = "A random assortment of posters manufactured by providers NOT listed under NanoTrasen's whitelist." -*/ - -/obj/structure/closet/crate/medical - name = "medical crate" - desc = "A medical crate." - closet_appearance = /decl/closet_appearance/crate/medical - -/obj/structure/closet/crate/rcd - name = "\improper RCD crate" - desc = "A crate with rapid construction device." - - starts_with = list( - /obj/item/weapon/rcd_ammo = 3, - /obj/item/weapon/rcd) - -/obj/structure/closet/crate/solar - name = "solar pack crate" - - starts_with = list( - /obj/item/solar_assembly = 21, - /obj/item/weapon/circuitboard/solar_control, - /obj/item/weapon/tracker_electronics, - /obj/item/weapon/paper/solar) - -/obj/structure/closet/crate/cooper - name = "Cooper's Stache" - - starts_with = list( - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 6, - /obj/item/stack/material/gold = 1) -/obj/structure/closet/crate/freezer - name = "freezer" - desc = "A freezer." - closet_appearance = /decl/closet_appearance/crate/freezer - var/target_temp = T0C - 40 - var/cooling_power = 40 - -/obj/structure/closet/crate/freezer/centauri - desc = "A freezer stamped with the logo of Centauri Provisions." - closet_appearance = /decl/closet_appearance/crate/freezer/centauri - -/obj/structure/closet/crate/freezer/nanotrasen - desc = "A freezer stamped with the logo of NanoTrasen." - closet_appearance = /decl/closet_appearance/crate/freezer/nanotrasen - -/obj/structure/closet/crate/freezer/return_air() - var/datum/gas_mixture/gas = (..()) - if(!gas) return null - var/datum/gas_mixture/newgas = new/datum/gas_mixture() - newgas.copy_from(gas) - if(newgas.temperature <= target_temp) return - - if((newgas.temperature - cooling_power) > target_temp) - newgas.temperature -= cooling_power - else - newgas.temperature = target_temp - return newgas - -/obj/structure/closet/crate/freezer/Entered(var/atom/movable/AM) - if(istype(AM, /obj/item/organ)) - var/obj/item/organ/O = AM - O.preserved = 1 - for(var/obj/item/organ/organ in O) - organ.preserved = 1 - ..() - -/obj/structure/closet/crate/freezer/Exited(var/atom/movable/AM) - if(istype(AM, /obj/item/organ)) - var/obj/item/organ/O = AM - O.preserved = 0 - for(var/obj/item/organ/organ in O) - organ.preserved = 0 - ..() - -/obj/structure/closet/crate/weapon - name = "weapons crate" - desc = "A barely secured weapons crate." - closet_appearance = /decl/closet_appearance/crate/secure/weapon - -/obj/structure/closet/crate/freezer/rations //Fpr use in the escape shuttle - name = "emergency rations" - desc = "A crate of emergency rations." - - starts_with = list( - /obj/random/mre = 6) - -/obj/structure/closet/crate/bin - name = "large bin" - desc = "A large bin." - closet_appearance = null - icon = 'icons/obj/closets/largebin.dmi' - -/obj/structure/closet/crate/radiation - name = "radioactive gear crate" - desc = "A crate with a radiation sign on it." - closet_appearance = /decl/closet_appearance/crate/radiation - - starts_with = list( - /obj/item/clothing/suit/radiation = 4, - /obj/item/clothing/head/radiation = 4) - -//TSCs - -/obj/structure/closet/crate/aether - desc = "A crate painted in the colours of Aether Atmospherics and Recycling." - closet_appearance = /decl/closet_appearance/crate/aether - -/obj/structure/closet/crate/centauri - desc = "A crate decorated with the logo of Centauri Provisions." - closet_appearance = /decl/closet_appearance/crate/centauri - -/obj/structure/closet/crate/einstein - desc = "A crate labelled with an Einstein Engines sticker." - closet_appearance = /decl/closet_appearance/crate/einstein - -/obj/structure/closet/crate/focalpoint - desc = "A crate marked with the decal of Focal Point Energistics." - closet_appearance = /decl/closet_appearance/crate/focalpoint - -/obj/structure/closet/crate/gilthari - desc = "A crate embossed with the logo of Gilthari Exports." - closet_appearance = /decl/closet_appearance/crate/gilthari - -/obj/structure/closet/crate/grayson - desc = "A bare metal crate spraypainted with Grayson Manufactories decals." - closet_appearance = /decl/closet_appearance/crate/grayson - -/obj/structure/closet/crate/heph - desc = "A sturdy crate marked with the logo of Hephaestus Industries." - closet_appearance = /decl/closet_appearance/crate/heph - -/obj/structure/closet/crate/morpheus - desc = "A crate crudely imprinted with 'MORPHEUS CYBERKINETICS'." - closet_appearance = /decl/closet_appearance/crate/morpheus - -/obj/structure/closet/crate/nanotrasen - desc = "A crate emblazoned with the standard NanoTrasen livery." - closet_appearance = /decl/closet_appearance/crate/nanotrasen - -/obj/structure/closet/crate/nanothreads - desc = "A crate emblazoned with the NanoThreads Garments livery, a subsidary of the NanoTrasen Corporation." - closet_appearance = /decl/closet_appearance/crate/nanotrasenclothing - -/obj/structure/closet/crate/nanomed - desc = "A crate emblazoned with the NanoMed Medical livery, a subsidary of the NanoTrasen Corporation." - closet_appearance = /decl/closet_appearance/crate/nanotrasenmedical - -/obj/structure/closet/crate/oculum - desc = "A crate minimally decorated with the logo of media giant Oculum Broadcast." - closet_appearance = /decl/closet_appearance/crate/oculum - -/obj/structure/closet/crate/veymed - desc = "A sterile crate extensively detailed in Veymed colours." - closet_appearance = /decl/closet_appearance/crate/veymed - -/obj/structure/closet/crate/ward - desc = "A crate decaled with the logo of Ward-Takahashi." - closet_appearance = /decl/closet_appearance/crate/ward - -/obj/structure/closet/crate/xion - desc = "A crate painted in Xion Manufacturing Group orange." - closet_appearance = /decl/closet_appearance/crate/xion - -/obj/structure/closet/crate/zenghu - desc = "A sterile crate marked with the logo of Zeng-Hu Pharmaceuticals." - closet_appearance = /decl/closet_appearance/crate/zenghu - -// Brands/subsidiaries - -/obj/structure/closet/crate/allico - desc = "A crate painted in the distinctive cheerful colours of AlliCo. Ltd." - closet_appearance = /decl/closet_appearance/crate/allico - -/obj/structure/closet/crate/carp - desc = "A crate painted with the garish livery of Consolidated Agricultural Resources Plc." - closet_appearance = /decl/closet_appearance/crate/carp - -/obj/structure/closet/crate/hedberg - name = "weapons crate" - desc = "A weapons crate stamped with the logo of Hedberg-Hammarstrom and the lock conspicuously absent." - closet_appearance = /decl/closet_appearance/crate/secure/hedberg - -/obj/structure/closet/crate/galaksi - desc = "A crate printed with the markings of Ward-Takahashi's Galaksi Appliance branding." - closet_appearance = /decl/closet_appearance/crate/galaksi - -/obj/structure/closet/crate/thinktronic - desc = "A crate printed with the markings of Thinktronic Systems." - closet_appearance = /decl/closet_appearance/crate/thinktronic - -/obj/structure/closet/crate/ummarcar - desc = "A flimsy crate marked labelled 'UmMarcar Office Supply'." - closet_appearance = /decl/closet_appearance/crate/ummarcar - -/obj/structure/closet/crate/unathi - name = "import crate" - desc = "A crate painted with the markings of Moghes Imported Sissalik Jerky." - closet_appearance = /decl/closet_appearance/crate/unathiimport - - -// Secure Crates - -/obj/structure/closet/crate/secure/weapon - name = "weapons crate" - desc = "A secure weapons crate." - closet_appearance = /decl/closet_appearance/crate/secure/weapon - -/obj/structure/closet/crate/secure/aether - desc = "A secure crate painted in the colours of Aether Atmospherics and Recycling." - closet_appearance = /decl/closet_appearance/crate/secure/aether - -/obj/structure/closet/crate/secure/bishop - desc = "A secure crate finely decorated with the emblem of Bishop Cybernetics." - closet_appearance = /decl/closet_appearance/crate/secure/bishop - -/obj/structure/closet/crate/secure/cybersolutions - desc = "An unadorned secure metal crate labelled 'Cyber Solutions'." - closet_appearance = /decl/closet_appearance/crate/secure/cybersolutions - -/obj/structure/closet/crate/secure/einstein - desc = "A secure crate labelled with an Einstein Engines sticker." - closet_appearance = /decl/closet_appearance/crate/secure/einstein - -/obj/structure/closet/crate/secure/focalpoint - desc = "A secure crate marked with the decal of Focal Point Energistics." - closet_appearance = /decl/closet_appearance/crate/secure/focalpoint - -/obj/structure/closet/crate/secure/gilthari - desc = "A secure crate embossed with the logo of Gilthari Exports." - closet_appearance = /decl/closet_appearance/crate/secure/gilthari - -/obj/structure/closet/crate/secure/grayson - desc = "A secure bare metal crate spraypainted with Grayson Manufactories decals." - closet_appearance = /decl/closet_appearance/crate/secure/grayson - -/obj/structure/closet/crate/secure/hedberg - name = "weapons crate" - desc = "A secure weapons crate stamped with the logo of Hedberg-Hammarstrom." - closet_appearance = /decl/closet_appearance/crate/secure/hedberg - -/obj/structure/closet/crate/secure/heph - name = "weapons crate" - desc = "A secure weapons crate marked with the logo of Hephaestus Industries." - closet_appearance = /decl/closet_appearance/crate/secure/heph - -/obj/structure/closet/crate/secure/lawson - name = "weapons crate" - desc = "A secure weapons crate marked with the logo of Lawson Arms." - closet_appearance = /decl/closet_appearance/crate/secure/lawson - -/obj/structure/closet/crate/secure/morpheus - desc = "A secure crate crudely imprinted with 'MORPHEUS CYBERKINETICS'." - closet_appearance = /decl/closet_appearance/crate/secure/morpheus - -/obj/structure/closet/crate/secure/nanotrasen - desc = "A secure crate emblazoned with the standard NanoTrasen livery." - closet_appearance = /decl/closet_appearance/crate/secure/nanotrasen - -/obj/structure/closet/crate/secure/nanomed - desc = "A secure crate emblazoned with the NanoMed Medical livery, a subsidary of the NanoTrasen Corporation." - closet_appearance = /decl/closet_appearance/crate/secure/nanotrasenmedical - -/obj/structure/closet/crate/secure/scg - name = "weapons crate" - desc = "A secure crate in the official colours of the Solar Confederate Government." - closet_appearance = /decl/closet_appearance/crate/secure/solgov - -/obj/structure/closet/crate/secure/saare - name = "weapons crate" - desc = "A secure weapons crate plainly stamped with the logo of Stealth Assault Enterprises." - closet_appearance = /decl/closet_appearance/crate/secure/saare - -/obj/structure/closet/crate/secure/veymed - desc = "A secure sterile crate extensively detailed in Veymed colours." - closet_appearance = /decl/closet_appearance/crate/secure/veymed - -/obj/structure/closet/crate/secure/ward - desc = "A secure crate decaled with the logo of Ward-Takahashi." - closet_appearance = /decl/closet_appearance/crate/secure/ward - -/obj/structure/closet/crate/secure/xion - desc = "A secure crate painted in Xion Manufacturing Group orange." - closet_appearance = /decl/closet_appearance/crate/secure/xion - -/obj/structure/closet/crate/secure/zenghu - desc = "A secure sterile crate marked with the logo of Zeng-Hu Pharmaceuticals." - closet_appearance = /decl/closet_appearance/crate/secure/zenghu - -/obj/structure/closet/crate/secure/phoron - name = "phoron crate" - desc = "A secure phoron crate painted in standard NanoTrasen livery." - closet_appearance = /decl/closet_appearance/crate/secure/hazard - -/obj/structure/closet/crate/secure/gear - name = "gear crate" - desc = "A secure gear crate." - closet_appearance = /decl/closet_appearance/crate/secure/weapon - -/obj/structure/closet/crate/secure/hydrosec - name = "secure hydroponics crate" - desc = "A crate with a lock on it, painted in the scheme of the station's botanists." - closet_appearance = /decl/closet_appearance/crate/secure/hydroponics - -/obj/structure/closet/crate/secure/engineering - desc = "A crate with a lock on it, painted in the scheme of the station's engineers." - name = "secure engineering crate" - -/obj/structure/closet/crate/secure/science - name = "secure science crate" - desc = "A crate with a lock on it, painted in the scheme of the station's scientists." - -/obj/structure/closet/crate/secure/bin - name = "secure bin" - desc = "A secure bin." - -// Large crates - -/obj/structure/closet/crate/large - name = "large crate" - desc = "A hefty metal crate." - icon = 'icons/obj/closets/bases/large_crate.dmi' - closet_appearance = /decl/closet_appearance/large_crate - -/obj/structure/closet/crate/large/close() - . = ..() - if (.)//we can hold up to one large item - var/found = 0 - for(var/obj/structure/S in src.loc) - if(S == src) - continue - if(!S.anchored) - found = 1 - S.forceMove(src) - break - if(!found) - for(var/obj/machinery/M in src.loc) - if(!M.anchored) - M.forceMove(src) - break - return - -/obj/structure/closet/crate/large/critter - name = "animal crate" - desc = "A hefty crate for hauling animals." - closet_appearance = /decl/closet_appearance/large_crate/critter - -/obj/structure/closet/crate/large/aether - name = "large atmospherics crate" - desc = "A hefty metal crate, painted in Aether Atmospherics and Recycling colours." - closet_appearance = /decl/closet_appearance/large_crate/aether - -/obj/structure/closet/crate/large/einstein - name = "large crate" - desc = "A hefty metal crate, painted in Einstein Engines colours." - closet_appearance = /decl/closet_appearance/large_crate/einstein - -/obj/structure/closet/crate/large/nanotrasen - name = "large crate" - desc = "A hefty metal crate, painted in standard NanoTrasen livery." - closet_appearance = /decl/closet_appearance/large_crate/nanotrasen - -/obj/structure/closet/crate/large/xion - name = "large crate" - desc = "A hefty metal crate, painted in Xion Manufacturing Group orange." - closet_appearance = /decl/closet_appearance/large_crate/xion - -/obj/structure/closet/crate/secure/large - name = "large crate" - desc = "A hefty metal crate with an electronic locking system." - icon = 'icons/obj/closets/bases/large_crate.dmi' - closet_appearance = /decl/closet_appearance/large_crate/secure - - -/obj/structure/closet/crate/secure/large/close() - . = ..() - if (.)//we can hold up to one large item - var/found = 0 - for(var/obj/structure/S in src.loc) - if(S == src) - continue - if(!S.anchored) - found = 1 - S.forceMove(src) - break - if(!found) - for(var/obj/machinery/M in src.loc) - if(!M.anchored) - M.forceMove(src) - break - return - - -/obj/structure/closet/crate/secure/large/reinforced - desc = "A hefty, reinforced metal crate with an electronic locking system." - -/obj/structure/closet/crate/secure/large/aether - name = "secure atmospherics crate" - desc = "A hefty metal crate with an electronic locking system, painted in Aether Atmospherics and Recycling colours." - closet_appearance = /decl/closet_appearance/large_crate/secure/aether - -/obj/structure/closet/crate/secure/large/einstein - desc = "A hefty metal crate with an electronic locking system, painted in Einstein Engines colours." - closet_appearance = /decl/closet_appearance/large_crate/secure/einstein - -/obj/structure/closet/crate/large/secure/heph - desc = "A hefty metal crate with an electronic locking system, marked with Hephaestus Industries colours." - closet_appearance = /decl/closet_appearance/large_crate/secure/heph - -/obj/structure/closet/crate/secure/large/nanotrasen - desc = "A hefty metal crate with an electronic locking system, painted in standard NanoTrasen livery." - closet_appearance = /decl/closet_appearance/large_crate/secure/hazard - -/obj/structure/closet/crate/large/secure/xion - desc = "A hefty metal crate with an electronic locking system, painted in Xion Manufacturing Group orange." - closet_appearance = /decl/closet_appearance/large_crate/secure/xion - -/obj/structure/closet/crate/engineering - name = "engineering crate" - -/obj/structure/closet/crate/engineering/electrical - -/obj/structure/closet/crate/science - name = "science crate" - -/obj/structure/closet/crate/hydroponics - name = "hydroponics crate" - desc = "All you need to destroy those pesky weeds and pests." - closet_appearance = /decl/closet_appearance/crate/hydroponics - - -/obj/structure/closet/crate/hydroponics/prespawned - starts_with = list( - /obj/item/weapon/reagent_containers/spray/plantbgone = 2, - /obj/item/weapon/material/minihoe) - -//Laundry Cart -/obj/structure/closet/crate/laundry - name = "Laundry Cart" - desc = "A cart with a large fabric bin on it used for transporting large amounts of clothes." - icon = 'icons/obj/closets/laundry.dmi' - closet_appearance = null - open_sound = 'sound/effects/rustle1.ogg' - close_sound = 'sound/effects/rustle2.ogg' - -//Wooden Crate -/obj/structure/closet/crate/wooden - name = "wooden crate" - desc = "A crate made from wood and lined with straw. Cheapest form of storage." - icon = 'icons/obj/closets/wooden.dmi' - closet_appearance = null - open_sound = 'sound/effects/wooden_closet_open.ogg' - close_sound = 'sound/effects/wooden_closet_close.ogg' - -//Mining Cart -/obj/structure/closet/crate/miningcar - name = "mining cart" - desc = "A mining car. This one doesn't work on rails, but has to be dragged." - icon = 'icons/obj/closets/miningcar.dmi' - closet_appearance = null - open_sound = 'sound/effects/wooden_closet_open.ogg' +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 + +/obj/structure/closet/crate + name = "crate" + desc = "A rectangular steel crate." + icon = 'icons/obj/closets/bases/crate.dmi' + closet_appearance = /decl/closet_appearance/crate + climbable = TRUE + dir = 4 //Spawn facing 'forward' by default. + var/points_per_crate = 5 + var/rigged = 0 + + open_sound = 'sound/effects/crate_open.ogg' + close_sound = 'sound/effects/crate_close.ogg' + +/obj/structure/closet/crate/can_open() + return 1 + +/obj/structure/closet/crate/can_close() + return 1 + +/obj/structure/closet/crate/open() + if(src.opened) + return 0 + if(!src.can_open()) + return 0 + + if(rigged && locate(/obj/item/device/radio/electropack) in src) + if(isliving(usr)) + var/mob/living/L = usr + if(L.electrocute_act(17, src)) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(5, 1, src) + s.start() + if(usr.stunned) + return 2 + + playsound(src, open_sound, 50, 1, -3) + for(var/obj/O in src) + O.forceMove(get_turf(src)) + src.opened = 1 + + if(climbable) + structure_shaken() + update_icon() + return 1 + +/obj/structure/closet/crate/close() + if(!src.opened) + return 0 + if(!src.can_close()) + return 0 + + playsound(src, close_sound, 50, 1, -3) + var/itemcount = 0 + for(var/obj/O in get_turf(src)) + if(itemcount >= storage_capacity) + break + if(O.density || O.anchored || istype(O,/obj/structure/closet)) + continue + if(istype(O, /obj/structure/bed)) //This is only necessary because of rollerbeds and swivel chairs. + var/obj/structure/bed/B = O + if(B.has_buckled_mobs()) + continue + O.forceMove(src) + itemcount++ + + src.opened = 0 + update_icon() + return 1 + +/obj/structure/closet/crate/verb/rotate_clockwise() + set name = "Rotate Crate Clockwise" + set category = "Object" + set src in oview(1) + + if (usr.stat || usr.restrained() || anchored) + return + + src.set_dir(turn(src.dir, 270)) + +/obj/structure/closet/crate/verb/rotate_counterclockwise() + set category = "Object" + set name = "Rotate Crate Counterclockwise" + set src in view(1) + + if (usr.stat || usr.restrained() || anchored) + return + + src.set_dir(turn(src.dir, 90)) + +/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(W.is_wrench() && istype(src,/obj/structure/closet/crate/bin)) + return ..() + else if(opened) + if(isrobot(user)) + return + if(W.loc != user) // This should stop mounted modules ending up outside the module. + return + user.drop_item() + if(W) + W.forceMove(src.loc) + else if(istype(W, /obj/item/weapon/packageWrap)) + return + else if(istype(W, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/C = W + if(rigged) + to_chat(user, "[src] is already rigged!") + return + if (C.use(1)) + to_chat(user , "You rig [src].") + rigged = 1 + return + else if(istype(W, /obj/item/device/radio/electropack)) + if(rigged) + to_chat(user , "You attach [W] to [src].") + user.drop_item() + W.forceMove(src) + return + else if(W.is_wirecutter()) + if(rigged) + to_chat(user , "You cut away the wiring.") + playsound(src, W.usesound, 100, 1) + rigged = 0 + return + else return attack_hand(user) + +/obj/structure/closet/crate/ex_act(severity) + switch(severity) + if(1.0) + for(var/obj/O in src.contents) + qdel(O) + qdel(src) + return + if(2.0) + for(var/obj/O in src.contents) + if(prob(50)) + qdel(O) + qdel(src) + return + if(3.0) + if (prob(50)) + qdel(src) + return + else + return + +/obj/structure/closet/crate/secure + desc = "A secure crate." + name = "Secure crate" + closet_appearance = /decl/closet_appearance/crate/secure + var/broken = 0 + var/locked = 1 + +/obj/structure/closet/crate/secure/can_open() + return !locked + +/obj/structure/closet/crate/secure/update_icon() + if(opened) + icon_state = "open" + else + if(broken) + icon_state = "closed_emagged[sealed ? "_welded" : ""]" + else + if(locked) + icon_state = "closed_locked[sealed ? "_welded" : ""]" + else + icon_state = "closed_unlocked[sealed ? "_welded" : ""]" + +/obj/structure/closet/crate/secure/proc/togglelock(mob/user as mob) + if(src.opened) + to_chat(user, "Close the crate first.") + return + if(src.broken) + to_chat(user, "The crate appears to be broken.") + return + if(src.allowed(user)) + set_locked(!locked, user) + else + to_chat(user, "Access Denied") + +/obj/structure/closet/crate/secure/proc/set_locked(var/newlocked, mob/user = null) + if(locked == newlocked) return + + locked = newlocked + if(user) + for(var/mob/O in viewers(user, 3)) + O.show_message( "The crate has been [locked ? null : "un"]locked by [user].", 1) + update_icon() + +/obj/structure/closet/crate/secure/verb/verb_togglelock() + set src in oview(1) // One square distance + set category = "Object" + set name = "Toggle Lock" + + if(!usr.canmove || usr.stat || usr.restrained()) // Don't use it if you're not able to! Checks for stuns, ghost and restrain + return + + if(ishuman(usr) || isrobot(usr)) + src.add_fingerprint(usr) + src.togglelock(usr) + else + to_chat(usr, "This mob type can't use this verb.") + +/obj/structure/closet/crate/secure/attack_hand(mob/user as mob) + src.add_fingerprint(user) + if(locked) + src.togglelock(user) + else + src.toggle(user) + +/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(is_type_in_list(W, list(/obj/item/weapon/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/tool/wirecutters))) + return ..() + if(istype(W, /obj/item/weapon/melee/energy/blade)) + emag_act(INFINITY, user) + if(!opened) + src.togglelock(user) + return + return ..() + +/obj/structure/closet/crate/secure/emag_act(var/remaining_charges, var/mob/user) + if(!broken) + playsound(src, "sparks", 60, 1) + locked = 0 + broken = 1 + to_chat(user, "You unlock \the [src].") + update_icon() + return 1 + +/obj/structure/closet/crate/secure/emp_act(severity) + for(var/obj/O in src) + O.emp_act(severity) + if(!broken && !opened && prob(50/severity)) + if(!locked) + locked = 1 + else + playsound(src, 'sound/effects/sparks4.ogg', 75, 1) + locked = 0 + if(!opened && prob(20/severity)) + if(!locked) + open() + else + req_access = list() + req_access += pick(get_all_station_access()) + update_icon() + ..() + +/obj/structure/closet/crate/plastic + name = "plastic crate" + desc = "A rectangular plastic crate." + closet_appearance = /decl/closet_appearance/crate/plastic + points_per_crate = 1 //5 crates per ordered crate, +5 for the crate it comes in. + +/obj/structure/closet/crate/internals + name = "internals crate" + desc = "A internals crate." + +/obj/structure/closet/crate/trashcart + name = "trash cart" + desc = "A heavy, metal trashcart with wheels." + closet_appearance = /decl/closet_appearance/cart/trash + +/*these aren't needed anymore +/obj/structure/closet/crate/hat + desc = "A crate filled with Valuable Collector's Hats!." + name = "Hat Crate" + +/obj/structure/closet/crate/contraband + name = "Poster crate" + desc = "A random assortment of posters manufactured by providers NOT listed under NanoTrasen's whitelist." +*/ + +/obj/structure/closet/crate/medical + name = "medical crate" + desc = "A medical crate." + closet_appearance = /decl/closet_appearance/crate/medical + +/obj/structure/closet/crate/rcd + name = "\improper RCD crate" + desc = "A crate with rapid construction device." + + starts_with = list( + /obj/item/weapon/rcd_ammo = 3, + /obj/item/weapon/rcd) + +/obj/structure/closet/crate/solar + name = "solar pack crate" + + starts_with = list( + /obj/item/solar_assembly = 21, + /obj/item/weapon/circuitboard/solar_control, + /obj/item/weapon/tracker_electronics, + /obj/item/weapon/paper/solar) + +/obj/structure/closet/crate/cooper + name = "Cooper's Stache" + + starts_with = list( + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 6, + /obj/item/stack/material/gold = 1) +/obj/structure/closet/crate/freezer + name = "freezer" + desc = "A freezer." + closet_appearance = /decl/closet_appearance/crate/freezer + var/target_temp = T0C - 40 + var/cooling_power = 40 + +/obj/structure/closet/crate/freezer/centauri + desc = "A freezer stamped with the logo of Centauri Provisions." + closet_appearance = /decl/closet_appearance/crate/freezer/centauri + +/obj/structure/closet/crate/freezer/nanotrasen + desc = "A freezer stamped with the logo of NanoTrasen." + closet_appearance = /decl/closet_appearance/crate/freezer/nanotrasen + +/obj/structure/closet/crate/freezer/return_air() + var/datum/gas_mixture/gas = (..()) + if(!gas) return null + var/datum/gas_mixture/newgas = new/datum/gas_mixture() + newgas.copy_from(gas) + if(newgas.temperature <= target_temp) return + + if((newgas.temperature - cooling_power) > target_temp) + newgas.temperature -= cooling_power + else + newgas.temperature = target_temp + return newgas + +/obj/structure/closet/crate/freezer/Entered(var/atom/movable/AM) + if(istype(AM, /obj/item/organ)) + var/obj/item/organ/O = AM + O.preserved = 1 + for(var/obj/item/organ/organ in O) + organ.preserved = 1 + ..() + +/obj/structure/closet/crate/freezer/Exited(var/atom/movable/AM) + if(istype(AM, /obj/item/organ)) + var/obj/item/organ/O = AM + O.preserved = 0 + for(var/obj/item/organ/organ in O) + organ.preserved = 0 + ..() + +/obj/structure/closet/crate/weapon + name = "weapons crate" + desc = "A barely secured weapons crate." + closet_appearance = /decl/closet_appearance/crate/secure/weapon + +/obj/structure/closet/crate/freezer/rations //Fpr use in the escape shuttle + name = "emergency rations" + desc = "A crate of emergency rations." + + starts_with = list( + /obj/random/mre = 6) + +/obj/structure/closet/crate/bin + name = "large bin" + desc = "A large bin." + closet_appearance = null + icon = 'icons/obj/closets/largebin.dmi' + +/obj/structure/closet/crate/radiation + name = "radioactive gear crate" + desc = "A crate with a radiation sign on it." + closet_appearance = /decl/closet_appearance/crate/radiation + + starts_with = list( + /obj/item/clothing/suit/radiation = 4, + /obj/item/clothing/head/radiation = 4) + +//TSCs + +/obj/structure/closet/crate/aether + desc = "A crate painted in the colours of Aether Atmospherics and Recycling." + closet_appearance = /decl/closet_appearance/crate/aether + +/obj/structure/closet/crate/centauri + desc = "A crate decorated with the logo of Centauri Provisions." + closet_appearance = /decl/closet_appearance/crate/centauri + +/obj/structure/closet/crate/einstein + desc = "A crate labelled with an Einstein Engines sticker." + closet_appearance = /decl/closet_appearance/crate/einstein + +/obj/structure/closet/crate/focalpoint + desc = "A crate marked with the decal of Focal Point Energistics." + closet_appearance = /decl/closet_appearance/crate/focalpoint + +/obj/structure/closet/crate/gilthari + desc = "A crate embossed with the logo of Gilthari Exports." + closet_appearance = /decl/closet_appearance/crate/gilthari + +/obj/structure/closet/crate/grayson + desc = "A bare metal crate spraypainted with Grayson Manufactories decals." + closet_appearance = /decl/closet_appearance/crate/grayson + +/obj/structure/closet/crate/heph + desc = "A sturdy crate marked with the logo of Hephaestus Industries." + closet_appearance = /decl/closet_appearance/crate/heph + +/obj/structure/closet/crate/morpheus + desc = "A crate crudely imprinted with 'MORPHEUS CYBERKINETICS'." + closet_appearance = /decl/closet_appearance/crate/morpheus + +/obj/structure/closet/crate/nanotrasen + desc = "A crate emblazoned with the standard NanoTrasen livery." + closet_appearance = /decl/closet_appearance/crate/nanotrasen + +/obj/structure/closet/crate/nanothreads + desc = "A crate emblazoned with the NanoThreads Garments livery, a subsidary of the NanoTrasen Corporation." + closet_appearance = /decl/closet_appearance/crate/nanotrasenclothing + +/obj/structure/closet/crate/nanomed + desc = "A crate emblazoned with the NanoMed Medical livery, a subsidary of the NanoTrasen Corporation." + closet_appearance = /decl/closet_appearance/crate/nanotrasenmedical + +/obj/structure/closet/crate/oculum + desc = "A crate minimally decorated with the logo of media giant Oculum Broadcast." + closet_appearance = /decl/closet_appearance/crate/oculum + +/obj/structure/closet/crate/veymed + desc = "A sterile crate extensively detailed in Veymed colours." + closet_appearance = /decl/closet_appearance/crate/veymed + +/obj/structure/closet/crate/ward + desc = "A crate decaled with the logo of Ward-Takahashi." + closet_appearance = /decl/closet_appearance/crate/ward + +/obj/structure/closet/crate/xion + desc = "A crate painted in Xion Manufacturing Group orange." + closet_appearance = /decl/closet_appearance/crate/xion + +/obj/structure/closet/crate/zenghu + desc = "A sterile crate marked with the logo of Zeng-Hu Pharmaceuticals." + closet_appearance = /decl/closet_appearance/crate/zenghu + +// Brands/subsidiaries + +/obj/structure/closet/crate/allico + desc = "A crate painted in the distinctive cheerful colours of AlliCo. Ltd." + closet_appearance = /decl/closet_appearance/crate/allico + +/obj/structure/closet/crate/carp + desc = "A crate painted with the garish livery of Consolidated Agricultural Resources Plc." + closet_appearance = /decl/closet_appearance/crate/carp + +/obj/structure/closet/crate/hedberg + name = "weapons crate" + desc = "A weapons crate stamped with the logo of Hedberg-Hammarstrom and the lock conspicuously absent." + closet_appearance = /decl/closet_appearance/crate/secure/hedberg + +/obj/structure/closet/crate/galaksi + desc = "A crate printed with the markings of Ward-Takahashi's Galaksi Appliance branding." + closet_appearance = /decl/closet_appearance/crate/galaksi + +/obj/structure/closet/crate/thinktronic + desc = "A crate printed with the markings of Thinktronic Systems." + closet_appearance = /decl/closet_appearance/crate/thinktronic + +/obj/structure/closet/crate/ummarcar + desc = "A flimsy crate marked labelled 'UmMarcar Office Supply'." + closet_appearance = /decl/closet_appearance/crate/ummarcar + +/obj/structure/closet/crate/unathi + name = "import crate" + desc = "A crate painted with the markings of Moghes Imported Sissalik Jerky." + closet_appearance = /decl/closet_appearance/crate/unathiimport + + +// Secure Crates + +/obj/structure/closet/crate/secure/weapon + name = "weapons crate" + desc = "A secure weapons crate." + closet_appearance = /decl/closet_appearance/crate/secure/weapon + +/obj/structure/closet/crate/secure/aether + desc = "A secure crate painted in the colours of Aether Atmospherics and Recycling." + closet_appearance = /decl/closet_appearance/crate/secure/aether + +/obj/structure/closet/crate/secure/bishop + desc = "A secure crate finely decorated with the emblem of Bishop Cybernetics." + closet_appearance = /decl/closet_appearance/crate/secure/bishop + +/obj/structure/closet/crate/secure/cybersolutions + desc = "An unadorned secure metal crate labelled 'Cyber Solutions'." + closet_appearance = /decl/closet_appearance/crate/secure/cybersolutions + +/obj/structure/closet/crate/secure/einstein + desc = "A secure crate labelled with an Einstein Engines sticker." + closet_appearance = /decl/closet_appearance/crate/secure/einstein + +/obj/structure/closet/crate/secure/focalpoint + desc = "A secure crate marked with the decal of Focal Point Energistics." + closet_appearance = /decl/closet_appearance/crate/secure/focalpoint + +/obj/structure/closet/crate/secure/gilthari + desc = "A secure crate embossed with the logo of Gilthari Exports." + closet_appearance = /decl/closet_appearance/crate/secure/gilthari + +/obj/structure/closet/crate/secure/grayson + desc = "A secure bare metal crate spraypainted with Grayson Manufactories decals." + closet_appearance = /decl/closet_appearance/crate/secure/grayson + +/obj/structure/closet/crate/secure/hedberg + name = "weapons crate" + desc = "A secure weapons crate stamped with the logo of Hedberg-Hammarstrom." + closet_appearance = /decl/closet_appearance/crate/secure/hedberg + +/obj/structure/closet/crate/secure/heph + name = "weapons crate" + desc = "A secure weapons crate marked with the logo of Hephaestus Industries." + closet_appearance = /decl/closet_appearance/crate/secure/heph + +/obj/structure/closet/crate/secure/lawson + name = "weapons crate" + desc = "A secure weapons crate marked with the logo of Lawson Arms." + closet_appearance = /decl/closet_appearance/crate/secure/lawson + +/obj/structure/closet/crate/secure/morpheus + desc = "A secure crate crudely imprinted with 'MORPHEUS CYBERKINETICS'." + closet_appearance = /decl/closet_appearance/crate/secure/morpheus + +/obj/structure/closet/crate/secure/nanotrasen + desc = "A secure crate emblazoned with the standard NanoTrasen livery." + closet_appearance = /decl/closet_appearance/crate/secure/nanotrasen + +/obj/structure/closet/crate/secure/nanomed + desc = "A secure crate emblazoned with the NanoMed Medical livery, a subsidary of the NanoTrasen Corporation." + closet_appearance = /decl/closet_appearance/crate/secure/nanotrasenmedical + +/obj/structure/closet/crate/secure/scg + name = "weapons crate" + desc = "A secure crate in the official colours of the Solar Confederate Government." + closet_appearance = /decl/closet_appearance/crate/secure/solgov + +/obj/structure/closet/crate/secure/saare + name = "weapons crate" + desc = "A secure weapons crate plainly stamped with the logo of Stealth Assault Enterprises." + closet_appearance = /decl/closet_appearance/crate/secure/saare + +/obj/structure/closet/crate/secure/veymed + desc = "A secure sterile crate extensively detailed in Veymed colours." + closet_appearance = /decl/closet_appearance/crate/secure/veymed + +/obj/structure/closet/crate/secure/ward + desc = "A secure crate decaled with the logo of Ward-Takahashi." + closet_appearance = /decl/closet_appearance/crate/secure/ward + +/obj/structure/closet/crate/secure/xion + desc = "A secure crate painted in Xion Manufacturing Group orange." + closet_appearance = /decl/closet_appearance/crate/secure/xion + +/obj/structure/closet/crate/secure/zenghu + desc = "A secure sterile crate marked with the logo of Zeng-Hu Pharmaceuticals." + closet_appearance = /decl/closet_appearance/crate/secure/zenghu + +/obj/structure/closet/crate/secure/phoron + name = "phoron crate" + desc = "A secure phoron crate painted in standard NanoTrasen livery." + closet_appearance = /decl/closet_appearance/crate/secure/hazard + +/obj/structure/closet/crate/secure/gear + name = "gear crate" + desc = "A secure gear crate." + closet_appearance = /decl/closet_appearance/crate/secure/weapon + +/obj/structure/closet/crate/secure/hydrosec + name = "secure hydroponics crate" + desc = "A crate with a lock on it, painted in the scheme of the station's botanists." + closet_appearance = /decl/closet_appearance/crate/secure/hydroponics + +/obj/structure/closet/crate/secure/engineering + desc = "A crate with a lock on it, painted in the scheme of the station's engineers." + name = "secure engineering crate" + +/obj/structure/closet/crate/secure/science + name = "secure science crate" + desc = "A crate with a lock on it, painted in the scheme of the station's scientists." + +/obj/structure/closet/crate/secure/bin + name = "secure bin" + desc = "A secure bin." + +// Large crates + +/obj/structure/closet/crate/large + name = "large crate" + desc = "A hefty metal crate." + icon = 'icons/obj/closets/bases/large_crate.dmi' + closet_appearance = /decl/closet_appearance/large_crate + +/obj/structure/closet/crate/large/close() + . = ..() + if (.)//we can hold up to one large item + var/found = 0 + for(var/obj/structure/S in src.loc) + if(S == src) + continue + if(!S.anchored) + found = 1 + S.forceMove(src) + break + if(!found) + for(var/obj/machinery/M in src.loc) + if(!M.anchored) + M.forceMove(src) + break + return + +/obj/structure/closet/crate/large/critter + name = "animal crate" + desc = "A hefty crate for hauling animals." + closet_appearance = /decl/closet_appearance/large_crate/critter + +/obj/structure/closet/crate/large/aether + name = "large atmospherics crate" + desc = "A hefty metal crate, painted in Aether Atmospherics and Recycling colours." + closet_appearance = /decl/closet_appearance/large_crate/aether + +/obj/structure/closet/crate/large/einstein + name = "large crate" + desc = "A hefty metal crate, painted in Einstein Engines colours." + closet_appearance = /decl/closet_appearance/large_crate/einstein + +/obj/structure/closet/crate/large/nanotrasen + name = "large crate" + desc = "A hefty metal crate, painted in standard NanoTrasen livery." + closet_appearance = /decl/closet_appearance/large_crate/nanotrasen + +/obj/structure/closet/crate/large/xion + name = "large crate" + desc = "A hefty metal crate, painted in Xion Manufacturing Group orange." + closet_appearance = /decl/closet_appearance/large_crate/xion + +/obj/structure/closet/crate/secure/large + name = "large crate" + desc = "A hefty metal crate with an electronic locking system." + icon = 'icons/obj/closets/bases/large_crate.dmi' + closet_appearance = /decl/closet_appearance/large_crate/secure + + +/obj/structure/closet/crate/secure/large/close() + . = ..() + if (.)//we can hold up to one large item + var/found = 0 + for(var/obj/structure/S in src.loc) + if(S == src) + continue + if(!S.anchored) + found = 1 + S.forceMove(src) + break + if(!found) + for(var/obj/machinery/M in src.loc) + if(!M.anchored) + M.forceMove(src) + break + return + + +/obj/structure/closet/crate/secure/large/reinforced + desc = "A hefty, reinforced metal crate with an electronic locking system." + +/obj/structure/closet/crate/secure/large/aether + name = "secure atmospherics crate" + desc = "A hefty metal crate with an electronic locking system, painted in Aether Atmospherics and Recycling colours." + closet_appearance = /decl/closet_appearance/large_crate/secure/aether + +/obj/structure/closet/crate/secure/large/einstein + desc = "A hefty metal crate with an electronic locking system, painted in Einstein Engines colours." + closet_appearance = /decl/closet_appearance/large_crate/secure/einstein + +/obj/structure/closet/crate/large/secure/heph + desc = "A hefty metal crate with an electronic locking system, marked with Hephaestus Industries colours." + closet_appearance = /decl/closet_appearance/large_crate/secure/heph + +/obj/structure/closet/crate/secure/large/nanotrasen + desc = "A hefty metal crate with an electronic locking system, painted in standard NanoTrasen livery." + closet_appearance = /decl/closet_appearance/large_crate/secure/hazard + +/obj/structure/closet/crate/large/secure/xion + desc = "A hefty metal crate with an electronic locking system, painted in Xion Manufacturing Group orange." + closet_appearance = /decl/closet_appearance/large_crate/secure/xion + +/obj/structure/closet/crate/engineering + name = "engineering crate" + +/obj/structure/closet/crate/engineering/electrical + +/obj/structure/closet/crate/science + name = "science crate" + +/obj/structure/closet/crate/hydroponics + name = "hydroponics crate" + desc = "All you need to destroy those pesky weeds and pests." + closet_appearance = /decl/closet_appearance/crate/hydroponics + + +/obj/structure/closet/crate/hydroponics/prespawned + starts_with = list( + /obj/item/weapon/reagent_containers/spray/plantbgone = 2, + /obj/item/weapon/material/minihoe) + +//Laundry Cart +/obj/structure/closet/crate/laundry + name = "Laundry Cart" + desc = "A cart with a large fabric bin on it used for transporting large amounts of clothes." + icon = 'icons/obj/closets/laundry.dmi' + closet_appearance = null + open_sound = 'sound/effects/rustle1.ogg' + close_sound = 'sound/effects/rustle2.ogg' + +//Wooden Crate +/obj/structure/closet/crate/wooden + name = "wooden crate" + desc = "A crate made from wood and lined with straw. Cheapest form of storage." + icon = 'icons/obj/closets/wooden.dmi' + closet_appearance = null + open_sound = 'sound/effects/wooden_closet_open.ogg' + close_sound = 'sound/effects/wooden_closet_close.ogg' + +//Mining Cart +/obj/structure/closet/crate/miningcar + name = "mining cart" + desc = "A mining car. This one doesn't work on rails, but has to be dragged." + icon = 'icons/obj/closets/miningcar.dmi' + closet_appearance = null + open_sound = 'sound/effects/wooden_closet_open.ogg' close_sound = 'sound/effects/wooden_closet_close.ogg' \ No newline at end of file diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 108e824616..6846b52066 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -155,7 +155,7 @@ bound_height = width * world.icon_size /obj/structure/door_assembly/proc/rename_door(mob/living/user) - var/t = sanitizeSafe(input(user, "Enter the name for the windoor.", src.name, src.created_name), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter the name for the windoor.", src.name, src.created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!in_range(src, user) && src.loc != user) return created_name = t update_state() diff --git a/code/game/objects/structures/ghost_pods/human.dm b/code/game/objects/structures/ghost_pods/human.dm index f2b3291597..13ae71ef92 100644 --- a/code/game/objects/structures/ghost_pods/human.dm +++ b/code/game/objects/structures/ghost_pods/human.dm @@ -102,7 +102,7 @@ E.description_antag = "This is a 'disguised' emag, to make your escape from wherever you happen to be trapped." H.equip_to_appropriate_slot(E) - var/newname = sanitize(input(H, "Your mind feels foggy, and you recall your name might be [H.real_name]. Would you like to change your name?", "Name change") as null|text, MAX_NAME_LEN) + var/newname = sanitize(tgui_input_text(H, "Your mind feels foggy, and you recall your name might be [H.real_name]. Would you like to change your name?", "Name change", null, MAX_NAME_LEN), MAX_NAME_LEN) if (newname) H.real_name = newname @@ -224,7 +224,7 @@ var/obj/item/C = new newpath(H) H.equip_to_appropriate_slot(C) - var/newname = sanitize(input(H, "Your mind feels foggy, and you recall your name might be [H.real_name]. Would you like to change your name?", "Name change") as null|text, MAX_NAME_LEN) + var/newname = sanitize(tgui_input_text(H, "Your mind feels foggy, and you recall your name might be [H.real_name]. Would you like to change your name?", "Name change", null, MAX_NAME_LEN), MAX_NAME_LEN) if (newname) H.real_name = newname diff --git a/code/game/objects/structures/gravemarker.dm b/code/game/objects/structures/gravemarker.dm index e53fcdeb20..381401b352 100644 --- a/code/game/objects/structures/gravemarker.dm +++ b/code/game/objects/structures/gravemarker.dm @@ -52,14 +52,14 @@ /obj/structure/gravemarker/attackby(obj/item/weapon/W, mob/user as mob) if(W.is_screwdriver()) - var/carving_1 = sanitizeSafe(input(user, "Who is \the [src.name] for?", "Gravestone Naming", null) as text, MAX_NAME_LEN) + var/carving_1 = sanitizeSafe(tgui_input_text(user, "Who is \the [src.name] for?", "Gravestone Naming", null, MAX_NAME_LEN), MAX_NAME_LEN) if(carving_1) user.visible_message("[user] starts carving \the [src.name].", "You start carving \the [src.name].") if(do_after(user, material.hardness * W.toolspeed)) user.visible_message("[user] carves something into \the [src.name].", "You carve your message into \the [src.name].") grave_name += carving_1 update_icon() - var/carving_2 = sanitizeSafe(input(user, "What message should \the [src.name] have?", "Epitaph Carving", null) as text, MAX_NAME_LEN) + var/carving_2 = sanitizeSafe(tgui_input_text(user, "What message should \the [src.name] have?", "Epitaph Carving", null, MAX_NAME_LEN), MAX_NAME_LEN) if(carving_2) user.visible_message("[user] starts carving \the [src.name].", "You start carving \the [src.name].") if(do_after(user, material.hardness * W.toolspeed)) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 4fc64a5c52..8cb6749823 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -133,7 +133,7 @@ if(user.mind) user.mind.transfer_to(vox) spawn(1) - var/newname = sanitizeSafe(input(vox,"Enter a name, or leave blank for the default name.", "Name change","") as text, MAX_NAME_LEN) + var/newname = sanitizeSafe(tgui_input_text(vox,"Enter a name, or leave blank for the default name.", "Name change","", MAX_NAME_LEN), MAX_NAME_LEN) if(!newname || newname == "") var/datum/language/L = GLOB.all_languages[vox.species.default_language] newname = L.get_random_name() diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 47f4aa26cf..fd861c5ad1 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -1,353 +1,353 @@ -/* Morgue stuff - * Contains: - * Morgue - * Morgue trays - * Creamatorium - * Creamatorium trays - */ - -/* - * Morgue - */ - -/obj/structure/morgue - name = "morgue" - desc = "Used to keep bodies in untill someone fetches them." - icon = 'icons/obj/stationobjs.dmi' - icon_state = "morgue1" - dir = EAST - density = TRUE - var/obj/structure/m_tray/connected = null - var/list/occupants = list() - anchored = TRUE - unacidable = TRUE - -/obj/structure/morgue/Destroy() - if(connected) - qdel(connected) - connected = null - return ..() - -/obj/structure/morgue/proc/get_occupants() - occupants.Cut() - for(var/mob/living/carbon/human/H in contents) - occupants += H - for(var/obj/structure/closet/body_bag/B in contents) - occupants += B.get_occupants() - -/obj/structure/morgue/proc/update(var/broadcast=0) - if (src.connected) - src.icon_state = "morgue0" - else - if (src.contents.len) - src.icon_state = "morgue2" - get_occupants() - for (var/mob/living/carbon/human/H in occupants) - if(H.isSynthetic() || H.suiciding || !H.ckey || !H.client || (NOCLONE in H.mutations) || (H.species && H.species.flags & NO_SCAN)) - src.icon_state = "morgue2" - break - else - src.icon_state = "morgue3" - if(broadcast) - global_announcer.autosay("[src] was able to establish a mental interface with occupant.", "[src]", "Medical") - else - src.icon_state = "morgue1" - return - -/obj/structure/morgue/ex_act(severity) - switch(severity) - if(1.0) - for(var/atom/movable/A as mob|obj in src) - A.forceMove(src.loc) - ex_act(severity) - qdel(src) - return - if(2.0) - if (prob(50)) - for(var/atom/movable/A as mob|obj in src) - A.forceMove(src.loc) - ex_act(severity) - qdel(src) - return - if(3.0) - if (prob(5)) - for(var/atom/movable/A as mob|obj in src) - A.forceMove(src.loc) - ex_act(severity) - qdel(src) - return - return - -/obj/structure/morgue/attack_robot(mob/user) - if(Adjacent(user)) - attack_hand(user) - -/obj/structure/morgue/attack_hand(mob/user as mob) - if (src.connected) - close() - else - open() - src.add_fingerprint(user) - update() - return - - -/obj/structure/morgue/proc/close() - for(var/atom/movable/A as mob|obj in src.connected.loc) - if (!( A.anchored )) - A.forceMove(src) - playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - qdel(src.connected) - src.connected = null - - -/obj/structure/morgue/proc/open() - playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - src.connected = new /obj/structure/m_tray( src.loc ) - step(src.connected, src.dir) - src.connected.layer = OBJ_LAYER - var/turf/T = get_step(src, src.dir) - if (T.contents.Find(src.connected)) - src.connected.connected = src - src.icon_state = "morgue0" - for(var/atom/movable/A as mob|obj in src) - A.forceMove(src.connected.loc) - src.connected.icon_state = "morguet" - src.connected.set_dir(src.dir) - else - qdel(src.connected) - src.connected = null - - -/obj/structure/morgue/attackby(P as obj, mob/user as mob) - if (istype(P, /obj/item/weapon/pen)) - var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text - if (user.get_active_hand() != P) - return - if ((!in_range(src, usr) && src.loc != user)) - return - t = sanitizeSafe(t, MAX_NAME_LEN) - if (t) - src.name = text("Morgue- '[]'", t) - else - src.name = "Morgue" - src.add_fingerprint(user) - return - -/obj/structure/morgue/relaymove(mob/user as mob) - if (user.stat) - return - if (user in src.occupants) - open() - -/* - * Morgue tray - */ -/obj/structure/m_tray - name = "morgue tray" - desc = "Apply corpse before closing." - icon = 'icons/obj/stationobjs.dmi' - icon_state = "morguet" - density = TRUE - plane = TURF_PLANE - var/obj/structure/morgue/connected = null - anchored = TRUE - throwpass = 1 - -/obj/structure/m_tray/Destroy() - if(connected && connected.connected == src) - connected.connected = null - connected = null - return ..() - -/obj/structure/m_tray/attack_robot(mob/user) - if(Adjacent(user)) - attack_hand(user) - -/obj/structure/m_tray/attack_hand(mob/user as mob) - if (src.connected) - for(var/atom/movable/A as mob|obj in src.loc) - if (!( A.anchored )) - A.forceMove(src.connected) - //Foreach goto(26) - src.connected.connected = null - src.connected.update() - add_fingerprint(user) - //SN src = null - qdel(src) - return - return - -/obj/structure/m_tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) - if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O))) - return - if (!ismob(O) && !istype(O, /obj/structure/closet/body_bag)) - return - if (!ismob(user) || user.stat || user.lying || user.stunned) - return - O.forceMove(src.loc) - if (user != O) - for(var/mob/B in viewers(user, 3)) - if ((B.client && !( B.blinded ))) - to_chat(B, "\The [user] stuffs [O] into [src]!") - return - - -/* - * Crematorium - */ - -GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium) - -/obj/structure/morgue/crematorium - name = "crematorium" - desc = "A human incinerator. Works well on barbeque nights." - icon = 'icons/obj/stationobjs.dmi' - icon_state = "crema1" - var/cremating = 0 - var/id = 1 - var/locked = 0 - -/obj/structure/morgue/crematorium/update() - if (src.connected) - src.icon_state = "crema0" - else - if (src.contents.len) - src.icon_state = "crema2" - else - src.icon_state = "crema1" - return - -/obj/structure/morgue/crematorium/attack_hand(mob/user as mob) - if (cremating) - to_chat(usr, "It's locked.") - return - if ((src.connected) && (src.locked == 0)) - for(var/atom/movable/A as mob|obj in src.connected.loc) - if (!( A.anchored )) - A.forceMove(src) - playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - //src.connected = null - qdel(src.connected) - else if (src.locked == 0) - playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - src.connected = new /obj/structure/m_tray/c_tray( src.loc ) - step(src.connected, dir) //Vorestation Edit - src.connected.layer = OBJ_LAYER - var/turf/T = get_step(src, dir) //Vorestation Edit - if (T.contents.Find(src.connected)) - src.connected.connected = src - src.icon_state = "crema0" - for(var/atom/movable/A as mob|obj in src) - A.forceMove(src.connected.loc) - src.connected.icon_state = "cremat" - else - //src.connected = null - qdel(src.connected) - src.add_fingerprint(user) - update() - -/obj/structure/morgue/crematorium/attackby(P as obj, mob/user as mob) - if (istype(P, /obj/item/weapon/pen)) - var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text - if (user.get_active_hand() != P) - return - if ((!in_range(src, usr) > 1 && src.loc != user)) - return - t = sanitizeSafe(t, MAX_NAME_LEN) - if (t) - src.name = text("Crematorium- '[]'", t) - else - src.name = "Crematorium" - src.add_fingerprint(user) - return - -/obj/structure/morgue/crematorium/relaymove(mob/user as mob) - if (user.stat || locked) - return - src.connected = new /obj/structure/m_tray/c_tray( src.loc ) - step(src.connected, EAST) - src.connected.layer = OBJ_LAYER - var/turf/T = get_step(src, EAST) - if (T.contents.Find(src.connected)) - src.connected.connected = src - src.icon_state = "crema0" - for(var/atom/movable/A as mob|obj in src) - A.forceMove(src.connected.loc) - src.connected.icon_state = "cremat" - else - qdel(src.connected) - src.connected = null - return - -/obj/structure/morgue/crematorium/proc/cremate(atom/A, mob/user as mob) - if(cremating) - return //don't let you cremate something twice or w/e - - if(contents.len <= 0) - for (var/mob/M in viewers(src)) - to_chat(M, "You hear a hollow crackle.") - return - - else - if(!isemptylist(src.search_contents_for(/obj/item/weapon/disk/nuclear))) - to_chat(user, "You get the feeling that you shouldn't cremate one of the items in the cremator.") - return - - for (var/mob/M in viewers(src)) - to_chat(M, "You hear a roar as the crematorium activates.") - - cremating = 1 - locked = 1 - - for(var/mob/living/M in contents) - if (M.stat!=2) - if (!iscarbon(M)) - M.emote("scream") - else - var/mob/living/carbon/C = M - if (C.can_feel_pain()) - C.emote("scream") - - M.death(1) - M.ghostize() - qdel(M) - - for(var/obj/O in contents) //obj instead of obj/item so that bodybags and ashes get destroyed. We dont want tons and tons of ash piling up - qdel(O) - - new /obj/effect/decal/cleanable/ash(src) - sleep(30) - cremating = 0 - locked = 0 - playsound(src, 'sound/machines/ding.ogg', 50, 1) - return - - -/* - * Crematorium tray - */ -/obj/structure/m_tray/c_tray - name = "crematorium tray" - desc = "Apply body before burning." - icon = 'icons/obj/stationobjs.dmi' - icon_state = "cremat" - -/obj/machinery/button/crematorium - name = "crematorium igniter" - desc = "Burn baby burn!" - icon = 'icons/obj/power.dmi' - icon_state = "crema_switch" - req_access = list(access_crematorium) - id = 1 - -/obj/machinery/button/crematorium/attack_hand(mob/user as mob) - if(..()) - return - if(src.allowed(user)) - for (var/obj/structure/morgue/crematorium/C in GLOB.all_crematoriums) - if (C.id == id) - if (!C.cremating) - C.cremate(user) - else - to_chat(user, "Access denied.") +/* Morgue stuff + * Contains: + * Morgue + * Morgue trays + * Creamatorium + * Creamatorium trays + */ + +/* + * Morgue + */ + +/obj/structure/morgue + name = "morgue" + desc = "Used to keep bodies in untill someone fetches them." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "morgue1" + dir = EAST + density = TRUE + var/obj/structure/m_tray/connected = null + var/list/occupants = list() + anchored = TRUE + unacidable = TRUE + +/obj/structure/morgue/Destroy() + if(connected) + qdel(connected) + connected = null + return ..() + +/obj/structure/morgue/proc/get_occupants() + occupants.Cut() + for(var/mob/living/carbon/human/H in contents) + occupants += H + for(var/obj/structure/closet/body_bag/B in contents) + occupants += B.get_occupants() + +/obj/structure/morgue/proc/update(var/broadcast=0) + if (src.connected) + src.icon_state = "morgue0" + else + if (src.contents.len) + src.icon_state = "morgue2" + get_occupants() + for (var/mob/living/carbon/human/H in occupants) + if(H.isSynthetic() || H.suiciding || !H.ckey || !H.client || (NOCLONE in H.mutations) || (H.species && H.species.flags & NO_SCAN)) + src.icon_state = "morgue2" + break + else + src.icon_state = "morgue3" + if(broadcast) + global_announcer.autosay("[src] was able to establish a mental interface with occupant.", "[src]", "Medical") + else + src.icon_state = "morgue1" + return + +/obj/structure/morgue/ex_act(severity) + switch(severity) + if(1.0) + for(var/atom/movable/A as mob|obj in src) + A.forceMove(src.loc) + ex_act(severity) + qdel(src) + return + if(2.0) + if (prob(50)) + for(var/atom/movable/A as mob|obj in src) + A.forceMove(src.loc) + ex_act(severity) + qdel(src) + return + if(3.0) + if (prob(5)) + for(var/atom/movable/A as mob|obj in src) + A.forceMove(src.loc) + ex_act(severity) + qdel(src) + return + return + +/obj/structure/morgue/attack_robot(mob/user) + if(Adjacent(user)) + attack_hand(user) + +/obj/structure/morgue/attack_hand(mob/user as mob) + if (src.connected) + close() + else + open() + src.add_fingerprint(user) + update() + return + + +/obj/structure/morgue/proc/close() + for(var/atom/movable/A as mob|obj in src.connected.loc) + if (!( A.anchored )) + A.forceMove(src) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) + qdel(src.connected) + src.connected = null + + +/obj/structure/morgue/proc/open() + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) + src.connected = new /obj/structure/m_tray( src.loc ) + step(src.connected, src.dir) + src.connected.layer = OBJ_LAYER + var/turf/T = get_step(src, src.dir) + if (T.contents.Find(src.connected)) + src.connected.connected = src + src.icon_state = "morgue0" + for(var/atom/movable/A as mob|obj in src) + A.forceMove(src.connected.loc) + src.connected.icon_state = "morguet" + src.connected.set_dir(src.dir) + else + qdel(src.connected) + src.connected = null + + +/obj/structure/morgue/attackby(P as obj, mob/user as mob) + if (istype(P, /obj/item/weapon/pen)) + var/t = tgui_input_text(user, "What would you like the label to be?", text("[]", src.name), null) + if (user.get_active_hand() != P) + return + if ((!in_range(src, usr) && src.loc != user)) + return + t = sanitizeSafe(t, MAX_NAME_LEN) + if (t) + src.name = text("Morgue- '[]'", t) + else + src.name = "Morgue" + src.add_fingerprint(user) + return + +/obj/structure/morgue/relaymove(mob/user as mob) + if (user.stat) + return + if (user in src.occupants) + open() + +/* + * Morgue tray + */ +/obj/structure/m_tray + name = "morgue tray" + desc = "Apply corpse before closing." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "morguet" + density = TRUE + plane = TURF_PLANE + var/obj/structure/morgue/connected = null + anchored = TRUE + throwpass = 1 + +/obj/structure/m_tray/Destroy() + if(connected && connected.connected == src) + connected.connected = null + connected = null + return ..() + +/obj/structure/m_tray/attack_robot(mob/user) + if(Adjacent(user)) + attack_hand(user) + +/obj/structure/m_tray/attack_hand(mob/user as mob) + if (src.connected) + for(var/atom/movable/A as mob|obj in src.loc) + if (!( A.anchored )) + A.forceMove(src.connected) + //Foreach goto(26) + src.connected.connected = null + src.connected.update() + add_fingerprint(user) + //SN src = null + qdel(src) + return + return + +/obj/structure/m_tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) + if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O))) + return + if (!ismob(O) && !istype(O, /obj/structure/closet/body_bag)) + return + if (!ismob(user) || user.stat || user.lying || user.stunned) + return + O.forceMove(src.loc) + if (user != O) + for(var/mob/B in viewers(user, 3)) + if ((B.client && !( B.blinded ))) + to_chat(B, "\The [user] stuffs [O] into [src]!") + return + + +/* + * Crematorium + */ + +GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium) + +/obj/structure/morgue/crematorium + name = "crematorium" + desc = "A human incinerator. Works well on barbeque nights." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "crema1" + var/cremating = 0 + var/id = 1 + var/locked = 0 + +/obj/structure/morgue/crematorium/update() + if (src.connected) + src.icon_state = "crema0" + else + if (src.contents.len) + src.icon_state = "crema2" + else + src.icon_state = "crema1" + return + +/obj/structure/morgue/crematorium/attack_hand(mob/user as mob) + if (cremating) + to_chat(usr, "It's locked.") + return + if ((src.connected) && (src.locked == 0)) + for(var/atom/movable/A as mob|obj in src.connected.loc) + if (!( A.anchored )) + A.forceMove(src) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) + //src.connected = null + qdel(src.connected) + else if (src.locked == 0) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) + src.connected = new /obj/structure/m_tray/c_tray( src.loc ) + step(src.connected, dir) //Vorestation Edit + src.connected.layer = OBJ_LAYER + var/turf/T = get_step(src, dir) //Vorestation Edit + if (T.contents.Find(src.connected)) + src.connected.connected = src + src.icon_state = "crema0" + for(var/atom/movable/A as mob|obj in src) + A.forceMove(src.connected.loc) + src.connected.icon_state = "cremat" + else + //src.connected = null + qdel(src.connected) + src.add_fingerprint(user) + update() + +/obj/structure/morgue/crematorium/attackby(P as obj, mob/user as mob) + if (istype(P, /obj/item/weapon/pen)) + var/t = tgui_input_text(user, "What would you like the label to be?", text("[]", src.name), null) + if (user.get_active_hand() != P) + return + if ((!in_range(src, usr) > 1 && src.loc != user)) + return + t = sanitizeSafe(t, MAX_NAME_LEN) + if (t) + src.name = text("Crematorium- '[]'", t) + else + src.name = "Crematorium" + src.add_fingerprint(user) + return + +/obj/structure/morgue/crematorium/relaymove(mob/user as mob) + if (user.stat || locked) + return + src.connected = new /obj/structure/m_tray/c_tray( src.loc ) + step(src.connected, EAST) + src.connected.layer = OBJ_LAYER + var/turf/T = get_step(src, EAST) + if (T.contents.Find(src.connected)) + src.connected.connected = src + src.icon_state = "crema0" + for(var/atom/movable/A as mob|obj in src) + A.forceMove(src.connected.loc) + src.connected.icon_state = "cremat" + else + qdel(src.connected) + src.connected = null + return + +/obj/structure/morgue/crematorium/proc/cremate(atom/A, mob/user as mob) + if(cremating) + return //don't let you cremate something twice or w/e + + if(contents.len <= 0) + for (var/mob/M in viewers(src)) + to_chat(M, "You hear a hollow crackle.") + return + + else + if(!isemptylist(src.search_contents_for(/obj/item/weapon/disk/nuclear))) + to_chat(user, "You get the feeling that you shouldn't cremate one of the items in the cremator.") + return + + for (var/mob/M in viewers(src)) + to_chat(M, "You hear a roar as the crematorium activates.") + + cremating = 1 + locked = 1 + + for(var/mob/living/M in contents) + if (M.stat!=2) + if (!iscarbon(M)) + M.emote("scream") + else + var/mob/living/carbon/C = M + if (C.can_feel_pain()) + C.emote("scream") + + M.death(1) + M.ghostize() + qdel(M) + + for(var/obj/O in contents) //obj instead of obj/item so that bodybags and ashes get destroyed. We dont want tons and tons of ash piling up + qdel(O) + + new /obj/effect/decal/cleanable/ash(src) + sleep(30) + cremating = 0 + locked = 0 + playsound(src, 'sound/machines/ding.ogg', 50, 1) + return + + +/* + * Crematorium tray + */ +/obj/structure/m_tray/c_tray + name = "crematorium tray" + desc = "Apply body before burning." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "cremat" + +/obj/machinery/button/crematorium + name = "crematorium igniter" + desc = "Burn baby burn!" + icon = 'icons/obj/power.dmi' + icon_state = "crema_switch" + req_access = list(access_crematorium) + id = 1 + +/obj/machinery/button/crematorium/attack_hand(mob/user as mob) + if(..()) + return + if(src.allowed(user)) + for (var/obj/structure/morgue/crematorium/C in GLOB.all_crematoriums) + if (C.id == id) + if (!C.cremating) + C.cremate(user) + else + to_chat(user, "Access denied.") diff --git a/code/game/objects/structures/props/beam_prism.dm b/code/game/objects/structures/props/beam_prism.dm index a8d22fad50..96c6dc57b9 100644 --- a/code/game/objects/structures/props/beam_prism.dm +++ b/code/game/objects/structures/props/beam_prism.dm @@ -59,7 +59,7 @@ var/new_bearing if(free_rotate) - new_bearing = input(usr, "What bearing do you want to rotate \the [src] to?", "[name]") as num + new_bearing = tgui_input_number(usr, "What bearing do you want to rotate \the [src] to?", "[name]") new_bearing = round(new_bearing) if(new_bearing <= -1 || new_bearing > 360) to_chat(user, "Rotating \the [src] [new_bearing] degrees would be a waste of time.") @@ -176,7 +176,7 @@ var/new_bearing if(free_rotate) - new_bearing = input(usr, "What bearing do you want to rotate \the [src] to?", "[name]") as num + new_bearing = tgui_input_number(usr, "What bearing do you want to rotate \the [src] to?", "[name]") new_bearing = round(new_bearing) if(new_bearing <= -1 || new_bearing > 360) to_chat(user, "Rotating \the [src] [new_bearing] degrees would be a waste of time.") diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index c66bfe6ee4..bb3346bb4e 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -25,7 +25,8 @@ /obj/item/weapon/gun/projectile/pirate, /obj/item/clothing/accessory/permit/gun, /obj/item/weapon/gun/projectile/dartgun, - /obj/item/clothing/gloves/black/bloodletter + /obj/item/clothing/gloves/black/bloodletter, + /obj/item/weapon/gun/energy/mouseray/metamorphosis ) var/global/list/allocated_gamma = list() @@ -262,7 +263,8 @@ prob(1);/obj/item/weapon/storage/secure/briefcase/trashmoney, prob(1);/obj/item/device/survivalcapsule/popcabin, prob(1);/obj/item/weapon/reagent_containers/syringe/steroid, - prob(1);/obj/item/capture_crystal) + prob(1);/obj/item/capture_crystal, + prob(1);/obj/item/weapon/gun/energy/mouseray) var/obj/item/I = new path() return I diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 17b1455b45..def2811188 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -123,7 +123,7 @@ GM.adjustBruteLoss(5) else to_chat(user, "You need a tighter grip.") - + /obj/structure/urinal name = "urinal" @@ -151,7 +151,7 @@ /obj/machinery/shower name = "shower" - desc = "The HS-451. Installed in the 2550s by the Hygiene Division." + desc = "The HS-451. Installed in the 2250s by the Hygiene Division." icon = 'icons/obj/watercloset.dmi' icon_state = "shower" density = FALSE diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 28e54a4062..0ea141ce2a 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -70,7 +70,7 @@ return TRUE /obj/structure/windoor_assembly/proc/rename_door(mob/living/user) - var/t = sanitizeSafe(input(user, "Enter the name for the windoor.", src.name, src.created_name), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter the name for the windoor.", src.name, src.created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!in_range(src, user) && src.loc != user) return created_name = t update_state() diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 098861595b..fa9d9dc2a0 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -612,7 +612,7 @@ to_chat(user, "\The [src] is linked to \the [buffered_button].") return TRUE // Otherwise fall back to asking them - var/t = sanitizeSafe(input(user, "Enter the ID for the window.", src.name, null), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter the ID for the window.", src.name, null, MAX_NAME_LEN), MAX_NAME_LEN) if (!t && user.get_active_hand() != W && in_range(src, user)) src.id = t to_chat(user, "The new ID of \the [src] is [id]") @@ -667,7 +667,7 @@ var/obj/item/device/multitool/MT = W if(!id) // If no ID is set yet (newly built button?) let them select an ID for first-time use! - var/t = sanitizeSafe(input(user, "Enter an ID for \the [src].", src.name, null), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter an ID for \the [src].", src.name, null, MAX_NAME_LEN), MAX_NAME_LEN) if (t && user.get_active_hand() != W && in_range(src, user)) src.id = t to_chat(user, "The new ID of \the [src] is [id]") diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 2695a3fabf..fb41f13682 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -320,18 +320,30 @@ var/list/flooring_types icon_base = "tealcarpet" build_type = /obj/item/stack/tile/carpet/teal -/decl/flooring/carpet/deco - name = "deco carpet" - icon_base = "decocarpet" - build_type = /obj/item/stack/tile/carpet/deco +/decl/flooring/carpet/geo + name = "geometric carpet" + icon_base = "geocarpet" + build_type = /obj/item/stack/tile/carpet/geo flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN /decl/flooring/carpet/retro - name = "retro carpet" + name = "blue retro carpet" icon_base = "retrocarpet" build_type = /obj/item/stack/tile/carpet/retro flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN +/decl/flooring/carpet/retro_red + name = "red retro carpet" + icon_base = "retrocarpet_red" + build_type = /obj/item/stack/tile/carpet/retro_red + flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN + +/decl/flooring/carpet/happy + name = "happy carpet" + icon_base = "happycarpet" + build_type = /obj/item/stack/tile/carpet/happy + flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN + /decl/flooring/tiling name = "floor" desc = "Scuffed from the passage of countless greyshirts." @@ -495,6 +507,31 @@ var/list/flooring_types icon_base = "sifwood" build_type = /obj/item/stack/tile/wood/sif +/decl/flooring/wood/alt + icon = 'icons/turf/flooring/wood.dmi' + icon_base = "wood" + build_type = /obj/item/stack/tile/wood/alt + +/decl/flooring/wood/alt/panel + desc = "Polished wooden panels." + icon = 'icons/turf/flooring/wood.dmi' + icon_base = "wood_panel" + has_damage_range = 2 + build_type = /obj/item/stack/tile/wood/panel + +/decl/flooring/wood/alt/parquet + desc = "Polished wooden tiles." + icon = 'icons/turf/flooring/wood.dmi' + icon_base = "wood_parquet" + build_type = /obj/item/stack/tile/wood/parquet + +/decl/flooring/wood/alt/tile + desc = "Polished wooden tiles." + icon = 'icons/turf/flooring/wood.dmi' + icon_base = "wood_tile" + has_damage_range = 2 + build_type = /obj/item/stack/tile/wood/tile + /decl/flooring/reinforced name = "reinforced floor" desc = "Heavily reinforced with steel rods." diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index 39ccd8ef0a..c81c771263 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -19,11 +19,11 @@ icon_state = "tealcarpet" initial_flooring = /decl/flooring/carpet/tealcarpet -/turf/simulated/floor/carpet/deco +/turf/simulated/floor/carpet/geo name = "deco carpet" icon_state = "decocarpet" - initial_flooring = /decl/flooring/carpet/deco - + initial_flooring = /decl/flooring/carpet/geo + /turf/simulated/floor/carpet/retro name = "retro carpet" icon_state = "retrocarpet" @@ -60,6 +60,26 @@ icon_state = "oracarpet" initial_flooring = /decl/flooring/carpet/oracarpet +/turf/simulated/floor/carpet/geo + name = "geometric carpet" + icon_state = "geocarpet" + initial_flooring = /decl/flooring/carpet/geo + +/turf/simulated/floor/carpet/retro + name = "blue retro carpet" + icon_state = "retrocarpet" + initial_flooring = /decl/flooring/carpet/retro + +/turf/simulated/floor/carpet/retro_red + name = "red retro carpet" + icon_state = "retrocarpet_red" + initial_flooring = /decl/flooring/carpet/retro_red + +/turf/simulated/floor/carpet/happy + name = "happy carpet" + icon_state = "happycarpet" + initial_flooring = /decl/flooring/carpet/happy + /turf/simulated/floor/bluegrid name = "mainframe floor" icon = 'icons/turf/flooring/circuit.dmi' @@ -79,24 +99,67 @@ initial_flooring = /decl/flooring/wood /turf/simulated/floor/wood/broken - icon_state = "wood_broken0" // This gets changed when spawned. + icon_state = "wood-broken0" // This gets changed when spawned. -/turf/simulated/floor/wood/broken/Initialize() +/turf/simulated/floor/wood/broken/LateInitialize() + . = ..() break_tile() - return ..() /turf/simulated/floor/wood/sif name = "alien wooden floor" - icon = 'icons/turf/flooring/wood.dmi' icon_state = "sifwood" initial_flooring = /decl/flooring/wood/sif /turf/simulated/floor/wood/sif/broken - icon_state = "sifwood_broken0" // This gets changed when spawned. + icon_state = "sifwood-broken0" // This gets changed when spawned. -/turf/simulated/floor/wood/sif/broken/Initialize() +/turf/simulated/floor/wood/sif/broken/LateInitialize() + . = ..() + break_tile() + +/turf/simulated/floor/wood/alt + icon = 'icons/turf/flooring/wood.dmi' + initial_flooring = /decl/flooring/wood/alt + +/turf/simulated/floor/wood/alt/broken + icon_state = "wood-broken0" // This gets changed when spawned. + +/turf/simulated/floor/wood/alt/broken/LateInitialize() + . = ..() + break_tile() + +/turf/simulated/floor/wood/alt/tile + icon_state = "wood_tile" + initial_flooring = /decl/flooring/wood/alt/tile + +/turf/simulated/floor/wood/alt/tile/broken + icon_state = "wood_tile-broken0" // This gets changed when spawned. + +/turf/simulated/floor/wood/alt/tile/broken/LateInitialize() + . = ..() + break_tile() + +/turf/simulated/floor/wood/alt/panel + icon_state = "wood_panel" + initial_flooring = /decl/flooring/wood/alt/panel + +/turf/simulated/floor/wood/alt/panel/broken + icon_state = "wood_panel-broken0" // This gets changed when spawned. + +/turf/simulated/floor/wood/alt/panel/broken/LateInitialize() + . = ..() + break_tile() + +/turf/simulated/floor/wood/alt/parquet + icon_state = "wood_parquet" + initial_flooring = /decl/flooring/wood/alt/parquet + +/turf/simulated/floor/wood/alt/parquet/broken + icon_state = "wood_parquet-broken0" // This gets changed when spawned. + +/turf/simulated/floor/wood/alt/parquet/broken/LateInitialize() + . = ..() break_tile() - return ..() /turf/simulated/floor/grass name = "grass patch" diff --git a/code/game/turfs/simulated/floor_icon.dm b/code/game/turfs/simulated/floor_icon.dm index 420d8628b5..82153557a8 100644 --- a/code/game/turfs/simulated/floor_icon.dm +++ b/code/game/turfs/simulated/floor_icon.dm @@ -75,7 +75,10 @@ var/image/no_ceiling_image = null icon_state = "dmg[rand(1,4)]" else if(flooring) if(!isnull(broken) && (flooring.flags & TURF_CAN_BREAK)) - add_overlay(flooring.get_flooring_overlay("[flooring.icon_base]-broken-[broken]","broken[broken]")) + if(istype(src, /turf/simulated/floor/wood)) + add_overlay(flooring.get_flooring_overlay("[flooring.icon_base]-broken-[broken]","[flooring.icon_base]-broken[broken]")) + else + add_overlay(flooring.get_flooring_overlay("[flooring.icon_base]-broken-[broken]","broken[broken]")) if(!isnull(burnt) && (flooring.flags & TURF_CAN_BURN)) add_overlay(flooring.get_flooring_overlay("[flooring.icon_base]-burned-[burnt]","burned[burnt]")) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 66376f4431..fa4f4a7e27 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -330,7 +330,7 @@ to_chat(vandal, "There's too much graffiti here to add more.") return FALSE - var/message = sanitize(input(usr, "Enter a message to engrave.", "Graffiti") as null|text, trim = TRUE) + var/message = sanitize(tgui_input_text(usr, "Enter a message to engrave.", "Graffiti"), trim = TRUE) if(!message) return FALSE diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index 10f0c8c0a7..ee0ee93a41 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -182,7 +182,7 @@ switch(param) if("reason") if(!value) - value = sanitize(input(usr, "Insert the new reason for [pckey]'s ban", "New Reason", "[reason]", null) as null|text) + value = sanitize(tgui_input_text(usr, "Insert the new reason for [pckey]'s ban", "New Reason", "[reason]", null)) value = sql_sanitize_text(value) if(!value) to_chat(usr, "Cancelled") @@ -193,7 +193,7 @@ message_admins("[key_name_admin(usr)] has edited a ban for [pckey]'s reason from [reason] to [value]",1) if("duration") if(!value) - value = input(usr, "Insert the new duration (in minutes) for [pckey]'s ban", "New Duration", "[duration]", null) as null|num + value = tgui_input_number(usr, "Insert the new duration (in minutes) for [pckey]'s ban", "New Duration", "[duration]", null) if(!isnum(value) || !value) to_chat(usr, "Cancelled") return diff --git a/code/modules/admin/ToRban.dm b/code/modules/admin/ToRban.dm index 4171ea6a37..dfe4ba88e2 100644 --- a/code/modules/admin/ToRban.dm +++ b/code/modules/admin/ToRban.dm @@ -77,7 +77,7 @@ if("remove all") to_chat(src, "[TORFILE] was [fdel(TORFILE)?"":"not "]removed.") if("find") - var/input = input(src,"Please input an IP address to search for:","Find ToR ban",null) as null|text + var/input = tgui_input_text(src,"Please input an IP address to search for:","Find ToR ban",null) if(input) if(ToRban_isbanned(input)) to_chat(src, "Address is a known ToR address") diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 9bd7fb3feb..e8bfad6c0c 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -218,7 +218,6 @@ var/global/floorIsLava = 0 /datum/player_info/var/content // text content of the information /datum/player_info/var/timestamp // Because this is bloody annoying -#define PLAYER_NOTES_ENTRIES_PER_PAGE 50 /datum/admins/proc/PlayerNotes() set category = "Admin" set name = "Player Notes" @@ -235,56 +234,20 @@ var/global/floorIsLava = 0 if (!istype(src,/datum/admins)) to_chat(usr, "Error: you are not an admin!") return - var/filter = input(usr, "Filter string (case-insensitive regex)", "Player notes filter") as text|null + var/filter = tgui_input_text(usr, "Filter string (case-insensitive regex)", "Player notes filter") PlayerNotesPage(1, filter) /datum/admins/proc/PlayerNotesPage(page, filter) - var/dat = "Player notes - Apply Filter
" var/savefile/S=new("data/player_notes.sav") var/list/note_keys S >> note_keys - if(!note_keys) - dat += "No notes found." - else - dat += "
| No keys found. |
| [t] |
" - - // Display a footer to select different pages - for(var/index = 1, index <= number_pages, index++) - if(index == page) - dat += "" - dat += "[index] " - if(index == page) - dat += "" - - usr << browse(dat, "window=player_notes;size=400x400") + var/datum/tgui_module/player_notes/A = new(src) + A.ckeys = note_keys + A.tgui_interact(usr) /datum/admins/proc/player_has_info(var/key as text) @@ -303,44 +266,10 @@ var/global/floorIsLava = 0 if (!istype(src,/datum/admins)) to_chat(usr, "Error: you are not an admin!") return - var/dat = "
" - - var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav") - var/list/infos - info >> infos - if(!infos) - dat += "No information found on the given key.
" - else - var/update_file = 0 - var/i = 0 - for(var/datum/player_info/I in infos) - i += 1 - if(!I.timestamp) - I.timestamp = "Pre-4/3/2012" - update_file = 1 - if(!I.rank) - I.rank = "N/A" - update_file = 1 - dat += "[I.content] by [I.author] ([I.rank]) on [I.timestamp] " - if(I.author == usr.key || I.author == "Adminbot" || ishost(usr)) - dat += "Remove" - dat += "
" - if(update_file) info << infos - - dat += "
" - dat += "Add Comment
" - - dat += "" - usr << browse(dat, "window=adminplayerinfo;size=480x480") + var/datum/tgui_module/player_notes_info/A = new(src) + A.key = key + A.tgui_interact(usr) /datum/admins/proc/access_news_network() //MARKER @@ -688,7 +617,7 @@ var/global/floorIsLava = 0 set desc="Announce your desires to the world" if(!check_rights(0)) return - var/message = tgui_input_message(usr, "Global message to send:", "Admin Announce") + var/message = tgui_input_text(usr, "Global message to send:", "Admin Announce", multiline = TRUE, prevent_enter = TRUE) if(message) if(!check_rights(R_SERVER,0)) message = sanitize(message, 500, extra = 0) @@ -709,12 +638,12 @@ var/datum/announcement/minor/admin_min_announcer = new var/channel = tgui_input_list(usr, "Channel for message:","Channel", radiochannels) if(channel) //They picked a channel - var/sender = input(usr, "Name of sender (max 75):", "Announcement", "Announcement Computer") as null|text + var/sender = tgui_input_text(usr, "Name of sender (max 75):", "Announcement", "Announcement Computer") if(sender) //They put a sender sender = sanitize(sender, 75, extra = 0) - var/message = input(usr, "Message content (max 500):", "Contents", "This is a test of the announcement system.") as null|message - var/msgverb = input(usr, "Name of verb (Such as 'states', 'says', 'asks', etc):", "Verb", "says") as null|text //VOREStation Addition + var/message = tgui_input_text(usr, "Message content (max 500):", "Contents", "This is a test of the announcement system.", multiline = TRUE, prevent_enter = TRUE) + var/msgverb = tgui_input_text(usr, "Name of verb (Such as 'states', 'says', 'asks', etc):", "Verb", "says") if(message) //They put a message message = sanitize(message, 500, extra = 0) //VOREStation Edit Start @@ -752,7 +681,7 @@ var/datum/announcement/minor/admin_min_announcer = new The above will result in those messages playing, with a 5 second gap between each. Maximum of 20 messages allowed.") var/list/decomposed - var/message = input(usr,"See your chat box for instructions. Keep a copy elsewhere in case it is rejected when you click OK.", "Input Conversation", "") as null|message + var/message = tgui_input_text(usr,"See your chat box for instructions. Keep a copy elsewhere in case it is rejected when you click OK.", "Input Conversation", "", multiline = TRUE, prevent_enter = TRUE) if(!message) return @@ -1118,7 +1047,7 @@ var/datum/announcement/minor/admin_min_announcer = new if(!seedtype || !SSplants.seeds[seedtype]) return - var/amount = input(usr, "Amount of fruit to spawn", "Fruit Amount", 1) as null|num + var/amount = tgui_input_number(usr, "Amount of fruit to spawn", "Fruit Amount", 1) if(!isnull(amount)) var/datum/seed/S = SSplants.seeds[seedtype] S.harvest(usr,0,0,amount) @@ -1531,7 +1460,7 @@ var/datum/announcement/minor/admin_min_announcer = new var/crystals if(check_rights(R_ADMIN|R_EVENT)) - crystals = input(usr, "Amount of telecrystals for [H.ckey], currently [H.mind.tcrystals].", crystals) as null|num + crystals = tgui_input_number(usr, "Amount of telecrystals for [H.ckey], currently [H.mind.tcrystals].", crystals) if (!isnull(crystals)) H.mind.tcrystals = crystals var/msg = "[key_name(usr)] has modified [H.ckey]'s telecrystals to [crystals]." @@ -1547,7 +1476,7 @@ var/datum/announcement/minor/admin_min_announcer = new var/crystals if(check_rights(R_ADMIN|R_EVENT)) - crystals = input(usr, "Amount of telecrystals to give to [H.ckey], currently [H.mind.tcrystals].", crystals) as null|num + crystals = tgui_input_number(usr, "Amount of telecrystals to give to [H.ckey], currently [H.mind.tcrystals].", crystals) if (!isnull(crystals)) H.mind.tcrystals += crystals var/msg = "[key_name(usr)] has added [crystals] to [H.ckey]'s telecrystals." @@ -1570,7 +1499,7 @@ var/datum/announcement/minor/admin_min_announcer = new to_chat(usr, "Error: you are not an admin!") return - var/replyorigin = input(src.owner, "Please specify who the fax is coming from", "Origin") as text|null + var/replyorigin = tgui_input_text(src.owner, "Please specify who the fax is coming from", "Origin") var/obj/item/weapon/paper/admin/P = new /obj/item/weapon/paper/admin( null ) //hopefully the null loc won't cause trouble for us faxreply = P @@ -1585,7 +1514,7 @@ var/datum/announcement/minor/admin_min_announcer = new /datum/admins/var/obj/item/weapon/paper/admin/faxreply // var to hold fax replies in /datum/admins/proc/faxCallback(var/obj/item/weapon/paper/admin/P, var/obj/machinery/photocopier/faxmachine/destination) - var/customname = input(src.owner, "Pick a title for the report", "Title") as text|null + var/customname = tgui_input_text(src.owner, "Pick a title for the report", "Title") P.name = "[P.origin] - [customname]" P.desc = "This is a paper titled '" + P.name + "'." diff --git a/code/modules/admin/admin_memo.dm b/code/modules/admin/admin_memo.dm index 57f3fe3197..e305c83b5a 100644 --- a/code/modules/admin/admin_memo.dm +++ b/code/modules/admin/admin_memo.dm @@ -18,7 +18,7 @@ /client/proc/admin_memo_write() var/savefile/F = new(MEMOFILE) if(F) - var/memo = sanitize(input(src,"Type your memo\n(Leaving it blank will delete your current memo):","Write Memo",null) as null|message, extra = 0) + var/memo = sanitize(tgui_input_text(src,"Type your memo\n(Leaving it blank will delete your current memo):","Write Memo",null, multiline = TRUE, prevent_enter = TRUE), extra = 0) switch(memo) if(null) return diff --git a/code/modules/admin/admin_report.dm b/code/modules/admin/admin_report.dm index 6a6a5d241e..bc1adbcfdc 100644 --- a/code/modules/admin/admin_report.dm +++ b/code/modules/admin/admin_report.dm @@ -127,7 +127,7 @@ world/New() if(M.client) CID = M.client.computer_id - var/body = input(src.mob, "Describe in detail what you're reporting [M] for", "Report") as null|text + var/body = tgui_input_text(src.mob, "Describe in detail what you're reporting [M] for", "Report") if(!body) return @@ -174,7 +174,7 @@ world/New() if(!found) to_chat(src, "* An error occured, sorry.") - var/body = input(src.mob, "Enter a body for the news", "Body") as null|message + var/body = tgui_input_text(src.mob, "Enter a body for the news", "Body", multiline = TRUE, prevent_enter = TRUE) if(!body) return found.body = body diff --git a/code/modules/admin/admin_verb_lists_vr.dm b/code/modules/admin/admin_verb_lists_vr.dm index 7ab8b4bf47..8f9bdb4eb3 100644 --- a/code/modules/admin/admin_verb_lists_vr.dm +++ b/code/modules/admin/admin_verb_lists_vr.dm @@ -112,7 +112,7 @@ var/list/admin_verbs_admin = list( /client/proc/change_human_appearance_self, // Allows the human-based mob itself change its basic appearance , /client/proc/change_security_level, /client/proc/view_chemical_reaction_logs, - /client/proc/makePAI, + /client/proc/makepAI, /client/proc/toggle_debug_logs, /client/proc/toggle_attack_logs, /datum/admins/proc/paralyze_mob, @@ -521,7 +521,7 @@ var/list/admin_verbs_event_manager = list( /client/proc/change_human_appearance_admin, // Allows an admin to change the basic appearance of human-based mobs , /client/proc/change_human_appearance_self, // Allows the human-based mob itself change its basic appearance , /client/proc/change_security_level, - /client/proc/makePAI, + /client/proc/makepAI, /client/proc/toggle_debug_logs, /client/proc/toggle_attack_logs, /datum/admins/proc/paralyze_mob, diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index e9d63621b0..81a3e79576 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -35,11 +35,24 @@ set category = "Admin" set name = "Aghost" if(!holder) return + + var/build_mode + if(src.buildmode) + build_mode = tgui_alert(src, "You appear to be currently in buildmode. Do you want to re-enter buildmode after aghosting?", "Buildmode", list("Yes", "No")) + if(build_mode != "Yes") + to_chat(src, "Will not re-enter buildmode after switch.") + if(istype(mob,/mob/observer/dead)) //re-enter var/mob/observer/dead/ghost = mob if(ghost.can_reenter_corpse) - ghost.reenter_corpse() + if(build_mode) + togglebuildmode(mob) + ghost.reenter_corpse() + if(build_mode == "Yes") + togglebuildmode(mob) + else + ghost.reenter_corpse() else to_chat(ghost, "Error: Aghost: Can't reenter corpse.") return @@ -51,8 +64,16 @@ else //ghostize var/mob/body = mob - var/mob/observer/dead/ghost = body.ghostize(1) - ghost.admin_ghosted = 1 + var/mob/observer/dead/ghost + if(build_mode) + togglebuildmode(body) + ghost = body.ghostize(1) + ghost.admin_ghosted = 1 + if(build_mode == "Yes") + togglebuildmode(ghost) + else + ghost = body.ghostize(1) + ghost.admin_ghosted = 1 if(body) body.teleop = ghost if(!body.key) @@ -179,7 +200,7 @@ if(istype(src.mob, /mob/new_player)) mob.name = capitalize(ckey) else - var/new_key = ckeyEx(input(usr, "Enter your desired display name.", "Fake Key", key) as text|null) + var/new_key = ckeyEx(tgui_input_text(usr, "Enter your desired display name.", "Fake Key", key)) if(!new_key) return if(length(new_key) >= 26) @@ -253,10 +274,10 @@ if("Big Bomb") explosion(epicenter, 3, 5, 7, 5) if("Custom Bomb") - var/devastation_range = input(usr, "Devastation range (in tiles):") as num - var/heavy_impact_range = input(usr, "Heavy impact range (in tiles):") as num - var/light_impact_range = input(usr, "Light impact range (in tiles):") as num - var/flash_range = input(usr, "Flash range (in tiles):") as num + var/devastation_range = tgui_input_number(usr, "Devastation range (in tiles):") + var/heavy_impact_range = tgui_input_number(usr, "Heavy impact range (in tiles):") + var/light_impact_range = tgui_input_number(usr, "Light impact range (in tiles):") + var/flash_range = tgui_input_number(usr, "Flash range (in tiles):") explosion(epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range) message_admins("[ckey] creating an admin explosion at [epicenter.loc].") feedback_add_details("admin_verb","DB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -276,7 +297,7 @@ if ("Badmin") severity = 99 D.makerandom(severity) - D.infectionchance = input(usr, "How virulent is this disease? (1-100)", "Give Disease", D.infectionchance) as num + D.infectionchance = tgui_input_number(usr, "How virulent is this disease? (1-100)", "Give Disease", D.infectionchance) if(istype(T,/mob/living/carbon/human)) var/mob/living/carbon/human/H = T @@ -307,7 +328,7 @@ var/new_modifier_type = tgui_input_list(usr, "What modifier should we add to [L]?", "Modifier Type", possible_modifiers) if(!new_modifier_type) return - var/duration = input(usr, "How long should the new modifier last, in seconds. To make it last forever, write '0'.", "Modifier Duration") as num + var/duration = tgui_input_number(usr, "How long should the new modifier last, in seconds. To make it last forever, write '0'.", "Modifier Duration") if(duration == 0) duration = null else @@ -321,7 +342,7 @@ set name = "Make Sound" set desc = "Display a message to everyone who can hear the target" if(O) - var/message = sanitize(input(usr, "What do you want the message to be?", "Make Sound") as text|null) + var/message = sanitize(tgui_input_text(usr, "What do you want the message to be?", "Make Sound")) if(!message) return O.audible_message(message) @@ -405,7 +426,7 @@ var/mob/living/silicon/S = tgui_input_list(usr, "Select silicon.", "Rename Silicon.", silicon_mob_list) if(!S) return - var/new_name = sanitizeSafe(input(src, "Enter new name. Leave blank or as is to cancel.", "[S.real_name] - Enter new silicon name", S.real_name)) + var/new_name = sanitizeSafe(tgui_input_text(src, "Enter new name. Leave blank or as is to cancel.", "[S.real_name] - Enter new silicon name", S.real_name)) if(new_name && new_name != S.real_name) log_and_message_admins("has renamed the silicon '[S.real_name]' to '[new_name]'") S.SetName(new_name) diff --git a/code/modules/admin/admin_verbs_vr.dm b/code/modules/admin/admin_verbs_vr.dm index 6d92fde40b..994d12a4ea 100644 --- a/code/modules/admin/admin_verbs_vr.dm +++ b/code/modules/admin/admin_verbs_vr.dm @@ -39,9 +39,9 @@ if(isturf(orbiter)) to_chat(usr, "The orbiter cannot be a turf. It can only be used as a center.") return - var/distance = input(usr, "How large will their orbit radius be? (In pixels. 32 is 'near around a character)", "Orbit Radius", 32) as num|null - var/speed = input(usr, "How fast will they orbit (negative numbers spin clockwise)", "Orbit Speed", 20) as num|null - var/segments = input(usr, "How many segments will they have in their orbit? (3 is a triangle, 36 is a circle, etc)", "Orbit Segments", 36) as num|null + var/distance = tgui_input_number(usr, "How large will their orbit radius be? (In pixels. 32 is 'near around a character)", "Orbit Radius", 32) + var/speed = tgui_input_number(usr, "How fast will they orbit (negative numbers spin clockwise)", "Orbit Speed", 20) + var/segments = tgui_input_number(usr, "How many segments will they have in their orbit? (3 is a triangle, 36 is a circle, etc)", "Orbit Segments", 36) var/clock = FALSE if(!distance) distance = 32 diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm index 4a0d3c496f..58e9012277 100644 --- a/code/modules/admin/callproc/callproc.dm +++ b/code/modules/admin/callproc/callproc.dm @@ -21,7 +21,7 @@ target = null targetselected = 0 - var/procname = input(usr, "Proc path, eg: /proc/fake_blood","Path:", null) as text|null + var/procname = tgui_input_text(usr, "Proc path, eg: /proc/fake_blood","Path:", null) if(!procname) return @@ -136,7 +136,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) if(!check_rights(R_DEBUG)) return - var/procname = input(usr, "Proc name, eg: fake_blood","Proc:", null) as text|null + var/procname = tgui_input_text(usr, "Proc name, eg: fake_blood","Proc:", null) if(!procname) return if(!hascall(A,procname)) @@ -161,7 +161,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) to_chat(usr, .) /client/proc/get_callproc_args() - var/argnum = input(usr, "Number of arguments","Number:",0) as num|null + var/argnum = tgui_input_number(usr, "Number of arguments","Number:",0) if(isnull(argnum)) return null //Cancel diff --git a/code/modules/admin/news.dm b/code/modules/admin/news.dm index 179391987c..c0812b818e 100644 --- a/code/modules/admin/news.dm +++ b/code/modules/admin/news.dm @@ -22,13 +22,13 @@ if(F) var/title = F["title"] var/body = html2paper_markup(F["body"]) - var/new_title = sanitize(input(src,"Write a good title for the news update. Note: HTML is NOT supported.","Write News", title) as null|text, extra = 0) + var/new_title = sanitize(tgui_input_text(src,"Write a good title for the news update. Note: HTML is NOT supported.","Write News", title), extra = 0) if(!new_title) return - var/new_body = sanitize(input(src,"Write the body of the news update here. Note: HTML is NOT supported, however paper markup is supported. \n\ + var/new_body = sanitize(tgui_input_text(src,"Write the body of the news update here. Note: HTML is NOT supported, however paper markup is supported. \n\ Hitting enter will automatically add a line break. \n\ Valid markup includes: \[b\], \[i\], \[u\], \[large\], \[h1\], \[h2\], \[h3\]\ \[*\], \[hr\], \[small\], \[list\], \[table\], \[grid\], \ - \[row\], \[cell\], \[logo\], \[sglogo\].","Write News", body) as null|message, extra = 0) + \[row\], \[cell\], \[logo\], \[sglogo\].","Write News", body, multiline = TRUE, prevent_enter = TRUE), extra = 0) new_body = paper_markup2html(new_body) diff --git a/code/modules/admin/secrets/admin_secrets/jump_shuttle.dm b/code/modules/admin/secrets/admin_secrets/jump_shuttle.dm index 594b3c34d2..942ff60d77 100644 --- a/code/modules/admin/secrets/admin_secrets/jump_shuttle.dm +++ b/code/modules/admin/secrets/admin_secrets/jump_shuttle.dm @@ -26,7 +26,7 @@ var/transition_area = tgui_input_list(user, "Which area is the transition area? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)", "Area Choice", area_choices) if (!transition_area) return - var/move_duration = input(user, "How many seconds will this jump take?") as num + var/move_duration = tgui_input_number(user, "How many seconds will this jump take?") S.long_jump(area_choices[origin_area], area_choices[destination_area], area_choices[transition_area], move_duration) message_admins("[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle", 1) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 40dc93a616..d77d72bfa1 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1,2085 +1,2074 @@ -/datum/admins/Topic(href, href_list) - ..() - - if(usr.client != src.owner || !check_rights(0)) - log_admin("[key_name(usr)] tried to use the admin panel without authorization.") - message_admins("[usr.key] has attempted to override the admin panel!") - return - - if(ticker.mode && ticker.mode.check_antagonists_topic(href, href_list)) - check_antagonists() - return - - if(href_list["ahelp"]) - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) - return - - var/ahelp_ref = href_list["ahelp"] - var/datum/admin_help/AH = locate(ahelp_ref) - if(AH) - AH.Action(href_list["ahelp_action"]) - else - to_chat(usr, "Ticket [ahelp_ref] has been deleted!") - - else if(href_list["ahelp_tickets"]) - GLOB.ahelp_tickets.BrowseTickets(text2num(href_list["ahelp_tickets"])) - - if(href_list["dbsearchckey"] || href_list["dbsearchadmin"]) - - var/adminckey = href_list["dbsearchadmin"] - var/playerckey = href_list["dbsearchckey"] - var/playerip = href_list["dbsearchip"] - var/playercid = href_list["dbsearchcid"] - var/dbbantype = text2num(href_list["dbsearchbantype"]) - var/match = 0 - - if("dbmatch" in href_list) - match = 1 - - DB_ban_panel(playerckey, adminckey, playerip, playercid, dbbantype, match) - return - - else if(href_list["dbbanedit"]) - var/banedit = href_list["dbbanedit"] - var/banid = text2num(href_list["dbbanid"]) - if(!banedit || !banid) - return - - DB_ban_edit(banid, banedit) - return - - else if(href_list["dbbanaddtype"]) - - var/bantype = text2num(href_list["dbbanaddtype"]) - var/banckey = href_list["dbbanaddckey"] - var/banip = href_list["dbbanaddip"] - var/bancid = href_list["dbbanaddcid"] - var/banduration = text2num(href_list["dbbaddduration"]) - var/banjob = href_list["dbbanaddjob"] - var/banreason = href_list["dbbanreason"] - - banckey = ckey(banckey) - - switch(bantype) - if(BANTYPE_PERMA) - if(!banckey || !banreason) - to_chat(usr, "Not enough parameters (Requires ckey and reason)") - return - banduration = null - banjob = null - if(BANTYPE_TEMP) - if(!banckey || !banreason || !banduration) - to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") - return - banjob = null - if(BANTYPE_JOB_PERMA) - if(!banckey || !banreason || !banjob) - to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") - return - banduration = null - if(BANTYPE_JOB_TEMP) - if(!banckey || !banreason || !banjob || !banduration) - to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") - return - - var/mob/playermob - - for(var/mob/M in player_list) - if(M.ckey == banckey) - playermob = M - break - - - banreason = "(MANUAL BAN) "+banreason - - if(!playermob) - if(banip) - banreason = "[banreason] (CUSTOM IP)" - if(bancid) - banreason = "[banreason] (CUSTOM CID)" - else - message_admins("Ban process: A mob matching [playermob.ckey] was found at location [playermob.x], [playermob.y], [playermob.z]. Custom ip and computer id fields replaced with the ip and computer id from the located mob") - notes_add(banckey,banreason,usr) - - DB_ban_record(bantype, playermob, banduration, banreason, banjob, null, banckey, banip, bancid ) - - else if(href_list["editrights"]) - if(!check_rights(R_PERMISSIONS)) - message_admins("[key_name_admin(usr)] attempted to edit the admin permissions without sufficient rights.") - log_admin("[key_name(usr)] attempted to edit the admin permissions without sufficient rights.") - return - - var/adm_ckey - - var/task = href_list["editrights"] - if(task == "add") - var/new_ckey = ckey(input(usr,"New admin's ckey","Admin ckey", null) as text|null) - if(!new_ckey) return - if(new_ckey in admin_datums) - to_chat(usr, "Error: Topic 'editrights': [new_ckey] is already an admin") - return - adm_ckey = new_ckey - task = "rank" - else if(task != "show") - adm_ckey = ckey(href_list["ckey"]) - if(!adm_ckey) - to_chat(usr, "Error: Topic 'editrights': No valid ckey") - return - - var/datum/admins/D = admin_datums[adm_ckey] - - if(task == "remove") - if(tgui_alert(usr, "Are you sure you want to remove [adm_ckey]?","Message",list("Yes","Cancel")) == "Yes") - if(!D) return - admin_datums -= adm_ckey - D.disassociate() - - message_admins("[key_name_admin(usr)] removed [adm_ckey] from the admins list") - log_admin("[key_name(usr)] removed [adm_ckey] from the admins list") - log_admin_rank_modification(adm_ckey, "Removed") - - else if(task == "rank") - var/new_rank - if(admin_ranks.len) - new_rank = tgui_input_list(usr, "Please select a rank", "New rank", (admin_ranks|"*New Rank*")) - else - new_rank = tgui_input_list(usr, "Please select a rank", "New rank", list("Game Master","Game Admin", "Trial Admin", "Admin Observer","*New Rank*")) - - var/rights = 0 - if(D) - rights = D.rights - switch(new_rank) - if(null,"") return - if("*New Rank*") - new_rank = input(usr, "Please input a new rank", "New custom rank", null, null) as null|text - if(config.admin_legacy_system) - new_rank = ckeyEx(new_rank) - if(!new_rank) - to_chat(usr, "Error: Topic 'editrights': Invalid rank") - return - if(config.admin_legacy_system) - if(admin_ranks.len) - if(new_rank in admin_ranks) - rights = admin_ranks[new_rank] //we typed a rank which already exists, use its rights - else - admin_ranks[new_rank] = 0 //add the new rank to admin_ranks - else - if(config.admin_legacy_system) - new_rank = ckeyEx(new_rank) - rights = admin_ranks[new_rank] //we input an existing rank, use its rights - - if(D) - D.disassociate() //remove adminverbs and unlink from client - D.rank = new_rank //update the rank - D.rights = rights //update the rights based on admin_ranks (default: 0) - else - D = new /datum/admins(new_rank, rights, adm_ckey) - - var/client/C = GLOB.directory[adm_ckey] //find the client with the specified ckey (if they are logged in) - D.associate(C) //link up with the client and add verbs - - message_admins("[key_name_admin(usr)] edited the admin rank of [adm_ckey] to [new_rank]") - log_admin("[key_name(usr)] edited the admin rank of [adm_ckey] to [new_rank]") - log_admin_rank_modification(adm_ckey, new_rank) - - else if(task == "permissions") - if(!D) return - var/list/permissionlist = list() - for(var/i=1, i<=R_MAXPERMISSION, i<<=1) //that <<= is shorthand for i = i << 1. Which is a left bitshift - permissionlist[rights2text(i)] = i - var/new_permission = tgui_input_list(usr, "Select a permission to turn on/off", "Permission toggle", permissionlist) - if(!new_permission) return - D.rights ^= permissionlist[new_permission] - - message_admins("[key_name_admin(usr)] toggled the [new_permission] permission of [adm_ckey]") - log_admin("[key_name(usr)] toggled the [new_permission] permission of [adm_ckey]") - log_admin_permission_modification(adm_ckey, permissionlist[new_permission]) - - edit_admin_permissions() - - else if(href_list["call_shuttle"]) - if(!check_rights(R_ADMIN|R_EVENT)) return - - if( ticker.mode.name == "blob" ) - tgui_alert_async(usr, "You can't call the shuttle during blob!") - return - - switch(href_list["call_shuttle"]) - if("1") - if ((!( ticker ) || !emergency_shuttle.location())) - return - if (emergency_shuttle.can_call()) - emergency_shuttle.call_evac() - log_admin("[key_name(usr)] called the Emergency Shuttle") - message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.", 1) - - if("2") - if (!( ticker ) || !emergency_shuttle.location()) - return - if (emergency_shuttle.can_call()) - emergency_shuttle.call_evac() - log_admin("[key_name(usr)] called the Emergency Shuttle") - message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.", 1) - - else if (emergency_shuttle.can_recall()) - emergency_shuttle.recall() - log_admin("[key_name(usr)] sent the Emergency Shuttle back") - message_admins("[key_name_admin(usr)] sent the Emergency Shuttle back.", 1) - - href_list["secretsadmin"] = "check_antagonist" - - else if(href_list["edit_shuttle_time"]) - if(!check_rights(R_SERVER)) return - - if (emergency_shuttle.wait_for_launch) - var/new_time_left = input(usr, "Enter new shuttle launch countdown (seconds):","Edit Shuttle Launch Time", emergency_shuttle.estimate_launch_time() ) as num - - emergency_shuttle.launch_time = world.time + new_time_left*10 - - log_admin("[key_name(usr)] edited the Emergency Shuttle's launch time to [new_time_left]") - message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's launch time to [new_time_left*10]", 1) - else if (emergency_shuttle.shuttle.has_arrive_time()) - - var/new_time_left = input(usr, "Enter new shuttle arrival time (seconds):","Edit Shuttle Arrival Time", emergency_shuttle.estimate_arrival_time() ) as num - emergency_shuttle.shuttle.arrive_time = world.time + new_time_left*10 - - log_admin("[key_name(usr)] edited the Emergency Shuttle's arrival time to [new_time_left]") - message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's arrival time to [new_time_left*10]", 1) - else - tgui_alert_async(usr, "The shuttle is neither counting down to launch nor is it in transit. Please try again when it is.") - - href_list["secretsadmin"] = "check_antagonist" - - else if(href_list["delay_round_end"]) - if(!check_rights(R_SERVER)) return //VOREStation Edit - - ticker.delay_end = !ticker.delay_end - log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].") - message_admins("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1) - href_list["secretsadmin"] = "check_antagonist" - - else if(href_list["simplemake"]) - - if(!check_rights(R_SPAWN)) return - - var/mob/M = locate(href_list["mob"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") - return - - var/delmob = 0 - switch(tgui_alert(usr, "Delete old mob?","Message",list("Yes","No","Cancel"))) - if("Cancel") return - if("Yes") delmob = 1 - - log_admin("[key_name(usr)] has used rudimentary transformation on [key_name(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]") - message_admins("[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]", 1) - - switch(href_list["simplemake"]) - if("observer") M.change_mob_type( /mob/observer/dead , null, null, delmob ) - if("larva") M.change_mob_type( /mob/living/carbon/alien/larva , null, null, delmob ) - if("nymph") M.change_mob_type( /mob/living/carbon/alien/diona , null, null, delmob ) - if("human") M.change_mob_type( /mob/living/carbon/human , null, null, delmob, href_list["species"]) - if("slime") M.change_mob_type( /mob/living/simple_mob/slime/xenobio , null, null, delmob ) - if("monkey") M.change_mob_type( /mob/living/carbon/human/monkey , null, null, delmob ) - if("robot") M.change_mob_type( /mob/living/silicon/robot , null, null, delmob ) - if("cat") M.change_mob_type( /mob/living/simple_mob/animal/passive/cat , null, null, delmob ) - if("runtime") M.change_mob_type( /mob/living/simple_mob/animal/passive/cat/runtime , null, null, delmob ) - if("corgi") M.change_mob_type( /mob/living/simple_mob/animal/passive/dog/corgi , null, null, delmob ) - if("ian") M.change_mob_type( /mob/living/simple_mob/animal/passive/dog/corgi/Ian , null, null, delmob ) - if("crab") M.change_mob_type( /mob/living/simple_mob/animal/passive/crab , null, null, delmob ) - if("coffee") M.change_mob_type( /mob/living/simple_mob/animal/passive/crab/Coffee , null, null, delmob ) - if("parrot") M.change_mob_type( /mob/living/simple_mob/animal/passive/bird/parrot , null, null, delmob ) - if("polyparrot") M.change_mob_type( /mob/living/simple_mob/animal/passive/bird/parrot/poly , null, null, delmob ) - if("constructarmoured") M.change_mob_type( /mob/living/simple_mob/construct/juggernaut , null, null, delmob ) - if("constructbuilder") M.change_mob_type( /mob/living/simple_mob/construct/artificer , null, null, delmob ) - if("constructwraith") M.change_mob_type( /mob/living/simple_mob/construct/wraith , null, null, delmob ) - if("shade") M.change_mob_type( /mob/living/simple_mob/construct/shade , null, null, delmob ) - - - /////////////////////////////////////new ban stuff - else if(href_list["unbanf"]) - if(!check_rights(R_BAN)) return - - var/banfolder = href_list["unbanf"] - Banlist.cd = "/base/[banfolder]" - var/key = Banlist["key"] - if(tgui_alert(usr, "Are you sure you want to unban [key]?", "Confirmation", list("Yes", "No")) == "Yes") - if(RemoveBan(banfolder)) - unbanpanel() - else - tgui_alert_async(usr, "This ban has already been lifted / does not exist.", "Error") - unbanpanel() - - else if(href_list["warn"]) - usr.client.warn(href_list["warn"]) - - else if(href_list["unbane"]) - if(!check_rights(R_BAN)) return - - UpdateTime() - var/reason - - var/banfolder = href_list["unbane"] - Banlist.cd = "/base/[banfolder]" - var/reason2 = Banlist["reason"] - var/temp = Banlist["temp"] - - var/minutes = Banlist["minutes"] - - var/banned_key = Banlist["key"] - Banlist.cd = "/base" - - var/duration - - switch(tgui_alert(usr, "Temporary Ban?","Temporary Ban",list("Yes","No"))) - if("Yes") - temp = 1 - var/mins = 0 - if(minutes > CMinutes) - mins = minutes - CMinutes - mins = input(usr,"How long (in minutes)? (Default: 1440)","Ban time",mins ? mins : 1440) as num|null - if(!mins) return - mins = min(525599,mins) - minutes = CMinutes + mins - duration = GetExp(minutes) - reason = sanitize(input(usr,"Reason?","reason",reason2) as text|null) - if(!reason) return - if("No") - temp = 0 - duration = "Perma" - reason = sanitize(input(usr,"Reason?","reason",reason2) as text|null) - if(!reason) return - - log_admin("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]") - ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]") - message_admins("[key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]", 1) - Banlist.cd = "/base/[banfolder]" - Banlist["reason"] << reason - Banlist["temp"] << temp - Banlist["minutes"] << minutes - Banlist["bannedby"] << usr.ckey - Banlist.cd = "/base" - feedback_inc("ban_edit",1) - unbanpanel() - - /////////////////////////////////////new ban stuff - - else if(href_list["jobban2"]) -// if(!check_rights(R_BAN)) return - - var/mob/M = locate(href_list["jobban2"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") - return - - if(!M.ckey) //sanity - to_chat(usr, "This mob has no ckey") - return - if(!job_master) - to_chat(usr, "Job Master has not been setup!") - return - - var/dat = "" - var/header = "
| Command Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " - else - jobs += "[replacetext(job.title, " ", " ")] | " - - if(++counter >= 6) //So things dont get squiiiiished! - jobs += "
| Security Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " - else - jobs += "[replacetext(job.title, " ", " ")] | " - - if(++counter >= 5) //So things dont get squiiiiished! - jobs += "
| Engineering Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " - else - jobs += "[replacetext(job.title, " ", " ")] | " - - if(++counter >= 5) //So things dont get squiiiiished! - jobs += "
| Cargo Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " - else - jobs += "[replacetext(job.title, " ", " ")] | " - - if(++counter >= 5) //So things dont get squiiiiished! - jobs += "
| Medical Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " - else - jobs += "[replacetext(job.title, " ", " ")] | " - - if(++counter >= 5) //So things dont get squiiiiished! - jobs += "
| Science Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " - else - jobs += "[replacetext(job.title, " ", " ")] | " - - if(++counter >= 5) //So things dont get squiiiiished! - jobs += "
| Exploration Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " - else - jobs += "[replacetext(job.title, " ", " ")] | " - - if(++counter >= 5) //So things dont get squiiiiished! - jobs += "
| Offmap Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " - else - jobs += "[replacetext(job.title, " ", " ")] | " - - if(++counter >= 5) //So things dont get squiiiiished! - jobs += "
| Civilian Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " - else - jobs += "[replacetext(job.title, " ", " ")] | " - - if(++counter >= 5) //So things dont get squiiiiished! - jobs += "
| Internal Affairs Agent | " - else - jobs += "Internal Affairs Agent | " - - jobs += "
| Synthetic Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " - else - jobs += "[replacetext(job.title, " ", " ")] | " - - if(++counter >= 5) //So things dont get squiiiiished! - jobs += "
| Antagonist Positions | |
|---|---|
| [replacetext("[antag.role_text]", " ", " ")] | " - else - jobs += "[replacetext("[antag.role_text]", " ", " ")] | " - - if(++counter >= 5) //So things dont get squiiiiished! - jobs += "
| Other Roles | |
|---|---|
| [entry] | " - else - jobs += "[entry] | " - - if(++counter >= 5) //So things dont get squiiiiished! - jobs += "
"} - for(var/mode in config.modes) - dat += {"[config.mode_names[mode]]
"} - dat += {"Secret
"} - dat += {"Random
"} - dat += {"Now: [master_mode]"} - usr << browse(dat, "window=c_mode") - - else if(href_list["f_secret"]) - if(!check_rights(R_ADMIN|R_EVENT)) return - - if(ticker && ticker.mode) - return tgui_alert_async(usr, "The game has already started.") - if(master_mode != "secret") - return tgui_alert_async(usr, "The game mode has to be secret!") - var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.
"} - for(var/mode in config.modes) - dat += {"[config.mode_names[mode]]
"} - dat += {"Random (default)
"} - dat += {"Now: [secret_force_mode]"} - usr << browse(dat, "window=f_secret") - - else if(href_list["c_mode2"]) - if(!check_rights(R_ADMIN|R_SERVER|R_EVENT)) return - - if (ticker && ticker.mode) - return tgui_alert_async(usr, "The game has already started.") - master_mode = href_list["c_mode2"] - log_admin("[key_name(usr)] set the mode as [config.mode_names[master_mode]].") - message_admins("[key_name_admin(usr)] set the mode as [config.mode_names[master_mode]].", 1) - to_world("The mode is now: [config.mode_names[master_mode]]") - Game() // updates the main game menu - world.save_mode(master_mode) - .(href, list("c_mode"=1)) - - else if(href_list["f_secret2"]) - if(!check_rights(R_ADMIN|R_SERVER|R_EVENT)) return - - if(ticker && ticker.mode) - return tgui_alert_async(usr, "The game has already started.") - if(master_mode != "secret") - return tgui_alert_async(usr, "The game mode has to be secret!") - secret_force_mode = href_list["f_secret2"] - log_admin("[key_name(usr)] set the forced secret mode as [secret_force_mode].") - message_admins("[key_name_admin(usr)] set the forced secret mode as [secret_force_mode].", 1) - Game() // updates the main game menu - .(href, list("f_secret"=1)) - - else if(href_list["monkeyone"]) - if(!check_rights(R_SPAWN)) return - - var/mob/living/carbon/human/H = locate(href_list["monkeyone"]) - if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return - - log_admin("[key_name(usr)] attempting to monkeyize [key_name(H)]") - message_admins("[key_name_admin(usr)] attempting to monkeyize [key_name_admin(H)]", 1) - H.monkeyize() - - else if(href_list["corgione"]) - if(!check_rights(R_SPAWN)) return - - var/mob/living/carbon/human/H = locate(href_list["corgione"]) - if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return - - log_admin("[key_name(usr)] attempting to corgize [key_name(H)]") - message_admins("[key_name_admin(usr)] attempting to corgize [key_name_admin(H)]", 1) - H.corgize() - - else if(href_list["forcespeech"]) - if(!check_rights(R_FUN)) return - - var/mob/M = locate(href_list["forcespeech"]) - if(!ismob(M)) - to_chat(usr, "this can only be used on instances of type /mob") - - var/speech = input(usr, "What will [key_name(M)] say?.", "Force speech", "") // Don't need to sanitize, since it does that in say(), we also trust our admins. - if(!speech) return - M.say(speech) - speech = sanitize(speech) // Nah, we don't trust them - log_admin("[key_name(usr)] forced [key_name(M)] to say: [speech]") - message_admins("[key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]") - - else if(href_list["sendtoprison"]) - if(!check_rights(R_ADMIN)) return - - if(tgui_alert(usr, "Send to admin prison for the round?", "Message", list("Yes", "No")) != "Yes") - return - - var/mob/M = locate(href_list["sendtoprison"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") - return - if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") - return - - var/turf/prison_cell = pick(prisonwarp) - if(!prison_cell) return - - var/obj/structure/closet/secure_closet/brig/locker = new /obj/structure/closet/secure_closet/brig(prison_cell) - locker.opened = 0 - locker.locked = 1 - - //strip their stuff and stick it in the crate - for(var/obj/item/I in M) - M.drop_from_inventory(I, locker) - - //so they black out before warping - M.Paralyse(5) - sleep(5) - if(!M) return - - M.loc = prison_cell - if(istype(M, /mob/living/carbon/human)) - var/mob/living/carbon/human/prisoner = M - prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/prison(prisoner), slot_w_uniform) - prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes) - - to_chat(M, "You have been sent to the prison station!") - log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") - message_admins("[key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) - - else if(href_list["sendbacktolobby"]) - if(!check_rights(R_ADMIN)) - return - - var/mob/M = locate(href_list["sendbacktolobby"]) - if(!isobserver(M)) - to_chat(usr, "You can only send ghost players back to the Lobby.") - return - - if(!M.client) - to_chat(usr, "[M] doesn't seem to have an active client.") - return - - if(tgui_alert(usr, "Send [key_name(M)] back to Lobby?", "Message", list("Yes", "No")) != "Yes") - return - - log_admin("[key_name(usr)] has sent [key_name(M)] back to the Lobby.") - message_admins("[key_name(usr)] has sent [key_name(M)] back to the Lobby.") - - var/mob/new_player/NP = new() - NP.ckey = M.ckey - qdel(M) - - else if(href_list["tdome1"]) - if(!check_rights(R_FUN)) return - - if(tgui_alert(usr, "Confirm?", "Message", list("Yes", "No")) != "Yes") - return - - var/mob/M = locate(href_list["tdome1"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") - return - if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") - return - - for(var/obj/item/I in M) - M.drop_from_inventory(I) - - M.Paralyse(5) - sleep(5) - M.loc = pick(tdome1) - spawn(50) - to_chat(M, "You have been sent to the Thunderdome.") - log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 1)") - message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)", 1) - - else if(href_list["tdome2"]) - if(!check_rights(R_FUN)) return - - if(tgui_alert(usr, "Confirm?", "Message", list("Yes", "No")) != "Yes") - return - - var/mob/M = locate(href_list["tdome2"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") - return - if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") - return - - for(var/obj/item/I in M) - M.drop_from_inventory(I) - - M.Paralyse(5) - sleep(5) - M.loc = pick(tdome2) - spawn(50) - to_chat(M, "You have been sent to the Thunderdome.") - log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 2)") - message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)", 1) - - else if(href_list["tdomeadmin"]) - if(!check_rights(R_FUN)) return - - if(tgui_alert(usr, "Confirm?", "Message", list("Yes", "No")) != "Yes") - return - - var/mob/M = locate(href_list["tdomeadmin"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") - return - if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") - return - - M.Paralyse(5) - sleep(5) - M.loc = pick(tdomeadmin) - spawn(50) - to_chat(M, "You have been sent to the Thunderdome.") - log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Admin.)") - message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)", 1) - - else if(href_list["tdomeobserve"]) - if(!check_rights(R_FUN)) return - - if(tgui_alert(usr, "Confirm?", "Message", list("Yes", "No")) != "Yes") - return - - var/mob/M = locate(href_list["tdomeobserve"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") - return - if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") - return - - for(var/obj/item/I in M) - M.drop_from_inventory(I) - - if(istype(M, /mob/living/carbon/human)) - var/mob/living/carbon/human/observer = M - observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(observer), slot_w_uniform) - observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(observer), slot_shoes) - M.Paralyse(5) - sleep(5) - M.loc = pick(tdomeobserve) - spawn(50) - to_chat(M, "You have been sent to the Thunderdome.") - log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)") - message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1) - - else if(href_list["revive"]) - if(!check_rights(R_REJUVINATE)) return - - var/mob/living/L = locate(href_list["revive"]) - if(!istype(L)) - to_chat(usr, "This can only be used on instances of type /mob/living") - return - - if(config.allow_admin_rev) - L.revive() - message_admins("Admin [key_name_admin(usr)] healed / revived [key_name_admin(L)]!", 1) - log_admin("[key_name(usr)] healed / Rrvived [key_name(L)]") - else - to_chat(usr, "Admin Rejuvinates have been disabled") - - else if(href_list["makeai"]) - if(!check_rights(R_SPAWN)) return - - var/mob/living/carbon/human/H = locate(href_list["makeai"]) - if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return - - message_admins("Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!", 1) - log_admin("[key_name(usr)] AIized [key_name(H)]") - H.AIize() - - else if(href_list["makealien"]) - if(!check_rights(R_SPAWN)) return - - var/mob/living/carbon/human/H = locate(href_list["makealien"]) - if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return - - usr.client.cmd_admin_alienize(H) - - else if(href_list["makerobot"]) - if(!check_rights(R_SPAWN)) return - - var/mob/living/carbon/human/H = locate(href_list["makerobot"]) - if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return - - usr.client.cmd_admin_robotize(H) - - else if(href_list["makeanimal"]) - if(!check_rights(R_SPAWN)) return - - var/mob/M = locate(href_list["makeanimal"]) - if(istype(M, /mob/new_player)) - to_chat(usr, "This cannot be used on instances of type /mob/new_player") - return - - usr.client.cmd_admin_animalize(M) - - else if(href_list["respawn"]) - if(!check_rights(R_SPAWN)) - return - - var/client/C = locate(href_list["respawn"]) - if(!istype(C)) - return - usr.client.respawn_character_proper(C) - - else if(href_list["togmutate"]) - if(!check_rights(R_SPAWN)) return - - var/mob/living/carbon/human/H = locate(href_list["togmutate"]) - if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return - var/block=text2num(href_list["block"]) - usr.client.cmd_admin_toggle_block(H,block) - show_player_panel(H) - - else if(href_list["adminplayeropts"]) - var/mob/M = locate(href_list["adminplayeropts"]) - show_player_panel(M) - - else if(href_list["adminplayerobservejump"]) - if(!check_rights(R_MOD|R_ADMIN|R_SERVER)) return //VOREStation Edit - - var/mob/M = locate(href_list["adminplayerobservejump"]) - - var/client/C = usr.client - if(!isobserver(usr)) C.admin_ghost() - sleep(2) - C.do_jumptomob(M) - - else if(href_list["adminplayerobservefollow"]) - if(!check_rights(R_MOD|R_ADMIN|R_SERVER)) //VOREStation Edit - return - - var/mob/M = locate(href_list["adminplayerobservefollow"]) - - var/client/C = usr.client - if(!isobserver(usr)) C.admin_ghost() - var/mob/observer/dead/G = C.mob - sleep(2) - G.ManualFollow(M) - - else if(href_list["check_antagonist"]) - check_antagonists() - - else if(href_list["take_question"]) - - var/mob/M = locate(href_list["take_question"]) - if(ismob(M)) - var/take_msg = "ADMINHELP: [key_name(usr.client)] is attending to [key_name(M)]'s adminhelp, please don't dogpile them." - for(var/client/X in GLOB.admins) - if((R_ADMIN|R_MOD|R_SERVER) & X.holder.rights) //VOREStation Edit - to_chat(X, take_msg) - to_chat(M, "Your adminhelp is being attended to by [usr.client]. Thanks for your patience!") - // VoreStation Edit Start - if (config.chat_webhook_url) - spawn(0) - var/query_string = "type=admintake" - query_string += "&key=[url_encode(config.chat_webhook_key)]" - query_string += "&admin=[url_encode(key_name(usr.client))]" - query_string += "&user=[url_encode(key_name(M))]" - world.Export("[config.chat_webhook_url]?[query_string]") - // VoreStation Edit End - else - to_chat(usr, "Unable to locate mob.") - - else if(href_list["adminplayerobservecoodjump"]) - if(!check_rights(R_ADMIN|R_SERVER|R_MOD)) return //VOREStation Edit - - var/x = text2num(href_list["X"]) - var/y = text2num(href_list["Y"]) - var/z = text2num(href_list["Z"]) - - var/client/C = usr.client - if(!isobserver(usr)) C.admin_ghost() - sleep(2) - C.jumptocoord(x,y,z) - - else if(href_list["adminchecklaws"]) - output_ai_laws() - - else if(href_list["adminmoreinfo"]) - var/mob/M = locate(href_list["adminmoreinfo"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") - return - - var/location_description = "" - var/special_role_description = "" - var/health_description = "" - var/gender_description = "" - var/turf/T = get_turf(M) - - //Location - if(isturf(T)) - if(isarea(T.loc)) - location_description = "([M.loc == T ? "at coordinates " : "in [M.loc] at coordinates "] [T.x], [T.y], [T.z] in area [T.loc])" - else - location_description = "([M.loc == T ? "at coordinates " : "in [M.loc] at coordinates "] [T.x], [T.y], [T.z])" - - //Job + antagonist - if(M.mind) - special_role_description = "Role: [M.mind.assigned_role]; Antagonist: [M.mind.special_role]; Has been rev: [(M.mind.has_been_rev)?"Yes":"No"]" - else - special_role_description = "Role: Mind datum missing Antagonist: Mind datum missing; Has been rev: Mind datum missing;" - - //Health - if(isliving(M)) - var/mob/living/L = M - var/status - switch (M.stat) - if (0) status = "Alive" - if (1) status = "Unconscious" - if (2) status = "Dead" - health_description = "Status = [status]" - health_description += "
Oxy: [L.getOxyLoss()] - Tox: [L.getToxLoss()] - Fire: [L.getFireLoss()] - Brute: [L.getBruteLoss()] - Clone: [L.getCloneLoss()] - Brain: [L.getBrainLoss()]" - else - health_description = "This mob type has no health to speak of." - - //Gener - switch(M.gender) - if(MALE,FEMALE) gender_description = "[M.gender]" - else gender_description = "[M.gender]" - - to_chat(src.owner, "Info about [M.name]:
\ - Mob type = [M.type]; Gender = [gender_description] Damage = [health_description]
\ - Name = [M.name]; Real_name = [M.real_name]; Mind_name = [M.mind?"[M.mind.name]":""]; Key = [M.key];
\ - Location = [location_description];
\ - [special_role_description]
\ - (PM) (PP) (VV) \ - (SM) ([admin_jump_link(M, src)]) (CA)") - - else if(href_list["adminspawncookie"]) - if(!check_rights(R_ADMIN|R_FUN|R_EVENT)) return - - var/mob/living/carbon/human/H = locate(href_list["adminspawncookie"]) - if(!ishuman(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return - - H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_l_hand ) - if(!(istype(H.l_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie))) - H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_r_hand ) - if(!(istype(H.r_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie))) - log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].") - message_admins("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].") - return - else - H.update_inv_r_hand()//To ensure the icon appears in the HUD - else - H.update_inv_l_hand() - log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]") - message_admins("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]") - feedback_inc("admin_cookies_spawned",1) - to_chat(H, "Your prayers have been answered!! You received the best cookie!") - - else if(href_list["adminsmite"]) - if(!check_rights(R_ADMIN|R_FUN|R_EVENT)) return - - var/mob/living/carbon/human/H = locate(href_list["adminsmite"]) - if(!ishuman(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return - - owner.smite(H) - - else if(href_list["BlueSpaceArtillery"]) - if(!check_rights(R_ADMIN|R_FUN|R_EVENT)) return - - var/mob/living/M = locate(href_list["BlueSpaceArtillery"]) - if(!isliving(M)) - to_chat(usr, "This can only be used on instances of type /mob/living") - return - - if(tgui_alert(src.owner, "Are you sure you wish to hit [key_name(M)] with Blue Space Artillery?", "Confirm Firing?", list("Yes", "No")) != "Yes") - return - - bluespace_artillery(M,src) - - else if(href_list["CentComReply"]) - var/mob/living/L = locate(href_list["CentComReply"]) - if(!istype(L)) - to_chat(usr, "This can only be used on instances of type /mob/living/") - return - - if(L.can_centcom_reply()) - var/input = sanitize(input(src.owner, "Please enter a message to reply to [key_name(L)] via their headset.","Outgoing message from CentCom", "")) - if(!input) return - - to_chat(src.owner, "You sent [input] to [L] via a secure channel.") - log_admin("[src.owner] replied to [key_name(L)]'s CentCom message with the message [input].") - message_admins("[src.owner] replied to [key_name(L)]'s CentCom message with: \"[input]\"") - if(!isAI(L)) - to_chat(L, "You hear something crackle in your headset for a moment before a voice speaks.") - to_chat(L, "Please stand by for a message from Central Command.") - to_chat(L, "Message as follows.") - to_chat(L, "[input]") - to_chat(L, "Message ends.") - else - to_chat(src.owner, "The person you are trying to contact does not have functional radio equipment.") - - - else if(href_list["SyndicateReply"]) - var/mob/living/carbon/human/H = locate(href_list["SyndicateReply"]) - if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return - if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset)) - to_chat(usr, "The person you are trying to contact is not wearing a headset") - return - - var/input = sanitize(input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from a shadowy figure...", "")) - if(!input) return - - to_chat(src.owner, "You sent [input] to [H] via a secure channel.") - log_admin("[src.owner] replied to [key_name(H)]'s illegal message with the message [input].") - to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks. \ - \"Please stand by for a message from your benefactor. Message as follows, agent. \"[input]\" Message ends.\"") - - else if(href_list["AdminFaxView"]) - var/obj/item/fax = locate(href_list["AdminFaxView"]) - if (istype(fax, /obj/item/weapon/paper)) - var/obj/item/weapon/paper/P = fax - P.show_content(usr,1) - else if (istype(fax, /obj/item/weapon/photo)) - var/obj/item/weapon/photo/H = fax - H.show(usr) - else if (istype(fax, /obj/item/weapon/paper_bundle)) - //having multiple people turning pages on a paper_bundle can cause issues - //open a browse window listing the contents instead - var/data = "" - var/obj/item/weapon/paper_bundle/B = fax - - for (var/page = 1, page <= B.pages.len, page++) - var/obj/pageobj = B.pages[page] - data += "Page [page] - [pageobj.name]
" - - usr << browse(data, "window=[B.name]") - else - to_chat(usr, "The faxed item is not viewable. This is probably a bug, and should be reported on the tracker: [fax.type]") - - else if (href_list["AdminFaxViewPage"]) - var/page = text2num(href_list["AdminFaxViewPage"]) - var/obj/item/weapon/paper_bundle/bundle = locate(href_list["paper_bundle"]) - - if (!bundle) return - - if (istype(bundle.pages[page], /obj/item/weapon/paper)) - var/obj/item/weapon/paper/P = bundle.pages[page] - P.show_content(src.owner, 1) - else if (istype(bundle.pages[page], /obj/item/weapon/photo)) - var/obj/item/weapon/photo/H = bundle.pages[page] - H.show(src.owner) - return - - else if(href_list["FaxReply"]) - var/mob/sender = locate(href_list["FaxReply"]) - var/obj/machinery/photocopier/faxmachine/fax = locate(href_list["originfax"]) - var/replyorigin = href_list["replyorigin"] - - - var/obj/item/weapon/paper/admin/P = new /obj/item/weapon/paper/admin( null ) //hopefully the null loc won't cause trouble for us - faxreply = P - - P.admindatum = src - P.origin = replyorigin - P.destination = fax - P.sender = sender - - P.adminbrowse() - - else if(href_list["jumpto"]) - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) - return - if(!config.allow_admin_jump) - tgui_alert_async(usr, "Admin jumping disabled") - return - - var/mob/M = locate(href_list["jumpto"]) - if(!M) - return - - var/turf/T = get_turf(M) - if(isturf(T)) - usr.on_mob_jump() - usr.forceMove(T) - feedback_add_details("admin_verb","JM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - log_and_message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]") - else - to_chat(usr, "This mob is not located in the game world.") - - else if(href_list["getmob"]) - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) - return - if(!config.allow_admin_jump) - tgui_alert_async(usr, "Admin jumping disabled") - return - if(tgui_alert(usr, "Confirm?", "Message", list("Yes", "No")) != "Yes") - return - - var/mob/M = locate(href_list["getmob"]) - if(!M) - return - M.on_mob_jump() - M.forceMove(get_turf(usr)) - var/msg = "[key_name_admin(usr)] jumped [key_name_admin(M)] to them" - log_and_message_admins(msg) - admin_ticket_log(M, msg) - feedback_add_details("admin_verb","GM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - else if(href_list["sendmob"]) - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) - return - if(!config.allow_admin_jump) - tgui_alert_async(usr, "Admin jumping disabled") - return - - var/mob/M = locate(href_list["sendmob"]) - if(!M) - return - - var/list/areachoices = return_sorted_areas() - var/choice = tgui_input_list(usr, "Pick an area:", "Send Mob", areachoices) - if(!choice) - return - - var/area/A = areachoices[choice] - if(!A) - return - - M.on_mob_jump() - M.forceMove(pick(get_area_turfs(A))) - var/msg = "[key_name_admin(usr)] teleported [ADMIN_LOOKUPFLW(M)]" - log_and_message_admins(msg) - admin_ticket_log(M, msg) - feedback_add_details("admin_verb","SMOB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - else if(href_list["narrateto"]) - if(!check_rights(R_ADMIN|R_EVENT|R_FUN)) return - - var/mob/M = locate(href_list["narrateto"]) - usr.client.cmd_admin_direct_narrate(M) - - else if(href_list["subtlemessage"]) - if(!check_rights(R_MOD|R_ADMIN|R_EVENT|R_FUN,0)) return - - var/mob/M = locate(href_list["subtlemessage"]) - usr.client.cmd_admin_subtle_message(M) - - else if(href_list["traitor"]) - if(!check_rights(R_ADMIN|R_MOD|R_EVENT)) return - - if(!ticker || !ticker.mode) - tgui_alert_async(usr, "The game hasn't started yet!") - return - - var/mob/M = locate(href_list["traitor"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob.") - return - show_traitor_panel(M) - - else if(href_list["create_object"]) - if(!check_rights(R_SPAWN)) return - return create_object(usr) - - else if(href_list["quick_create_object"]) - if(!check_rights(R_SPAWN)) return - return quick_create_object(usr) - - else if(href_list["create_turf"]) - if(!check_rights(R_SPAWN)) return - return create_turf(usr) - - else if(href_list["create_mob"]) - if(!check_rights(R_SPAWN)) return - return create_mob(usr) - - else if(href_list["object_list"]) //this is the laggiest thing ever - if(!check_rights(R_SPAWN)) return - - if(!config.allow_admin_spawning) - to_chat(usr, "Spawning of items is not allowed.") - return - - var/atom/loc = usr.loc - - var/dirty_paths - if (istext(href_list["object_list"])) - dirty_paths = list(href_list["object_list"]) - else if (istype(href_list["object_list"], /list)) - dirty_paths = href_list["object_list"] - - var/paths = list() - var/removed_paths = list() - - for(var/dirty_path in dirty_paths) - var/path = text2path(dirty_path) - if(!path) - removed_paths += dirty_path - continue - else if(!ispath(path, /obj) && !ispath(path, /turf) && !ispath(path, /mob)) - removed_paths += dirty_path - continue - else if(ispath(path, /obj/item/weapon/gun/energy/pulse_rifle)) - if(!check_rights(R_FUN,0)) - removed_paths += dirty_path - continue - else if(ispath(path, /obj/item/weapon/melee/energy/blade))//Not an item one should be able to spawn./N - if(!check_rights(R_FUN,0)) - removed_paths += dirty_path - continue - else if(ispath(path, /obj/effect/bhole)) - if(!check_rights(R_FUN,0)) - removed_paths += dirty_path - continue - paths += path - - if(!paths) - tgui_alert(usr, "The path list you sent is empty") - return - if(length(paths) > 5) - tgui_alert_async(usr, "Select fewer object types, (max 5)") - return - else if(length(removed_paths)) - tgui_alert_async(usr, "Removed:\n" + jointext(removed_paths, "\n")) - - var/list/offset = splittext(href_list["offset"],",") - var/number = dd_range(1, 100, text2num(href_list["object_count"])) - var/X = offset.len > 0 ? text2num(offset[1]) : 0 - var/Y = offset.len > 1 ? text2num(offset[2]) : 0 - var/Z = offset.len > 2 ? text2num(offset[3]) : 0 - var/tmp_dir = href_list["object_dir"] - var/obj_dir = tmp_dir ? text2num(tmp_dir) : 2 - if(!obj_dir || !(obj_dir in list(1,2,4,8,5,6,9,10))) - obj_dir = 2 - var/obj_name = sanitize(href_list["object_name"]) - var/where = href_list["object_where"] - if (!( where in list("onfloor","inhand","inmarked") )) - where = "onfloor" - - if( where == "inhand" ) - to_chat(usr, "Support for inhand not available yet. Will spawn on floor.") - where = "onfloor" - - if ( where == "inhand" ) //Can only give when human or monkey - if ( !( ishuman(usr) || issmall(usr) ) ) - to_chat(usr, "Can only spawn in hand when you're a human or a monkey.") - where = "onfloor" - else if ( usr.get_active_hand() ) - to_chat(usr, "Your active hand is full. Spawning on floor.") - where = "onfloor" - - if ( where == "inmarked" ) - if ( !marked_datum ) - to_chat(usr, "You don't have any object marked. Abandoning spawn.") - return - else - if ( !istype(marked_datum,/atom) ) - to_chat(usr, "The object you have marked cannot be used as a target. Target must be of type /atom. Abandoning spawn.") - return - - var/atom/target //Where the object will be spawned - switch ( where ) - if ( "onfloor" ) - switch (href_list["offset_type"]) - if ("absolute") - target = locate(0 + X,0 + Y,0 + Z) - if ("relative") - target = locate(loc.x + X,loc.y + Y,loc.z + Z) - if ( "inmarked" ) - target = marked_datum - - if(target) - for (var/path in paths) - for (var/i = 0; i < number; i++) - if(path in typesof(/turf)) - var/turf/O = target - var/turf/N = O.ChangeTurf(path) - if(N) - if(obj_name) - N.name = obj_name - else - var/atom/O = new path(target) - if(O) - O.set_dir(obj_dir) - if(obj_name) - O.name = obj_name - if(istype(O,/mob)) - var/mob/M = O - M.real_name = obj_name - - log_and_message_admins("created [number] [english_list(paths)]") - return - - else if(href_list["admin_secrets_panel"]) - var/datum/admin_secret_category/AC = locate(href_list["admin_secrets_panel"]) in admin_secrets.categories - src.Secrets(AC) - - else if(href_list["admin_secrets"]) - var/datum/admin_secret_item/item = locate(href_list["admin_secrets"]) in admin_secrets.items - item.execute(usr) - - else if(href_list["ac_view_wanted"]) //Admin newscaster Topic() stuff be here - src.admincaster_screen = 18 //The ac_ prefix before the hrefs stands for AdminCaster. - src.access_news_network() - - else if(href_list["ac_set_channel_name"]) - src.admincaster_feed_channel.channel_name = sanitizeSafe(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "")) - src.access_news_network() - - else if(href_list["ac_set_channel_lock"]) - src.admincaster_feed_channel.locked = !src.admincaster_feed_channel.locked - src.access_news_network() - - else if(href_list["ac_submit_new_channel"]) - var/check = 0 - for(var/datum/feed_channel/FC in news_network.network_channels) - if(FC.channel_name == src.admincaster_feed_channel.channel_name) - check = 1 - break - if(src.admincaster_feed_channel.channel_name == "" || src.admincaster_feed_channel.channel_name == "\[REDACTED\]" || check ) - src.admincaster_screen=7 - else - var/choice = tgui_alert(usr, "Please confirm Feed channel creation","Network Channel Handler",list("Confirm","Cancel")) - if(choice=="Confirm") - news_network.CreateFeedChannel(admincaster_feed_channel.channel_name, admincaster_signature, admincaster_feed_channel.locked, 1) - feedback_inc("newscaster_channels",1) //Adding channel to the global network - log_admin("[key_name_admin(usr)] created command feed channel: [src.admincaster_feed_channel.channel_name]!") - src.admincaster_screen=5 - src.access_news_network() - - else if(href_list["ac_set_channel_receiving"]) - var/list/available_channels = list() - for(var/datum/feed_channel/F in news_network.network_channels) - available_channels += F.channel_name - src.admincaster_feed_channel.channel_name = sanitizeSafe(tgui_input_list(usr, "Choose receiving Feed Channel", "Network Channel Handler", available_channels )) - src.access_news_network() - - else if(href_list["ac_set_new_title"]) - src.admincaster_feed_message.title = sanitize(input(usr, "Enter the Feed title", "Network Channel Handler", "")) - src.access_news_network() - - else if(href_list["ac_set_new_message"]) - src.admincaster_feed_message.body = sanitize(input(usr, "Write your Feed story", "Network Channel Handler", "") as message) - src.access_news_network() - - else if(href_list["ac_submit_new_message"]) - if(src.admincaster_feed_message.body =="" || admincaster_feed_message.title == "" || admincaster_feed_message.body =="\[REDACTED\]" || admincaster_feed_channel.channel_name == "" ) - src.admincaster_screen = 6 - else - feedback_inc("newscaster_stories",1) - news_network.SubmitArticle(admincaster_feed_message.body, admincaster_signature, admincaster_feed_channel.channel_name, null, 1, "", admincaster_feed_message.title) - src.admincaster_screen=4 - - log_admin("[key_name_admin(usr)] submitted a feed story to channel: [src.admincaster_feed_channel.channel_name]!") - src.access_news_network() - - else if(href_list["ac_create_channel"]) - src.admincaster_screen=2 - src.access_news_network() - - else if(href_list["ac_create_feed_story"]) - src.admincaster_screen=3 - src.access_news_network() - - else if(href_list["ac_menu_censor_story"]) - src.admincaster_screen=10 - src.access_news_network() - - else if(href_list["ac_menu_censor_channel"]) - src.admincaster_screen=11 - src.access_news_network() - - else if(href_list["ac_menu_wanted"]) - var/already_wanted = 0 - if(news_network.wanted_issue) - already_wanted = 1 - - if(already_wanted) - src.admincaster_feed_message.author = news_network.wanted_issue.author - src.admincaster_feed_message.body = news_network.wanted_issue.body - src.admincaster_screen = 14 - src.access_news_network() - - else if(href_list["ac_set_wanted_name"]) - src.admincaster_feed_message.author = sanitize(input(usr, "Provide the name of the Wanted person", "Network Security Handler", "")) - src.access_news_network() - - else if(href_list["ac_set_wanted_desc"]) - src.admincaster_feed_message.body = sanitize(input(usr, "Provide the a description of the Wanted person and any other details you deem important", "Network Security Handler", "")) - src.access_news_network() - - else if(href_list["ac_submit_wanted"]) - var/input_param = text2num(href_list["ac_submit_wanted"]) - if(src.admincaster_feed_message.author == "" || src.admincaster_feed_message.body == "") - src.admincaster_screen = 16 - else - var/choice = tgui_alert(usr, "Please confirm Wanted Issue [(input_param==1) ? ("creation.") : ("edit.")]","Network Security Handler",list("Confirm","Cancel")) - if(choice=="Confirm") - if(input_param==1) //If input_param == 1 we're submitting a new wanted issue. At 2 we're just editing an existing one. See the else below - var/datum/feed_message/WANTED = new /datum/feed_message - WANTED.author = src.admincaster_feed_message.author //Wanted name - WANTED.body = src.admincaster_feed_message.body //Wanted desc - WANTED.backup_author = src.admincaster_signature //Submitted by - WANTED.is_admin_message = 1 - news_network.wanted_issue = WANTED - for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allCasters) - NEWSCASTER.newsAlert() - NEWSCASTER.update_icon() - src.admincaster_screen = 15 - else - news_network.wanted_issue.author = src.admincaster_feed_message.author - news_network.wanted_issue.body = src.admincaster_feed_message.body - news_network.wanted_issue.backup_author = src.admincaster_feed_message.backup_author - src.admincaster_screen = 19 - log_admin("[key_name_admin(usr)] issued a Station-wide Wanted Notification for [src.admincaster_feed_message.author]!") - src.access_news_network() - - else if(href_list["ac_cancel_wanted"]) - var/choice = tgui_alert(usr, "Please confirm Wanted Issue removal","Network Security Handler",list("Confirm","Cancel")) - if(choice=="Confirm") - news_network.wanted_issue = null - for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allCasters) - NEWSCASTER.update_icon() - src.admincaster_screen=17 - src.access_news_network() - - else if(href_list["ac_censor_channel_author"]) - var/datum/feed_channel/FC = locate(href_list["ac_censor_channel_author"]) - if(FC.author != "\[REDACTED\]") - FC.backup_author = FC.author - FC.author = "\[REDACTED\]" - else - FC.author = FC.backup_author - src.access_news_network() - - else if(href_list["ac_censor_channel_story_author"]) - var/datum/feed_message/MSG = locate(href_list["ac_censor_channel_story_author"]) - if(MSG.author != "\[REDACTED\]") - MSG.backup_author = MSG.author - MSG.author = "\[REDACTED\]" - else - MSG.author = MSG.backup_author - src.access_news_network() - - else if(href_list["ac_censor_channel_story_body"]) - var/datum/feed_message/MSG = locate(href_list["ac_censor_channel_story_body"]) - if(MSG.body != "\[REDACTED\]") - MSG.backup_body = MSG.body - MSG.body = "\[REDACTED\]" - else - MSG.body = MSG.backup_body - src.access_news_network() - - else if(href_list["ac_pick_d_notice"]) - var/datum/feed_channel/FC = locate(href_list["ac_pick_d_notice"]) - src.admincaster_feed_channel = FC - src.admincaster_screen=13 - src.access_news_network() - - else if(href_list["ac_toggle_d_notice"]) - var/datum/feed_channel/FC = locate(href_list["ac_toggle_d_notice"]) - FC.censored = !FC.censored - src.access_news_network() - - else if(href_list["ac_view"]) - src.admincaster_screen=1 - src.access_news_network() - - else if(href_list["ac_setScreen"]) //Brings us to the main menu and resets all fields~ - src.admincaster_screen = text2num(href_list["ac_setScreen"]) - if (src.admincaster_screen == 0) - if(src.admincaster_feed_channel) - src.admincaster_feed_channel = new /datum/feed_channel - if(src.admincaster_feed_message) - src.admincaster_feed_message = new /datum/feed_message - src.access_news_network() - - else if(href_list["ac_show_channel"]) - var/datum/feed_channel/FC = locate(href_list["ac_show_channel"]) - src.admincaster_feed_channel = FC - src.admincaster_screen = 9 - src.access_news_network() - - else if(href_list["ac_pick_censor_channel"]) - var/datum/feed_channel/FC = locate(href_list["ac_pick_censor_channel"]) - src.admincaster_feed_channel = FC - src.admincaster_screen = 12 - src.access_news_network() - - else if(href_list["ac_refresh"]) - src.access_news_network() - - else if(href_list["ac_set_signature"]) - src.admincaster_signature = sanitize(input(usr, "Provide your desired signature", "Network Identity Handler", "")) - src.access_news_network() - - else if(href_list["populate_inactive_customitems"]) - if(check_rights(R_ADMIN|R_SERVER)) - populate_inactive_customitems_list(src.owner) - - else if(href_list["vsc"]) - if(check_rights(R_ADMIN|R_SERVER|R_EVENT)) - if(href_list["vsc"] == "airflow") - vsc.ChangeSettingsDialog(usr,vsc.settings) - if(href_list["vsc"] == "phoron") - vsc.ChangeSettingsDialog(usr,vsc.plc.settings) - if(href_list["vsc"] == "default") - vsc.SetDefault(usr) - - else if(href_list["toglang"]) - if(check_rights(R_SPAWN)) //VOREStation Edit - var/mob/M = locate(href_list["toglang"]) - if(!istype(M)) - to_chat(usr, "[M] is illegal type, must be /mob!") - return - var/lang2toggle = href_list["lang"] - var/datum/language/L = GLOB.all_languages[lang2toggle] - - if(L in M.languages) - if(!M.remove_language(lang2toggle)) - to_chat(usr, "Failed to remove language '[lang2toggle]' from \the [M]!") - else - if(!M.add_language(lang2toggle)) - to_chat(usr, "Failed to add language '[lang2toggle]' from \the [M]!") - - show_player_panel(M) - - else if(href_list["cryoplayer"]) - if(!check_rights(R_ADMIN|R_EVENT)) return - - var/mob/living/carbon/M = locate(href_list["cryoplayer"]) //VOREStation edit from just an all mob check to mob/living/carbon - if(!istype(M)) - to_chat(usr, "Mob doesn't exist!") - return - - var/client/C = usr.client - C.despawn_player(M) - - // player info stuff - - if(href_list["add_player_info"]) - var/key = href_list["add_player_info"] - var/add = sanitize(input(usr, "Add Player Info") as null|text) - if(!add) return - - notes_add(key,add,usr) - show_player_info(key) - - if(href_list["remove_player_info"]) - var/key = href_list["remove_player_info"] - var/index = text2num(href_list["remove_index"]) - - notes_del(key, index) - show_player_info(key) - - if(href_list["notes"]) - var/ckey = href_list["ckey"] - if(!ckey) - var/mob/M = locate(href_list["mob"]) - if(ismob(M)) - ckey = M.ckey - - switch(href_list["notes"]) - if("show") - show_player_info(ckey) - if("list") - var/filter - if(href_list["filter"] && href_list["filter"] != "0") - filter = url_decode(href_list["filter"]) - PlayerNotesPage(text2num(href_list["index"]), filter) - if("filter") - PlayerNotesFilter() - return - -/mob/living/proc/can_centcom_reply() - return 0 - -/mob/living/carbon/human/can_centcom_reply() - return istype(l_ear, /obj/item/device/radio/headset) || istype(r_ear, /obj/item/device/radio/headset) - -/mob/living/silicon/ai/can_centcom_reply() - return common_radio != null && !check_unable(2) - -/atom/proc/extra_admin_link() - return - -/mob/extra_admin_link(var/source) - if(client && eyeobj) - return "|EYE" - -/mob/observer/dead/extra_admin_link(var/source) - if(mind && mind.current) - return "|BDY" - -/proc/admin_jump_link(var/atom/target, var/source) - if(!target) return - // The way admin jump links handle their src is weirdly inconsistent... - if(istype(source, /datum/admins)) - source = "src=\ref[source]" - else - source = "_src_=holder" - - . = "JMP" - . += target.extra_admin_link(source) +/datum/admins/Topic(href, href_list) + ..() + + if(usr.client != src.owner || !check_rights(0)) + log_admin("[key_name(usr)] tried to use the admin panel without authorization.") + message_admins("[usr.key] has attempted to override the admin panel!") + return + + if(ticker.mode && ticker.mode.check_antagonists_topic(href, href_list)) + check_antagonists() + return + + if(href_list["ahelp"]) + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) + return + + var/ahelp_ref = href_list["ahelp"] + var/datum/admin_help/AH = locate(ahelp_ref) + if(AH) + AH.Action(href_list["ahelp_action"]) + else + to_chat(usr, "Ticket [ahelp_ref] has been deleted!") + + else if(href_list["ahelp_tickets"]) + GLOB.ahelp_tickets.BrowseTickets(text2num(href_list["ahelp_tickets"])) + + if(href_list["dbsearchckey"] || href_list["dbsearchadmin"]) + + var/adminckey = href_list["dbsearchadmin"] + var/playerckey = href_list["dbsearchckey"] + var/playerip = href_list["dbsearchip"] + var/playercid = href_list["dbsearchcid"] + var/dbbantype = text2num(href_list["dbsearchbantype"]) + var/match = 0 + + if("dbmatch" in href_list) + match = 1 + + DB_ban_panel(playerckey, adminckey, playerip, playercid, dbbantype, match) + return + + else if(href_list["dbbanedit"]) + var/banedit = href_list["dbbanedit"] + var/banid = text2num(href_list["dbbanid"]) + if(!banedit || !banid) + return + + DB_ban_edit(banid, banedit) + return + + else if(href_list["dbbanaddtype"]) + + var/bantype = text2num(href_list["dbbanaddtype"]) + var/banckey = href_list["dbbanaddckey"] + var/banip = href_list["dbbanaddip"] + var/bancid = href_list["dbbanaddcid"] + var/banduration = text2num(href_list["dbbaddduration"]) + var/banjob = href_list["dbbanaddjob"] + var/banreason = href_list["dbbanreason"] + + banckey = ckey(banckey) + + switch(bantype) + if(BANTYPE_PERMA) + if(!banckey || !banreason) + to_chat(usr, "Not enough parameters (Requires ckey and reason)") + return + banduration = null + banjob = null + if(BANTYPE_TEMP) + if(!banckey || !banreason || !banduration) + to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") + return + banjob = null + if(BANTYPE_JOB_PERMA) + if(!banckey || !banreason || !banjob) + to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") + return + banduration = null + if(BANTYPE_JOB_TEMP) + if(!banckey || !banreason || !banjob || !banduration) + to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") + return + + var/mob/playermob + + for(var/mob/M in player_list) + if(M.ckey == banckey) + playermob = M + break + + + banreason = "(MANUAL BAN) "+banreason + + if(!playermob) + if(banip) + banreason = "[banreason] (CUSTOM IP)" + if(bancid) + banreason = "[banreason] (CUSTOM CID)" + else + message_admins("Ban process: A mob matching [playermob.ckey] was found at location [playermob.x], [playermob.y], [playermob.z]. Custom ip and computer id fields replaced with the ip and computer id from the located mob") + notes_add(banckey,banreason,usr) + + DB_ban_record(bantype, playermob, banduration, banreason, banjob, null, banckey, banip, bancid ) + if((bantype == BANTYPE_PERMA || bantype == BANTYPE_TEMP) && playermob.client) + qdel(playermob.client) + + else if(href_list["editrights"]) + if(!check_rights(R_PERMISSIONS)) + message_admins("[key_name_admin(usr)] attempted to edit the admin permissions without sufficient rights.") + log_admin("[key_name(usr)] attempted to edit the admin permissions without sufficient rights.") + return + + var/adm_ckey + + var/task = href_list["editrights"] + if(task == "add") + var/new_ckey = ckey(tgui_input_text(usr,"New admin's ckey","Admin ckey", null)) + if(!new_ckey) return + if(new_ckey in admin_datums) + to_chat(usr, "Error: Topic 'editrights': [new_ckey] is already an admin") + return + adm_ckey = new_ckey + task = "rank" + else if(task != "show") + adm_ckey = ckey(href_list["ckey"]) + if(!adm_ckey) + to_chat(usr, "Error: Topic 'editrights': No valid ckey") + return + + var/datum/admins/D = admin_datums[adm_ckey] + + if(task == "remove") + if(tgui_alert(usr, "Are you sure you want to remove [adm_ckey]?","Message",list("Yes","Cancel")) == "Yes") + if(!D) return + admin_datums -= adm_ckey + D.disassociate() + + message_admins("[key_name_admin(usr)] removed [adm_ckey] from the admins list") + log_admin("[key_name(usr)] removed [adm_ckey] from the admins list") + log_admin_rank_modification(adm_ckey, "Removed") + + else if(task == "rank") + var/new_rank + if(admin_ranks.len) + new_rank = tgui_input_list(usr, "Please select a rank", "New rank", (admin_ranks|"*New Rank*")) + else + new_rank = tgui_input_list(usr, "Please select a rank", "New rank", list("Game Master","Game Admin", "Trial Admin", "Admin Observer","*New Rank*")) + + var/rights = 0 + if(D) + rights = D.rights + switch(new_rank) + if(null,"") return + if("*New Rank*") + new_rank = tgui_input_text(usr, "Please input a new rank", "New custom rank") + if(config.admin_legacy_system) + new_rank = ckeyEx(new_rank) + if(!new_rank) + to_chat(usr, "Error: Topic 'editrights': Invalid rank") + return + if(config.admin_legacy_system) + if(admin_ranks.len) + if(new_rank in admin_ranks) + rights = admin_ranks[new_rank] //we typed a rank which already exists, use its rights + else + admin_ranks[new_rank] = 0 //add the new rank to admin_ranks + else + if(config.admin_legacy_system) + new_rank = ckeyEx(new_rank) + rights = admin_ranks[new_rank] //we input an existing rank, use its rights + + if(D) + D.disassociate() //remove adminverbs and unlink from client + D.rank = new_rank //update the rank + D.rights = rights //update the rights based on admin_ranks (default: 0) + else + D = new /datum/admins(new_rank, rights, adm_ckey) + + var/client/C = GLOB.directory[adm_ckey] //find the client with the specified ckey (if they are logged in) + D.associate(C) //link up with the client and add verbs + + message_admins("[key_name_admin(usr)] edited the admin rank of [adm_ckey] to [new_rank]") + log_admin("[key_name(usr)] edited the admin rank of [adm_ckey] to [new_rank]") + log_admin_rank_modification(adm_ckey, new_rank) + + else if(task == "permissions") + if(!D) return + var/list/permissionlist = list() + for(var/i=1, i<=R_MAXPERMISSION, i<<=1) //that <<= is shorthand for i = i << 1. Which is a left bitshift + permissionlist[rights2text(i)] = i + var/new_permission = tgui_input_list(usr, "Select a permission to turn on/off", "Permission toggle", permissionlist) + if(!new_permission) return + D.rights ^= permissionlist[new_permission] + + message_admins("[key_name_admin(usr)] toggled the [new_permission] permission of [adm_ckey]") + log_admin("[key_name(usr)] toggled the [new_permission] permission of [adm_ckey]") + log_admin_permission_modification(adm_ckey, permissionlist[new_permission]) + + edit_admin_permissions() + + else if(href_list["call_shuttle"]) + if(!check_rights(R_ADMIN|R_EVENT)) return + + if( ticker.mode.name == "blob" ) + tgui_alert_async(usr, "You can't call the shuttle during blob!") + return + + switch(href_list["call_shuttle"]) + if("1") + if ((!( ticker ) || !emergency_shuttle.location())) + return + if (emergency_shuttle.can_call()) + emergency_shuttle.call_evac() + log_admin("[key_name(usr)] called the Emergency Shuttle") + message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.", 1) + + if("2") + if (!( ticker ) || !emergency_shuttle.location()) + return + if (emergency_shuttle.can_call()) + emergency_shuttle.call_evac() + log_admin("[key_name(usr)] called the Emergency Shuttle") + message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.", 1) + + else if (emergency_shuttle.can_recall()) + emergency_shuttle.recall() + log_admin("[key_name(usr)] sent the Emergency Shuttle back") + message_admins("[key_name_admin(usr)] sent the Emergency Shuttle back.", 1) + + href_list["secretsadmin"] = "check_antagonist" + + else if(href_list["edit_shuttle_time"]) + if(!check_rights(R_SERVER)) return + + if (emergency_shuttle.wait_for_launch) + var/new_time_left = tgui_input_number(usr, "Enter new shuttle launch countdown (seconds):","Edit Shuttle Launch Time", emergency_shuttle.estimate_launch_time() ) + + emergency_shuttle.launch_time = world.time + new_time_left*10 + + log_admin("[key_name(usr)] edited the Emergency Shuttle's launch time to [new_time_left]") + message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's launch time to [new_time_left*10]", 1) + else if (emergency_shuttle.shuttle.has_arrive_time()) + + var/new_time_left = tgui_input_number(usr, "Enter new shuttle arrival time (seconds):","Edit Shuttle Arrival Time", emergency_shuttle.estimate_arrival_time() ) + emergency_shuttle.shuttle.arrive_time = world.time + new_time_left*10 + + log_admin("[key_name(usr)] edited the Emergency Shuttle's arrival time to [new_time_left]") + message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's arrival time to [new_time_left*10]", 1) + else + tgui_alert_async(usr, "The shuttle is neither counting down to launch nor is it in transit. Please try again when it is.") + + href_list["secretsadmin"] = "check_antagonist" + + else if(href_list["delay_round_end"]) + if(!check_rights(R_SERVER)) return //VOREStation Edit + + ticker.delay_end = !ticker.delay_end + log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].") + message_admins("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1) + href_list["secretsadmin"] = "check_antagonist" + + else if(href_list["simplemake"]) + + if(!check_rights(R_SPAWN)) return + + var/mob/M = locate(href_list["mob"]) + if(!ismob(M)) + to_chat(usr, "This can only be used on instances of type /mob") + return + + var/delmob = 0 + switch(tgui_alert(usr, "Delete old mob?","Message",list("Yes","No","Cancel"))) + if("Cancel") return + if("Yes") delmob = 1 + + log_admin("[key_name(usr)] has used rudimentary transformation on [key_name(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]") + message_admins("[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]", 1) + + switch(href_list["simplemake"]) + if("observer") M.change_mob_type( /mob/observer/dead , null, null, delmob ) + if("larva") M.change_mob_type( /mob/living/carbon/alien/larva , null, null, delmob ) + if("nymph") M.change_mob_type( /mob/living/carbon/alien/diona , null, null, delmob ) + if("human") M.change_mob_type( /mob/living/carbon/human , null, null, delmob, href_list["species"]) + if("slime") M.change_mob_type( /mob/living/simple_mob/slime/xenobio , null, null, delmob ) + if("monkey") M.change_mob_type( /mob/living/carbon/human/monkey , null, null, delmob ) + if("robot") M.change_mob_type( /mob/living/silicon/robot , null, null, delmob ) + if("cat") M.change_mob_type( /mob/living/simple_mob/animal/passive/cat , null, null, delmob ) + if("runtime") M.change_mob_type( /mob/living/simple_mob/animal/passive/cat/runtime , null, null, delmob ) + if("corgi") M.change_mob_type( /mob/living/simple_mob/animal/passive/dog/corgi , null, null, delmob ) + if("ian") M.change_mob_type( /mob/living/simple_mob/animal/passive/dog/corgi/Ian , null, null, delmob ) + if("crab") M.change_mob_type( /mob/living/simple_mob/animal/passive/crab , null, null, delmob ) + if("coffee") M.change_mob_type( /mob/living/simple_mob/animal/passive/crab/Coffee , null, null, delmob ) + if("parrot") M.change_mob_type( /mob/living/simple_mob/animal/passive/bird/parrot , null, null, delmob ) + if("polyparrot") M.change_mob_type( /mob/living/simple_mob/animal/passive/bird/parrot/poly , null, null, delmob ) + if("constructarmoured") M.change_mob_type( /mob/living/simple_mob/construct/juggernaut , null, null, delmob ) + if("constructbuilder") M.change_mob_type( /mob/living/simple_mob/construct/artificer , null, null, delmob ) + if("constructwraith") M.change_mob_type( /mob/living/simple_mob/construct/wraith , null, null, delmob ) + if("shade") M.change_mob_type( /mob/living/simple_mob/construct/shade , null, null, delmob ) + + + /////////////////////////////////////new ban stuff + else if(href_list["unbanf"]) + if(!check_rights(R_BAN)) return + + var/banfolder = href_list["unbanf"] + Banlist.cd = "/base/[banfolder]" + var/key = Banlist["key"] + if(tgui_alert(usr, "Are you sure you want to unban [key]?", "Confirmation", list("Yes", "No")) == "Yes") + if(RemoveBan(banfolder)) + unbanpanel() + else + tgui_alert_async(usr, "This ban has already been lifted / does not exist.", "Error") + unbanpanel() + + else if(href_list["warn"]) + usr.client.warn(href_list["warn"]) + + else if(href_list["unbane"]) + if(!check_rights(R_BAN)) return + + UpdateTime() + var/reason + + var/banfolder = href_list["unbane"] + Banlist.cd = "/base/[banfolder]" + var/reason2 = Banlist["reason"] + var/temp = Banlist["temp"] + + var/minutes = Banlist["minutes"] + + var/banned_key = Banlist["key"] + Banlist.cd = "/base" + + var/duration + + switch(tgui_alert(usr, "Temporary Ban?","Temporary Ban",list("Yes","No"))) + if("Yes") + temp = 1 + var/mins = 0 + if(minutes > CMinutes) + mins = minutes - CMinutes + mins = tgui_input_number(usr,"How long (in minutes)? (Default: 1440)","Ban time",mins ? mins : 1440) + if(!mins) return + mins = min(525599,mins) + minutes = CMinutes + mins + duration = GetExp(minutes) + reason = sanitize(tgui_input_text(usr,"Reason?","reason",reason2)) + if(!reason) return + if("No") + temp = 0 + duration = "Perma" + reason = sanitize(tgui_input_text(usr,"Reason?","reason",reason2)) + if(!reason) return + + log_admin("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]") + ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]") + message_admins("[key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]", 1) + Banlist.cd = "/base/[banfolder]" + Banlist["reason"] << reason + Banlist["temp"] << temp + Banlist["minutes"] << minutes + Banlist["bannedby"] << usr.ckey + Banlist.cd = "/base" + feedback_inc("ban_edit",1) + unbanpanel() + + /////////////////////////////////////new ban stuff + + else if(href_list["jobban2"]) +// if(!check_rights(R_BAN)) return + + var/mob/M = locate(href_list["jobban2"]) + if(!ismob(M)) + to_chat(usr, "This can only be used on instances of type /mob") + return + + if(!M.ckey) //sanity + to_chat(usr, "This mob has no ckey") + return + if(!job_master) + to_chat(usr, "Job Master has not been setup!") + return + + var/dat = "" + var/header = "
| Command Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " + else + jobs += "[replacetext(job.title, " ", " ")] | " + + if(++counter >= 6) //So things dont get squiiiiished! + jobs += "
| Security Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " + else + jobs += "[replacetext(job.title, " ", " ")] | " + + if(++counter >= 5) //So things dont get squiiiiished! + jobs += "
| Engineering Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " + else + jobs += "[replacetext(job.title, " ", " ")] | " + + if(++counter >= 5) //So things dont get squiiiiished! + jobs += "
| Cargo Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " + else + jobs += "[replacetext(job.title, " ", " ")] | " + + if(++counter >= 5) //So things dont get squiiiiished! + jobs += "
| Medical Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " + else + jobs += "[replacetext(job.title, " ", " ")] | " + + if(++counter >= 5) //So things dont get squiiiiished! + jobs += "
| Science Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " + else + jobs += "[replacetext(job.title, " ", " ")] | " + + if(++counter >= 5) //So things dont get squiiiiished! + jobs += "
| Exploration Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " + else + jobs += "[replacetext(job.title, " ", " ")] | " + + if(++counter >= 5) //So things dont get squiiiiished! + jobs += "
| Offmap Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " + else + jobs += "[replacetext(job.title, " ", " ")] | " + + if(++counter >= 5) //So things dont get squiiiiished! + jobs += "
| Civilian Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " + else + jobs += "[replacetext(job.title, " ", " ")] | " + + if(++counter >= 5) //So things dont get squiiiiished! + jobs += "
| Internal Affairs Agent | " + else + jobs += "Internal Affairs Agent | " + + jobs += "
| Synthetic Positions | |
|---|---|
| [replacetext(job.title, " ", " ")] | " + else + jobs += "[replacetext(job.title, " ", " ")] | " + + if(++counter >= 5) //So things dont get squiiiiished! + jobs += "
| Antagonist Positions | |
|---|---|
| [replacetext("[antag.role_text]", " ", " ")] | " + else + jobs += "[replacetext("[antag.role_text]", " ", " ")] | " + + if(++counter >= 5) //So things dont get squiiiiished! + jobs += "
| Other Roles | |
|---|---|
| [entry] | " + else + jobs += "[entry] | " + + if(++counter >= 5) //So things dont get squiiiiished! + jobs += "
"} + for(var/mode in config.modes) + dat += {"[config.mode_names[mode]]
"} + dat += {"Secret
"} + dat += {"Random
"} + dat += {"Now: [master_mode]"} + usr << browse(dat, "window=c_mode") + + else if(href_list["f_secret"]) + if(!check_rights(R_ADMIN|R_EVENT)) return + + if(ticker && ticker.mode) + return tgui_alert_async(usr, "The game has already started.") + if(master_mode != "secret") + return tgui_alert_async(usr, "The game mode has to be secret!") + var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.
"} + for(var/mode in config.modes) + dat += {"[config.mode_names[mode]]
"} + dat += {"Random (default)
"} + dat += {"Now: [secret_force_mode]"} + usr << browse(dat, "window=f_secret") + + else if(href_list["c_mode2"]) + if(!check_rights(R_ADMIN|R_SERVER|R_EVENT)) return + + if (ticker && ticker.mode) + return tgui_alert_async(usr, "The game has already started.") + master_mode = href_list["c_mode2"] + log_admin("[key_name(usr)] set the mode as [config.mode_names[master_mode]].") + message_admins("[key_name_admin(usr)] set the mode as [config.mode_names[master_mode]].", 1) + to_world("The mode is now: [config.mode_names[master_mode]]") + Game() // updates the main game menu + world.save_mode(master_mode) + .(href, list("c_mode"=1)) + + else if(href_list["f_secret2"]) + if(!check_rights(R_ADMIN|R_SERVER|R_EVENT)) return + + if(ticker && ticker.mode) + return tgui_alert_async(usr, "The game has already started.") + if(master_mode != "secret") + return tgui_alert_async(usr, "The game mode has to be secret!") + secret_force_mode = href_list["f_secret2"] + log_admin("[key_name(usr)] set the forced secret mode as [secret_force_mode].") + message_admins("[key_name_admin(usr)] set the forced secret mode as [secret_force_mode].", 1) + Game() // updates the main game menu + .(href, list("f_secret"=1)) + + else if(href_list["monkeyone"]) + if(!check_rights(R_SPAWN)) return + + var/mob/living/carbon/human/H = locate(href_list["monkeyone"]) + if(!istype(H)) + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return + + log_admin("[key_name(usr)] attempting to monkeyize [key_name(H)]") + message_admins("[key_name_admin(usr)] attempting to monkeyize [key_name_admin(H)]", 1) + H.monkeyize() + + else if(href_list["corgione"]) + if(!check_rights(R_SPAWN)) return + + var/mob/living/carbon/human/H = locate(href_list["corgione"]) + if(!istype(H)) + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return + + log_admin("[key_name(usr)] attempting to corgize [key_name(H)]") + message_admins("[key_name_admin(usr)] attempting to corgize [key_name_admin(H)]", 1) + H.corgize() + + else if(href_list["forcespeech"]) + if(!check_rights(R_FUN)) return + + var/mob/M = locate(href_list["forcespeech"]) + if(!ismob(M)) + to_chat(usr, "this can only be used on instances of type /mob") + + var/speech = tgui_input_text(usr, "What will [key_name(M)] say?.", "Force speech", "") // Don't need to sanitize, since it does that in say(), we also trust our admins. + if(!speech) return + M.say(speech) + speech = sanitize(speech) // Nah, we don't trust them + log_admin("[key_name(usr)] forced [key_name(M)] to say: [speech]") + message_admins("[key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]") + + else if(href_list["sendtoprison"]) + if(!check_rights(R_ADMIN)) return + + if(tgui_alert(usr, "Send to admin prison for the round?", "Message", list("Yes", "No")) != "Yes") + return + + var/mob/M = locate(href_list["sendtoprison"]) + if(!ismob(M)) + to_chat(usr, "This can only be used on instances of type /mob") + return + if(istype(M, /mob/living/silicon/ai)) + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + return + + var/turf/prison_cell = pick(prisonwarp) + if(!prison_cell) return + + var/obj/structure/closet/secure_closet/brig/locker = new /obj/structure/closet/secure_closet/brig(prison_cell) + locker.opened = 0 + locker.locked = 1 + + //strip their stuff and stick it in the crate + for(var/obj/item/I in M) + M.drop_from_inventory(I, locker) + + //so they black out before warping + M.Paralyse(5) + sleep(5) + if(!M) return + + M.loc = prison_cell + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/prisoner = M + prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/prison(prisoner), slot_w_uniform) + prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes) + + to_chat(M, "You have been sent to the prison station!") + log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") + message_admins("[key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) + + else if(href_list["sendbacktolobby"]) + if(!check_rights(R_ADMIN)) + return + + var/mob/M = locate(href_list["sendbacktolobby"]) + if(!isobserver(M)) + to_chat(usr, "You can only send ghost players back to the Lobby.") + return + + if(!M.client) + to_chat(usr, "[M] doesn't seem to have an active client.") + return + + if(tgui_alert(usr, "Send [key_name(M)] back to Lobby?", "Message", list("Yes", "No")) != "Yes") + return + + log_admin("[key_name(usr)] has sent [key_name(M)] back to the Lobby.") + message_admins("[key_name(usr)] has sent [key_name(M)] back to the Lobby.") + + var/mob/new_player/NP = new() + NP.ckey = M.ckey + qdel(M) + + else if(href_list["tdome1"]) + if(!check_rights(R_FUN)) return + + if(tgui_alert(usr, "Confirm?", "Message", list("Yes", "No")) != "Yes") + return + + var/mob/M = locate(href_list["tdome1"]) + if(!ismob(M)) + to_chat(usr, "This can only be used on instances of type /mob") + return + if(istype(M, /mob/living/silicon/ai)) + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + return + + for(var/obj/item/I in M) + M.drop_from_inventory(I) + + M.Paralyse(5) + sleep(5) + M.loc = pick(tdome1) + spawn(50) + to_chat(M, "You have been sent to the Thunderdome.") + log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 1)") + message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)", 1) + + else if(href_list["tdome2"]) + if(!check_rights(R_FUN)) return + + if(tgui_alert(usr, "Confirm?", "Message", list("Yes", "No")) != "Yes") + return + + var/mob/M = locate(href_list["tdome2"]) + if(!ismob(M)) + to_chat(usr, "This can only be used on instances of type /mob") + return + if(istype(M, /mob/living/silicon/ai)) + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + return + + for(var/obj/item/I in M) + M.drop_from_inventory(I) + + M.Paralyse(5) + sleep(5) + M.loc = pick(tdome2) + spawn(50) + to_chat(M, "You have been sent to the Thunderdome.") + log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 2)") + message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)", 1) + + else if(href_list["tdomeadmin"]) + if(!check_rights(R_FUN)) return + + if(tgui_alert(usr, "Confirm?", "Message", list("Yes", "No")) != "Yes") + return + + var/mob/M = locate(href_list["tdomeadmin"]) + if(!ismob(M)) + to_chat(usr, "This can only be used on instances of type /mob") + return + if(istype(M, /mob/living/silicon/ai)) + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + return + + M.Paralyse(5) + sleep(5) + M.loc = pick(tdomeadmin) + spawn(50) + to_chat(M, "You have been sent to the Thunderdome.") + log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Admin.)") + message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)", 1) + + else if(href_list["tdomeobserve"]) + if(!check_rights(R_FUN)) return + + if(tgui_alert(usr, "Confirm?", "Message", list("Yes", "No")) != "Yes") + return + + var/mob/M = locate(href_list["tdomeobserve"]) + if(!ismob(M)) + to_chat(usr, "This can only be used on instances of type /mob") + return + if(istype(M, /mob/living/silicon/ai)) + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + return + + for(var/obj/item/I in M) + M.drop_from_inventory(I) + + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/observer = M + observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(observer), slot_w_uniform) + observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(observer), slot_shoes) + M.Paralyse(5) + sleep(5) + M.loc = pick(tdomeobserve) + spawn(50) + to_chat(M, "You have been sent to the Thunderdome.") + log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)") + message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1) + + else if(href_list["revive"]) + if(!check_rights(R_REJUVINATE)) return + + var/mob/living/L = locate(href_list["revive"]) + if(!istype(L)) + to_chat(usr, "This can only be used on instances of type /mob/living") + return + + if(config.allow_admin_rev) + L.revive() + message_admins("Admin [key_name_admin(usr)] healed / revived [key_name_admin(L)]!", 1) + log_admin("[key_name(usr)] healed / Rrvived [key_name(L)]") + else + to_chat(usr, "Admin Rejuvinates have been disabled") + + else if(href_list["makeai"]) + if(!check_rights(R_SPAWN)) return + + var/mob/living/carbon/human/H = locate(href_list["makeai"]) + if(!istype(H)) + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return + + message_admins("Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!", 1) + log_admin("[key_name(usr)] AIized [key_name(H)]") + H.AIize() + + else if(href_list["makealien"]) + if(!check_rights(R_SPAWN)) return + + var/mob/living/carbon/human/H = locate(href_list["makealien"]) + if(!istype(H)) + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return + + usr.client.cmd_admin_alienize(H) + + else if(href_list["makerobot"]) + if(!check_rights(R_SPAWN)) return + + var/mob/living/carbon/human/H = locate(href_list["makerobot"]) + if(!istype(H)) + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return + + usr.client.cmd_admin_robotize(H) + + else if(href_list["makeanimal"]) + if(!check_rights(R_SPAWN)) return + + var/mob/M = locate(href_list["makeanimal"]) + if(istype(M, /mob/new_player)) + to_chat(usr, "This cannot be used on instances of type /mob/new_player") + return + + usr.client.cmd_admin_animalize(M) + + else if(href_list["respawn"]) + if(!check_rights(R_SPAWN)) + return + + var/client/C = locate(href_list["respawn"]) + if(!istype(C)) + return + usr.client.respawn_character_proper(C) + + else if(href_list["togmutate"]) + if(!check_rights(R_SPAWN)) return + + var/mob/living/carbon/human/H = locate(href_list["togmutate"]) + if(!istype(H)) + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return + var/block=text2num(href_list["block"]) + usr.client.cmd_admin_toggle_block(H,block) + show_player_panel(H) + + else if(href_list["adminplayeropts"]) + var/mob/M = locate(href_list["adminplayeropts"]) + show_player_panel(M) + + else if(href_list["adminplayerobservejump"]) + if(!check_rights(R_MOD|R_ADMIN|R_SERVER)) return //VOREStation Edit + + var/mob/M = locate(href_list["adminplayerobservejump"]) + + var/client/C = usr.client + if(!isobserver(usr)) C.admin_ghost() + sleep(2) + C.do_jumptomob(M) + + else if(href_list["adminplayerobservefollow"]) + if(!check_rights(R_MOD|R_ADMIN|R_SERVER)) //VOREStation Edit + return + + var/mob/M = locate(href_list["adminplayerobservefollow"]) + + var/client/C = usr.client + if(!isobserver(usr)) C.admin_ghost() + var/mob/observer/dead/G = C.mob + sleep(2) + G.ManualFollow(M) + + else if(href_list["check_antagonist"]) + check_antagonists() + + else if(href_list["take_question"]) + + var/mob/M = locate(href_list["take_question"]) + if(ismob(M)) + var/take_msg = "ADMINHELP: [key_name(usr.client)] is attending to [key_name(M)]'s adminhelp, please don't dogpile them." + for(var/client/X in GLOB.admins) + if((R_ADMIN|R_MOD|R_SERVER) & X.holder.rights) //VOREStation Edit + to_chat(X, take_msg) + to_chat(M, "Your adminhelp is being attended to by [usr.client]. Thanks for your patience!") + // VoreStation Edit Start + if (config.chat_webhook_url) + spawn(0) + var/query_string = "type=admintake" + query_string += "&key=[url_encode(config.chat_webhook_key)]" + query_string += "&admin=[url_encode(key_name(usr.client))]" + query_string += "&user=[url_encode(key_name(M))]" + world.Export("[config.chat_webhook_url]?[query_string]") + // VoreStation Edit End + else + to_chat(usr, "Unable to locate mob.") + + else if(href_list["adminplayerobservecoodjump"]) + if(!check_rights(R_ADMIN|R_SERVER|R_MOD)) return //VOREStation Edit + + var/x = text2num(href_list["X"]) + var/y = text2num(href_list["Y"]) + var/z = text2num(href_list["Z"]) + + var/client/C = usr.client + if(!isobserver(usr)) C.admin_ghost() + sleep(2) + C.jumptocoord(x,y,z) + + else if(href_list["adminchecklaws"]) + output_ai_laws() + + else if(href_list["adminmoreinfo"]) + var/mob/M = locate(href_list["adminmoreinfo"]) + if(!ismob(M)) + to_chat(usr, "This can only be used on instances of type /mob") + return + + var/location_description = "" + var/special_role_description = "" + var/health_description = "" + var/gender_description = "" + var/turf/T = get_turf(M) + + //Location + if(isturf(T)) + if(isarea(T.loc)) + location_description = "([M.loc == T ? "at coordinates " : "in [M.loc] at coordinates "] [T.x], [T.y], [T.z] in area [T.loc])" + else + location_description = "([M.loc == T ? "at coordinates " : "in [M.loc] at coordinates "] [T.x], [T.y], [T.z])" + + //Job + antagonist + if(M.mind) + special_role_description = "Role: [M.mind.assigned_role]; Antagonist: [M.mind.special_role]; Has been rev: [(M.mind.has_been_rev)?"Yes":"No"]" + else + special_role_description = "Role: Mind datum missing Antagonist: Mind datum missing; Has been rev: Mind datum missing;" + + //Health + if(isliving(M)) + var/mob/living/L = M + var/status + switch (M.stat) + if (0) status = "Alive" + if (1) status = "Unconscious" + if (2) status = "Dead" + health_description = "Status = [status]" + health_description += "
Oxy: [L.getOxyLoss()] - Tox: [L.getToxLoss()] - Fire: [L.getFireLoss()] - Brute: [L.getBruteLoss()] - Clone: [L.getCloneLoss()] - Brain: [L.getBrainLoss()]" + else + health_description = "This mob type has no health to speak of." + + //Gener + switch(M.gender) + if(MALE,FEMALE) gender_description = "[M.gender]" + else gender_description = "[M.gender]" + + to_chat(src.owner, "Info about [M.name]:
\ + Mob type = [M.type]; Gender = [gender_description] Damage = [health_description]
\ + Name = [M.name]; Real_name = [M.real_name]; Mind_name = [M.mind?"[M.mind.name]":""]; Key = [M.key];
\ + Location = [location_description];
\ + [special_role_description]
\ + (PM) (PP) (VV) \ + (SM) ([admin_jump_link(M, src)]) (CA)") + + else if(href_list["adminspawncookie"]) + if(!check_rights(R_ADMIN|R_FUN|R_EVENT)) return + + var/mob/living/carbon/human/H = locate(href_list["adminspawncookie"]) + if(!ishuman(H)) + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return + + H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_l_hand ) + if(!(istype(H.l_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie))) + H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_r_hand ) + if(!(istype(H.r_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie))) + log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].") + message_admins("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].") + return + else + H.update_inv_r_hand()//To ensure the icon appears in the HUD + else + H.update_inv_l_hand() + log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]") + message_admins("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]") + feedback_inc("admin_cookies_spawned",1) + to_chat(H, "Your prayers have been answered!! You received the best cookie!") + + else if(href_list["adminsmite"]) + if(!check_rights(R_ADMIN|R_FUN|R_EVENT)) return + + var/mob/living/carbon/human/H = locate(href_list["adminsmite"]) + if(!ishuman(H)) + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return + + owner.smite(H) + + else if(href_list["BlueSpaceArtillery"]) + if(!check_rights(R_ADMIN|R_FUN|R_EVENT)) return + + var/mob/living/M = locate(href_list["BlueSpaceArtillery"]) + if(!isliving(M)) + to_chat(usr, "This can only be used on instances of type /mob/living") + return + + if(tgui_alert(src.owner, "Are you sure you wish to hit [key_name(M)] with Blue Space Artillery?", "Confirm Firing?", list("Yes", "No")) != "Yes") + return + + bluespace_artillery(M,src) + + else if(href_list["CentComReply"]) + var/mob/living/L = locate(href_list["CentComReply"]) + if(!istype(L)) + to_chat(usr, "This can only be used on instances of type /mob/living/") + return + + if(L.can_centcom_reply()) + var/input = sanitize(tgui_input_text(src.owner, "Please enter a message to reply to [key_name(L)] via their headset.","Outgoing message from CentCom", "")) + if(!input) return + + to_chat(src.owner, "You sent [input] to [L] via a secure channel.") + log_admin("[src.owner] replied to [key_name(L)]'s CentCom message with the message [input].") + message_admins("[src.owner] replied to [key_name(L)]'s CentCom message with: \"[input]\"") + if(!isAI(L)) + to_chat(L, "You hear something crackle in your headset for a moment before a voice speaks.") + to_chat(L, "Please stand by for a message from Central Command.") + to_chat(L, "Message as follows.") + to_chat(L, "[input]") + to_chat(L, "Message ends.") + else + to_chat(src.owner, "The person you are trying to contact does not have functional radio equipment.") + + + else if(href_list["SyndicateReply"]) + var/mob/living/carbon/human/H = locate(href_list["SyndicateReply"]) + if(!istype(H)) + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return + if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset)) + to_chat(usr, "The person you are trying to contact is not wearing a headset") + return + + var/input = sanitize(tgui_input_text(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from a shadowy figure...", "")) + if(!input) return + + to_chat(src.owner, "You sent [input] to [H] via a secure channel.") + log_admin("[src.owner] replied to [key_name(H)]'s illegal message with the message [input].") + to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks. \ + \"Please stand by for a message from your benefactor. Message as follows, agent. \"[input]\" Message ends.\"") + + else if(href_list["AdminFaxView"]) + var/obj/item/fax = locate(href_list["AdminFaxView"]) + if (istype(fax, /obj/item/weapon/paper)) + var/obj/item/weapon/paper/P = fax + P.show_content(usr,1) + else if (istype(fax, /obj/item/weapon/photo)) + var/obj/item/weapon/photo/H = fax + H.show(usr) + else if (istype(fax, /obj/item/weapon/paper_bundle)) + //having multiple people turning pages on a paper_bundle can cause issues + //open a browse window listing the contents instead + var/data = "" + var/obj/item/weapon/paper_bundle/B = fax + + for (var/page = 1, page <= B.pages.len, page++) + var/obj/pageobj = B.pages[page] + data += "Page [page] - [pageobj.name]
" + + usr << browse(data, "window=[B.name]") + else + to_chat(usr, "The faxed item is not viewable. This is probably a bug, and should be reported on the tracker: [fax.type]") + + else if (href_list["AdminFaxViewPage"]) + var/page = text2num(href_list["AdminFaxViewPage"]) + var/obj/item/weapon/paper_bundle/bundle = locate(href_list["paper_bundle"]) + + if (!bundle) return + + if (istype(bundle.pages[page], /obj/item/weapon/paper)) + var/obj/item/weapon/paper/P = bundle.pages[page] + P.show_content(src.owner, 1) + else if (istype(bundle.pages[page], /obj/item/weapon/photo)) + var/obj/item/weapon/photo/H = bundle.pages[page] + H.show(src.owner) + return + + else if(href_list["FaxReply"]) + var/mob/sender = locate(href_list["FaxReply"]) + var/obj/machinery/photocopier/faxmachine/fax = locate(href_list["originfax"]) + var/replyorigin = href_list["replyorigin"] + + + var/obj/item/weapon/paper/admin/P = new /obj/item/weapon/paper/admin( null ) //hopefully the null loc won't cause trouble for us + faxreply = P + + P.admindatum = src + P.origin = replyorigin + P.destination = fax + P.sender = sender + + P.adminbrowse() + + else if(href_list["jumpto"]) + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) + return + if(!config.allow_admin_jump) + tgui_alert_async(usr, "Admin jumping disabled") + return + + var/mob/M = locate(href_list["jumpto"]) + if(!M) + return + + var/turf/T = get_turf(M) + if(isturf(T)) + usr.on_mob_jump() + usr.forceMove(T) + feedback_add_details("admin_verb","JM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + log_and_message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]") + else + to_chat(usr, "This mob is not located in the game world.") + + else if(href_list["getmob"]) + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) + return + if(!config.allow_admin_jump) + tgui_alert_async(usr, "Admin jumping disabled") + return + if(tgui_alert(usr, "Confirm?", "Message", list("Yes", "No")) != "Yes") + return + + var/mob/M = locate(href_list["getmob"]) + if(!M) + return + M.on_mob_jump() + M.forceMove(get_turf(usr)) + var/msg = "[key_name_admin(usr)] jumped [key_name_admin(M)] to them" + log_and_message_admins(msg) + admin_ticket_log(M, msg) + feedback_add_details("admin_verb","GM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + else if(href_list["sendmob"]) + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) + return + if(!config.allow_admin_jump) + tgui_alert_async(usr, "Admin jumping disabled") + return + + var/mob/M = locate(href_list["sendmob"]) + if(!M) + return + + var/list/areachoices = return_sorted_areas() + var/choice = tgui_input_list(usr, "Pick an area:", "Send Mob", areachoices) + if(!choice) + return + + var/area/A = areachoices[choice] + if(!A) + return + + M.on_mob_jump() + M.forceMove(pick(get_area_turfs(A))) + var/msg = "[key_name_admin(usr)] teleported [ADMIN_LOOKUPFLW(M)]" + log_and_message_admins(msg) + admin_ticket_log(M, msg) + feedback_add_details("admin_verb","SMOB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + else if(href_list["narrateto"]) + if(!check_rights(R_ADMIN|R_EVENT|R_FUN)) return + + var/mob/M = locate(href_list["narrateto"]) + usr.client.cmd_admin_direct_narrate(M) + + else if(href_list["subtlemessage"]) + if(!check_rights(R_MOD|R_ADMIN|R_EVENT|R_FUN,0)) return + + var/mob/M = locate(href_list["subtlemessage"]) + usr.client.cmd_admin_subtle_message(M) + + else if(href_list["traitor"]) + if(!check_rights(R_ADMIN|R_MOD|R_EVENT)) return + + if(!ticker || !ticker.mode) + tgui_alert_async(usr, "The game hasn't started yet!") + return + + var/mob/M = locate(href_list["traitor"]) + if(!ismob(M)) + to_chat(usr, "This can only be used on instances of type /mob.") + return + show_traitor_panel(M) + + else if(href_list["create_object"]) + if(!check_rights(R_SPAWN)) return + return create_object(usr) + + else if(href_list["quick_create_object"]) + if(!check_rights(R_SPAWN)) return + return quick_create_object(usr) + + else if(href_list["create_turf"]) + if(!check_rights(R_SPAWN)) return + return create_turf(usr) + + else if(href_list["create_mob"]) + if(!check_rights(R_SPAWN)) return + return create_mob(usr) + + else if(href_list["object_list"]) //this is the laggiest thing ever + if(!check_rights(R_SPAWN)) return + + if(!config.allow_admin_spawning) + to_chat(usr, "Spawning of items is not allowed.") + return + + var/atom/loc = usr.loc + + var/dirty_paths + if (istext(href_list["object_list"])) + dirty_paths = list(href_list["object_list"]) + else if (istype(href_list["object_list"], /list)) + dirty_paths = href_list["object_list"] + + var/paths = list() + var/removed_paths = list() + + for(var/dirty_path in dirty_paths) + var/path = text2path(dirty_path) + if(!path) + removed_paths += dirty_path + continue + else if(!ispath(path, /obj) && !ispath(path, /turf) && !ispath(path, /mob)) + removed_paths += dirty_path + continue + else if(ispath(path, /obj/item/weapon/gun/energy/pulse_rifle)) + if(!check_rights(R_FUN,0)) + removed_paths += dirty_path + continue + else if(ispath(path, /obj/item/weapon/melee/energy/blade))//Not an item one should be able to spawn./N + if(!check_rights(R_FUN,0)) + removed_paths += dirty_path + continue + else if(ispath(path, /obj/effect/bhole)) + if(!check_rights(R_FUN,0)) + removed_paths += dirty_path + continue + paths += path + + if(!paths) + tgui_alert(usr, "The path list you sent is empty") + return + if(length(paths) > 5) + tgui_alert_async(usr, "Select fewer object types, (max 5)") + return + else if(length(removed_paths)) + tgui_alert_async(usr, "Removed:\n" + jointext(removed_paths, "\n")) + + var/list/offset = splittext(href_list["offset"],",") + var/number = dd_range(1, 100, text2num(href_list["object_count"])) + var/X = offset.len > 0 ? text2num(offset[1]) : 0 + var/Y = offset.len > 1 ? text2num(offset[2]) : 0 + var/Z = offset.len > 2 ? text2num(offset[3]) : 0 + var/tmp_dir = href_list["object_dir"] + var/obj_dir = tmp_dir ? text2num(tmp_dir) : 2 + if(!obj_dir || !(obj_dir in list(1,2,4,8,5,6,9,10))) + obj_dir = 2 + var/obj_name = sanitize(href_list["object_name"]) + var/where = href_list["object_where"] + if (!( where in list("onfloor","inhand","inmarked") )) + where = "onfloor" + + if( where == "inhand" ) + to_chat(usr, "Support for inhand not available yet. Will spawn on floor.") + where = "onfloor" + + if ( where == "inhand" ) //Can only give when human or monkey + if ( !( ishuman(usr) || issmall(usr) ) ) + to_chat(usr, "Can only spawn in hand when you're a human or a monkey.") + where = "onfloor" + else if ( usr.get_active_hand() ) + to_chat(usr, "Your active hand is full. Spawning on floor.") + where = "onfloor" + + if ( where == "inmarked" ) + if ( !marked_datum ) + to_chat(usr, "You don't have any object marked. Abandoning spawn.") + return + else + if ( !istype(marked_datum,/atom) ) + to_chat(usr, "The object you have marked cannot be used as a target. Target must be of type /atom. Abandoning spawn.") + return + + var/atom/target //Where the object will be spawned + switch ( where ) + if ( "onfloor" ) + switch (href_list["offset_type"]) + if ("absolute") + target = locate(0 + X,0 + Y,0 + Z) + if ("relative") + target = locate(loc.x + X,loc.y + Y,loc.z + Z) + if ( "inmarked" ) + target = marked_datum + + if(target) + for (var/path in paths) + for (var/i = 0; i < number; i++) + if(path in typesof(/turf)) + var/turf/O = target + var/turf/N = O.ChangeTurf(path) + if(N) + if(obj_name) + N.name = obj_name + else + var/atom/O = new path(target) + if(O) + O.set_dir(obj_dir) + if(obj_name) + O.name = obj_name + if(istype(O,/mob)) + var/mob/M = O + M.real_name = obj_name + + log_and_message_admins("created [number] [english_list(paths)]") + return + + else if(href_list["admin_secrets_panel"]) + var/datum/admin_secret_category/AC = locate(href_list["admin_secrets_panel"]) in admin_secrets.categories + src.Secrets(AC) + + else if(href_list["admin_secrets"]) + var/datum/admin_secret_item/item = locate(href_list["admin_secrets"]) in admin_secrets.items + item.execute(usr) + + else if(href_list["ac_view_wanted"]) //Admin newscaster Topic() stuff be here + src.admincaster_screen = 18 //The ac_ prefix before the hrefs stands for AdminCaster. + src.access_news_network() + + else if(href_list["ac_set_channel_name"]) + src.admincaster_feed_channel.channel_name = sanitizeSafe(tgui_input_text(usr, "Provide a Feed Channel Name", "Network Channel Handler", "")) + src.access_news_network() + + else if(href_list["ac_set_channel_lock"]) + src.admincaster_feed_channel.locked = !src.admincaster_feed_channel.locked + src.access_news_network() + + else if(href_list["ac_submit_new_channel"]) + var/check = 0 + for(var/datum/feed_channel/FC in news_network.network_channels) + if(FC.channel_name == src.admincaster_feed_channel.channel_name) + check = 1 + break + if(src.admincaster_feed_channel.channel_name == "" || src.admincaster_feed_channel.channel_name == "\[REDACTED\]" || check ) + src.admincaster_screen=7 + else + var/choice = tgui_alert(usr, "Please confirm Feed channel creation","Network Channel Handler",list("Confirm","Cancel")) + if(choice=="Confirm") + news_network.CreateFeedChannel(admincaster_feed_channel.channel_name, admincaster_signature, admincaster_feed_channel.locked, 1) + feedback_inc("newscaster_channels",1) //Adding channel to the global network + log_admin("[key_name_admin(usr)] created command feed channel: [src.admincaster_feed_channel.channel_name]!") + src.admincaster_screen=5 + src.access_news_network() + + else if(href_list["ac_set_channel_receiving"]) + var/list/available_channels = list() + for(var/datum/feed_channel/F in news_network.network_channels) + available_channels += F.channel_name + src.admincaster_feed_channel.channel_name = sanitizeSafe(tgui_input_list(usr, "Choose receiving Feed Channel", "Network Channel Handler", available_channels )) + src.access_news_network() + + else if(href_list["ac_set_new_title"]) + src.admincaster_feed_message.title = sanitize(tgui_input_text(usr, "Enter the Feed title", "Network Channel Handler", "")) + src.access_news_network() + + else if(href_list["ac_set_new_message"]) + src.admincaster_feed_message.body = sanitize(tgui_input_text(usr, "Write your Feed story", "Network Channel Handler", "", multiline = TRUE, prevent_enter = TRUE)) + src.access_news_network() + + else if(href_list["ac_submit_new_message"]) + if(src.admincaster_feed_message.body =="" || admincaster_feed_message.title == "" || admincaster_feed_message.body =="\[REDACTED\]" || admincaster_feed_channel.channel_name == "" ) + src.admincaster_screen = 6 + else + feedback_inc("newscaster_stories",1) + news_network.SubmitArticle(admincaster_feed_message.body, admincaster_signature, admincaster_feed_channel.channel_name, null, 1, "", admincaster_feed_message.title) + src.admincaster_screen=4 + + log_admin("[key_name_admin(usr)] submitted a feed story to channel: [src.admincaster_feed_channel.channel_name]!") + src.access_news_network() + + else if(href_list["ac_create_channel"]) + src.admincaster_screen=2 + src.access_news_network() + + else if(href_list["ac_create_feed_story"]) + src.admincaster_screen=3 + src.access_news_network() + + else if(href_list["ac_menu_censor_story"]) + src.admincaster_screen=10 + src.access_news_network() + + else if(href_list["ac_menu_censor_channel"]) + src.admincaster_screen=11 + src.access_news_network() + + else if(href_list["ac_menu_wanted"]) + var/already_wanted = 0 + if(news_network.wanted_issue) + already_wanted = 1 + + if(already_wanted) + src.admincaster_feed_message.author = news_network.wanted_issue.author + src.admincaster_feed_message.body = news_network.wanted_issue.body + src.admincaster_screen = 14 + src.access_news_network() + + else if(href_list["ac_set_wanted_name"]) + src.admincaster_feed_message.author = sanitize(tgui_input_text(usr, "Provide the name of the Wanted person", "Network Security Handler", "")) + src.access_news_network() + + else if(href_list["ac_set_wanted_desc"]) + src.admincaster_feed_message.body = sanitize(tgui_input_text(usr, "Provide the a description of the Wanted person and any other details you deem important", "Network Security Handler", "")) + src.access_news_network() + + else if(href_list["ac_submit_wanted"]) + var/input_param = text2num(href_list["ac_submit_wanted"]) + if(src.admincaster_feed_message.author == "" || src.admincaster_feed_message.body == "") + src.admincaster_screen = 16 + else + var/choice = tgui_alert(usr, "Please confirm Wanted Issue [(input_param==1) ? ("creation.") : ("edit.")]","Network Security Handler",list("Confirm","Cancel")) + if(choice=="Confirm") + if(input_param==1) //If input_param == 1 we're submitting a new wanted issue. At 2 we're just editing an existing one. See the else below + var/datum/feed_message/WANTED = new /datum/feed_message + WANTED.author = src.admincaster_feed_message.author //Wanted name + WANTED.body = src.admincaster_feed_message.body //Wanted desc + WANTED.backup_author = src.admincaster_signature //Submitted by + WANTED.is_admin_message = 1 + news_network.wanted_issue = WANTED + for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allCasters) + NEWSCASTER.newsAlert() + NEWSCASTER.update_icon() + src.admincaster_screen = 15 + else + news_network.wanted_issue.author = src.admincaster_feed_message.author + news_network.wanted_issue.body = src.admincaster_feed_message.body + news_network.wanted_issue.backup_author = src.admincaster_feed_message.backup_author + src.admincaster_screen = 19 + log_admin("[key_name_admin(usr)] issued a Station-wide Wanted Notification for [src.admincaster_feed_message.author]!") + src.access_news_network() + + else if(href_list["ac_cancel_wanted"]) + var/choice = tgui_alert(usr, "Please confirm Wanted Issue removal","Network Security Handler",list("Confirm","Cancel")) + if(choice=="Confirm") + news_network.wanted_issue = null + for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allCasters) + NEWSCASTER.update_icon() + src.admincaster_screen=17 + src.access_news_network() + + else if(href_list["ac_censor_channel_author"]) + var/datum/feed_channel/FC = locate(href_list["ac_censor_channel_author"]) + if(FC.author != "\[REDACTED\]") + FC.backup_author = FC.author + FC.author = "\[REDACTED\]" + else + FC.author = FC.backup_author + src.access_news_network() + + else if(href_list["ac_censor_channel_story_author"]) + var/datum/feed_message/MSG = locate(href_list["ac_censor_channel_story_author"]) + if(MSG.author != "\[REDACTED\]") + MSG.backup_author = MSG.author + MSG.author = "\[REDACTED\]" + else + MSG.author = MSG.backup_author + src.access_news_network() + + else if(href_list["ac_censor_channel_story_body"]) + var/datum/feed_message/MSG = locate(href_list["ac_censor_channel_story_body"]) + if(MSG.body != "\[REDACTED\]") + MSG.backup_body = MSG.body + MSG.body = "\[REDACTED\]" + else + MSG.body = MSG.backup_body + src.access_news_network() + + else if(href_list["ac_pick_d_notice"]) + var/datum/feed_channel/FC = locate(href_list["ac_pick_d_notice"]) + src.admincaster_feed_channel = FC + src.admincaster_screen=13 + src.access_news_network() + + else if(href_list["ac_toggle_d_notice"]) + var/datum/feed_channel/FC = locate(href_list["ac_toggle_d_notice"]) + FC.censored = !FC.censored + src.access_news_network() + + else if(href_list["ac_view"]) + src.admincaster_screen=1 + src.access_news_network() + + else if(href_list["ac_setScreen"]) //Brings us to the main menu and resets all fields~ + src.admincaster_screen = text2num(href_list["ac_setScreen"]) + if (src.admincaster_screen == 0) + if(src.admincaster_feed_channel) + src.admincaster_feed_channel = new /datum/feed_channel + if(src.admincaster_feed_message) + src.admincaster_feed_message = new /datum/feed_message + src.access_news_network() + + else if(href_list["ac_show_channel"]) + var/datum/feed_channel/FC = locate(href_list["ac_show_channel"]) + src.admincaster_feed_channel = FC + src.admincaster_screen = 9 + src.access_news_network() + + else if(href_list["ac_pick_censor_channel"]) + var/datum/feed_channel/FC = locate(href_list["ac_pick_censor_channel"]) + src.admincaster_feed_channel = FC + src.admincaster_screen = 12 + src.access_news_network() + + else if(href_list["ac_refresh"]) + src.access_news_network() + + else if(href_list["ac_set_signature"]) + src.admincaster_signature = sanitize(tgui_input_text(usr, "Provide your desired signature", "Network Identity Handler", "")) + src.access_news_network() + + else if(href_list["populate_inactive_customitems"]) + if(check_rights(R_ADMIN|R_SERVER)) + populate_inactive_customitems_list(src.owner) + + else if(href_list["vsc"]) + if(check_rights(R_ADMIN|R_SERVER|R_EVENT)) + if(href_list["vsc"] == "airflow") + vsc.ChangeSettingsDialog(usr,vsc.settings) + if(href_list["vsc"] == "phoron") + vsc.ChangeSettingsDialog(usr,vsc.plc.settings) + if(href_list["vsc"] == "default") + vsc.SetDefault(usr) + + else if(href_list["toglang"]) + if(check_rights(R_SPAWN)) //VOREStation Edit + var/mob/M = locate(href_list["toglang"]) + if(!istype(M)) + to_chat(usr, "[M] is illegal type, must be /mob!") + return + var/lang2toggle = href_list["lang"] + var/datum/language/L = GLOB.all_languages[lang2toggle] + + if(L in M.languages) + if(!M.remove_language(lang2toggle)) + to_chat(usr, "Failed to remove language '[lang2toggle]' from \the [M]!") + else + if(!M.add_language(lang2toggle)) + to_chat(usr, "Failed to add language '[lang2toggle]' from \the [M]!") + + show_player_panel(M) + + else if(href_list["cryoplayer"]) + if(!check_rights(R_ADMIN|R_EVENT)) return + + var/mob/living/carbon/M = locate(href_list["cryoplayer"]) //VOREStation edit from just an all mob check to mob/living/carbon + if(!istype(M)) + to_chat(usr, "Mob doesn't exist!") + return + + var/client/C = usr.client + C.despawn_player(M) + + // player info stuff + + if(href_list["notes"]) + var/ckey = href_list["ckey"] + if(!ckey) + var/mob/M = locate(href_list["mob"]) + if(ismob(M)) + ckey = M.ckey + + switch(href_list["notes"]) + if("show") + var/datum/tgui_module/player_notes_info/A = new(src) + A.key = ckey + A.tgui_interact(usr) + if("list") + var/filter + if(href_list["filter"] && href_list["filter"] != "0") + filter = url_decode(href_list["filter"]) + PlayerNotesPage(text2num(href_list["index"]), filter) + if("filter") + PlayerNotesFilter() + return + +/mob/living/proc/can_centcom_reply() + return 0 + +/mob/living/carbon/human/can_centcom_reply() + return istype(l_ear, /obj/item/device/radio/headset) || istype(r_ear, /obj/item/device/radio/headset) + +/mob/living/silicon/ai/can_centcom_reply() + return common_radio != null && !check_unable(2) + +/atom/proc/extra_admin_link() + return + +/mob/extra_admin_link(var/source) + if(client && eyeobj) + return "|EYE" + +/mob/observer/dead/extra_admin_link(var/source) + if(mind && mind.current) + return "|BDY" + +/proc/admin_jump_link(var/atom/target, var/source) + if(!target) return + // The way admin jump links handle their src is weirdly inconsistent... + if(istype(source, /datum/admins)) + source = "src=\ref[source]" + else + source = "_src_=holder" + + . = "JMP" + . += target.extra_admin_link(source) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 2f6cfc3a21..cad1c9fb15 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -459,7 +459,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) usr << browse(dat.Join(), "window=ahelp[id];size=620x480") /datum/admin_help/proc/Retitle() - var/new_title = input(usr, "Enter a title for the ticket", "Rename Ticket", name) as text|null + var/new_title = tgui_input_text(usr, "Enter a title for the ticket", "Rename Ticket", name) if(new_title) name = new_title //not saying the original name cause it could be a long ass message diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index c108bbf14b..ee127136da 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -210,13 +210,13 @@ if(config.allow_admin_jump) if(isnull(tx)) - tx = input(usr, "Select X coordinate", "Move Atom", null, null) as null|num + tx = tgui_input_number(usr, "Select X coordinate", "Move Atom", null, null) if(!tx) return if(isnull(ty)) - ty = input(usr, "Select Y coordinate", "Move Atom", null, null) as null|num + ty = tgui_input_number(usr, "Select Y coordinate", "Move Atom", null, null) if(!ty) return if(isnull(tz)) - tz = input(usr, "Select Z coordinate", "Move Atom", null, null) as null|num + tz = tgui_input_number(usr, "Select Z coordinate", "Move Atom", null, null) if(!tz) return var/turf/T = locate(tx, ty, tz) if(!T) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index a25fac29e9..592b20b358 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -57,7 +57,7 @@ if(AH) message_admins("[key_name_admin(src)] has started replying to [key_name(C, 0, 0)]'s admin help.") - var/msg = input(src,"Message:", "Private message to [key_name(C, 0, 0)]") as text|null + var/msg = tgui_input_text(src,"Message:", "Private message to [key_name(C, 0, 0)]") if (!msg) message_admins("[key_name_admin(src)] has cancelled their reply to [key_name(C, 0, 0)]'s admin help.") return @@ -92,7 +92,7 @@ if(!ircreplyamount) //to prevent people from spamming irc return if(!msg) - msg = input(src,"Message:", "Private message to Administrator") as text|null + msg = tgui_input_text(src,"Message:", "Private message to Administrator") if(!msg) return @@ -112,7 +112,7 @@ //get message text, limit it's length.and clean/escape html if(!msg) - msg = input(src,"Message:", "Private message to [key_name(recipient, 0, 0)]") as text|null + msg = tgui_input_text(src,"Message:", "Private message to [key_name(recipient, 0, 0)]") if(!msg) return @@ -188,7 +188,7 @@ spawn() //so we don't hold the caller proc up var/sender = src var/sendername = key - var/reply = input(recipient, msg,"Admin PM from-[sendername]", "") as text|null //show message and await a reply + var/reply = tgui_input_text(recipient, msg,"Admin PM from-[sendername]", "") //show message and await a reply if(recipient && reply) if(sender) recipient.cmd_admin_pm(sender,reply) //sender is still about, let's reply to them diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm index 290b04bdde..f4715c8f1c 100644 --- a/code/modules/admin/verbs/buildmode.dm +++ b/code/modules/admin/verbs/buildmode.dm @@ -257,16 +257,16 @@ if(BUILDMODE_EDIT) var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine") - master.buildmode.varholder = input(usr,"Enter variable name:" ,"Name", "name") + master.buildmode.varholder = tgui_input_text(usr,"Enter variable name:" ,"Name", "name") if(master.buildmode.varholder in locked && !check_rights(R_DEBUG,0)) return 1 var/thetype = tgui_input_list(usr,"Select variable type:", "Type", list("text","number","mob-reference","obj-reference","turf-reference")) if(!thetype) return 1 switch(thetype) if("text") - master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value", "value") as text + master.buildmode.valueholder = tgui_input_text(usr,"Enter variable value:" ,"Value", "value") if("number") - master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value", 123) as num + master.buildmode.valueholder = tgui_input_number(usr,"Enter variable value:" ,"Value", 123) if("mob-reference") master.buildmode.valueholder = tgui_input_list(usr,"Enter variable value:", "Value", mob_list) if("obj-reference") @@ -286,11 +286,11 @@ var/choice = tgui_alert(usr, "Change the new light range, power, or color?", "Light Maker", list("Range", "Power", "Color")) switch(choice) if("Range") - var/input = input(usr, "New light range.","Light Maker",3) as null|num + var/input = tgui_input_number(usr, "New light range.","Light Maker",3) if(input) new_light_range = input if("Power") - var/input = input(usr, "New light power.","Light Maker",3) as null|num + var/input = tgui_input_number(usr, "New light power.","Light Maker",3) if(input) new_light_intensity = input if("Color") @@ -625,7 +625,7 @@ return /obj/effect/bmode/buildmode/proc/get_path_from_partial_text(default_path) - var/desired_path = input(usr, "Enter full or partial typepath.","Typepath","[default_path]") + var/desired_path = tgui_input_text(usr, "Enter full or partial typepath.","Typepath","[default_path]") var/list/types = typesof(/atom) var/list/matches = list() @@ -643,7 +643,7 @@ if(matches.len==1) result = matches[1] else - result = tgui_input_list(usr, "Select an atom type", "Spawn Atom", matches) + result = tgui_input_list(usr, "Select an atom type", "Spawn Atom", matches, strict_modern = TRUE) if(!objholder) result = default_path return result diff --git a/code/modules/admin/verbs/change_appearance.dm b/code/modules/admin/verbs/change_appearance.dm index 717a8ce5bd..2cafd14ee4 100644 --- a/code/modules/admin/verbs/change_appearance.dm +++ b/code/modules/admin/verbs/change_appearance.dm @@ -74,7 +74,7 @@ M.g_skin = hex2num(copytext(new_skin, 4, 6)) M.b_skin = hex2num(copytext(new_skin, 6, 8)) - var/new_tone = input(usr, "Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation") as text + var/new_tone = tgui_input_number(usr, "Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation", null, 220, 1) if (new_tone) M.s_tone = max(min(round(text2num(new_tone)), 220), 1) diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index 51f0364843..477f2f032c 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -12,7 +12,7 @@ if("explosion") if(tgui_alert(usr, "The game will be over. Are you really sure?", "Confirmation", list("Continue","Cancel")) == "Cancel") return - var/parameter = input(src,"station_missed = ?","Enter Parameter",0) as num + var/parameter = tgui_input_number(src,"station_missed = ?","Enter Parameter",0,1,0) var/override switch(parameter) if(1) diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm index 6b92e9932e..de4032f966 100644 --- a/code/modules/admin/verbs/custom_event.dm +++ b/code/modules/admin/verbs/custom_event.dm @@ -7,7 +7,7 @@ to_chat(src, "Only administrators may use this command.") return - var/input = sanitize(input(usr, "Enter the description of the custom event. Be descriptive. To cancel the event, make this blank or hit cancel.", "Custom Event", custom_event_msg) as message|null, MAX_PAPER_MESSAGE_LEN, extra = 0) + var/input = sanitize(tgui_input_text(usr, "Enter the description of the custom event. Be descriptive. To cancel the event, make this blank or hit cancel.", "Custom Event", custom_event_msg, MAX_PAPER_MESSAGE_LEN, TRUE, prevent_enter = TRUE), MAX_PAPER_MESSAGE_LEN, extra = 0) if(!input || input == "") custom_event_msg = null log_admin("[usr.key] has cleared the custom event text.") diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 8b0baa5967..c2e4b671f7 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -129,31 +129,35 @@ M.Animalize() -/client/proc/makepAI(var/turf/T in mob_list) +/client/proc/makepAI() set category = "Fun" set name = "Make pAI" - set desc = "Specify a location to spawn a pAI device, then specify a key to play that pAI" + set desc = "Spawn someone in as a pAI!" + if(!check_rights(R_ADMIN|R_EVENT|R_DEBUG)) + return + var/turf/T = get_turf(mob) var/list/available = list() for(var/mob/C in mob_list) - if(C.key) + if(C.key && isobserver(C)) available.Add(C) var/mob/choice = tgui_input_list(usr, "Choose a player to play the pAI", "Spawn pAI", available) if(!choice) return 0 - if(!istype(choice, /mob/observer/dead)) - var/confirm = tgui_alert(usr, "[choice.key] isn't ghosting right now. Are you sure you want to yank them out of them out of their body and place them in this pAI?", "Spawn pAI Confirmation", list("No", "Yes")) - if(confirm != "Yes") - return 0 - var/obj/item/device/paicard/card = new(T) + var/obj/item/device/paicard/typeb/card = new(T) var/mob/living/silicon/pai/pai = new(card) - pai.name = sanitizeSafe(input(choice, "Enter your pAI name:", "pAI Name", "Personal AI") as text) pai.real_name = pai.name pai.key = choice.key card.setPersonality(pai) + if(tgui_alert(pai, "Do you want to load your pAI data?", "Load", list("Yes", "No")) == "Yes") + pai.savefile_load(pai) + else + pai.name = sanitizeSafe(tgui_input_text(pai, "Enter your pAI name:", "pAI Name", "Personal AI")) + card.setPersonality(pai) for(var/datum/paiCandidate/candidate in paiController.pai_candidates) if(candidate.key == choice.key) paiController.pai_candidates.Remove(candidate) + log_admin("made a pAI with key=[pai.key] at ([T.x],[T.y],[T.z])") feedback_add_details("admin_verb","MPAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_alienize(var/mob/M in mob_list) @@ -658,9 +662,9 @@ var/datum/planet/planet = tgui_input_list(usr, "Which planet do you want to modify time on?", "Change Time", SSplanets.planets) if(istype(planet)) var/datum/time/current_time_datum = planet.current_time - var/new_hour = input(usr, "What hour do you want to change to?", "Change Time", text2num(current_time_datum.show_time("hh"))) as null|num + var/new_hour = tgui_input_number(usr, "What hour do you want to change to?", "Change Time", text2num(current_time_datum.show_time("hh"))) if(!isnull(new_hour)) - var/new_minute = input(usr, "What minute do you want to change to?", "Change Time", text2num(current_time_datum.show_time("mm")) ) as null|num + var/new_minute = tgui_input_number(usr, "What minute do you want to change to?", "Change Time", text2num(current_time_datum.show_time("mm")) ) if(!isnull(new_minute)) var/type_needed = current_time_datum.type var/datum/time/new_time = new type_needed() diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index b70a091980..ce39bbb0b8 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -177,7 +177,7 @@ set desc = "This searches all the active jobban entries for the current round and outputs the results to standard output." set category = "Debug" - var/job_filter = input(usr, "Contains what?","Job Filter") as text|null + var/job_filter = tgui_input_text(usr, "Contains what?","Job Filter") if(!job_filter) return diff --git a/code/modules/admin/verbs/dice.dm b/code/modules/admin/verbs/dice.dm index 2aa6f91a66..cc21521859 100644 --- a/code/modules/admin/verbs/dice.dm +++ b/code/modules/admin/verbs/dice.dm @@ -4,8 +4,8 @@ if(!check_rights(R_FUN)) return - var/sum = input(usr, "How many times should we throw?") as num - var/side = input(usr, "Select the number of sides.") as num + var/sum = tgui_input_number(usr, "How many times should we throw?") + var/side = tgui_input_number(usr, "Select the number of sides.") if(!side) side = 6 if(!sum) diff --git a/code/modules/admin/verbs/fps.dm b/code/modules/admin/verbs/fps.dm index 4b357a704d..c3b9999afb 100644 --- a/code/modules/admin/verbs/fps.dm +++ b/code/modules/admin/verbs/fps.dm @@ -8,7 +8,7 @@ if(!check_rights(R_DEBUG)) return - var/new_fps = round(input(usr, "Sets game frames-per-second. Can potentially break the game (default: [config.fps])", "FPS", world.fps) as num|null) + var/new_fps = round(tgui_input_number(usr, "Sets game frames-per-second. Can potentially break the game (default: [config.fps])", "FPS", world.fps)) if(new_fps <= 0) to_chat(src, "Error: set_server_fps(): Invalid world.fps value. No changes made.") return diff --git a/code/modules/admin/verbs/lightning_strike.dm b/code/modules/admin/verbs/lightning_strike.dm index d00fb4a1af..a123e16063 100644 --- a/code/modules/admin/verbs/lightning_strike.dm +++ b/code/modules/admin/verbs/lightning_strike.dm @@ -17,7 +17,7 @@ (JMP)") #define LIGHTNING_REDIRECT_RANGE 28 // How far in tiles certain things draw lightning from. -#define LIGHTNING_ZAP_RANGE 3 // How far the tesla effect zaps, as well as the bad effects from a direct strike. +#define LIGHTNING_ZAP_RANGE 3 // How far the tesla effect zaps, as well as the bad effects from a direct strike. // YW Edit: from 1 to 3. #define LIGHTNING_POWER 20000 // How much 'zap' is in a strike, used for tesla_zap(). // The real lightning proc. diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 31c4342606..64e66f912a 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -1,424 +1,424 @@ -//- Are all the floors with or without air, as they should be? (regular or airless) -//- Does the area have an APC? -//- Does the area have an Air Alarm? -//- Does the area have a Request Console? -//- Does the area have lights? -//- Does the area have a light switch? -//- Does the area have enough intercoms? -//- Does the area have enough security cameras? (Use the 'Camera Range Display' verb under Debug) -//- Is the area connected to the scrubbers air loop? -//- Is the area connected to the vent air loop? (vent pumps) -//- Is everything wired properly? -//- Does the area have a fire alarm and firedoors? -//- Do all pod doors work properly? -//- Are accesses set properly on doors, pod buttons, etc. -//- Are all items placed properly? (not below vents, scrubbers, tables) -//- Does the disposal system work properly from all the disposal units in this room and all the units, the pipes of which pass through this room? -//- Check for any misplaced or stacked piece of pipe (air and disposal) -//- Check for any misplaced or stacked piece of wire -//- Identify how hard it is to break into the area and where the weak points are -//- Check if the area has too much empty space. If so, make it smaller and replace the rest with maintenance tunnels. - -var/camera_range_display_status = 0 -var/intercom_range_display_status = 0 - -GLOBAL_LIST_BOILERPLATE(all_debugging_effects, /obj/effect/debugging) - -/obj/effect/debugging/camera_range - icon = 'icons/480x480.dmi' - icon_state = "25percent" - -/obj/effect/debugging/camera_range/New() - src.pixel_x = -224 - src.pixel_y = -224 - -/obj/effect/debugging/marker - icon = 'icons/turf/areas.dmi' - icon_state = "yellow" - -/obj/effect/debugging/marker/Move() - return 0 - -/client/proc/do_not_use_these() - set category = "Mapping" - set name = "-None of these are for ingame use!!" - -/client/proc/camera_view() - set category = "Mapping" - set name = "Camera Range Display" - - if(camera_range_display_status) - camera_range_display_status = 0 - else - camera_range_display_status = 1 - - - - for(var/obj/effect/debugging/camera_range/C in GLOB.all_debugging_effects) - qdel(C) - - if(camera_range_display_status) - for(var/obj/machinery/camera/C in cameranet.cameras) - new/obj/effect/debugging/camera_range(C.loc) - feedback_add_details("admin_verb","mCRD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - - -/client/proc/sec_camera_report() - set category = "Mapping" - set name = "Camera Report" - - if(!master_controller) - tgui_alert_async(usr,"Master_controller not found.","Sec Camera Report") - return 0 - - var/list/obj/machinery/camera/CL = list() - - for(var/obj/machinery/camera/C in cameranet.cameras) - CL += C - - var/output = {"CAMERA ANNOMALITIES REPORT
-The following annomalities have been detected. The ones in red need immediate attention: Some of those in black may be intentional.
- "}
-
- for(var/obj/machinery/camera/C1 in CL)
- for(var/obj/machinery/camera/C2 in CL)
- if(C1 != C2)
- if(C1.c_tag == C2.c_tag)
- output += "
+The following annomalities have been detected. The ones in red need immediate attention: Some of those in black may be intentional.
- "}
+
+ for(var/obj/machinery/camera/C1 in CL)
+ for(var/obj/machinery/camera/C2 in CL)
+ if(C1 != C2)
+ if(C1.c_tag == C2.c_tag)
+ output += "
" var/datum/species/S = GLOB.all_species[pref.species] + if(pref.alternate_languages.len > (S.num_alternate_languages + pref.extra_languages)) + testing("LANGSANI: Truncated [pref.client]'s character [pref.real_name || "-name not yet loaded-"] language list because it was too long (len: [pref.alternate_languages.len], allowed: [S.num_alternate_languages])") + pref.alternate_languages.len = (S.num_alternate_languages + pref.extra_languages) // Truncate to allowed length if(S.language) . += "- [S.language]
" if(S.default_language && S.default_language != S.language) . += "- [S.default_language]
" - if(S.num_alternate_languages) + if(S.num_alternate_languages + pref.extra_languages) if(pref.alternate_languages.len) for(var/i = 1 to pref.alternate_languages.len) var/lang = pref.alternate_languages[i] . += "- [lang] - remove
" - if(pref.alternate_languages.len < S.num_alternate_languages) - . += "- add ([S.num_alternate_languages - pref.alternate_languages.len] remaining)
" + if(pref.alternate_languages.len < (S.num_alternate_languages + pref.extra_languages)) + . += "- add ([(S.num_alternate_languages + pref.extra_languages) - pref.alternate_languages.len] remaining)
" else . += "- [pref.species] cannot choose secondary languages.
" @@ -68,7 +76,7 @@ return TOPIC_REFRESH else if(href_list["add_language"]) var/datum/species/S = GLOB.all_species[pref.species] - if(pref.alternate_languages.len >= S.num_alternate_languages) + if(pref.alternate_languages.len >= (S.num_alternate_languages + pref.extra_languages)) tgui_alert_async(user, "You have already selected the maximum number of alternate languages for this species!") else var/list/available_languages = S.secondary_langs.Copy() @@ -86,15 +94,19 @@ tgui_alert_async(user, "There are no additional languages available to select.") else var/new_lang = tgui_input_list(user, "Select an additional language", "Character Generation", available_languages) - if(new_lang && pref.alternate_languages.len < S.num_alternate_languages) - pref.alternate_languages |= new_lang + if(new_lang && pref.alternate_languages.len < (S.num_alternate_languages + pref.extra_languages)) + var/datum/language/chosen_lang = GLOB.all_languages[new_lang] + if(istype(chosen_lang)) + var/choice = tgui_alert(usr, "[chosen_lang.desc]",chosen_lang.name, list("Take","Cancel")) + if(choice != "Cancel" && pref.alternate_languages.len < (S.num_alternate_languages + pref.extra_languages)) + pref.alternate_languages |= new_lang return TOPIC_REFRESH else if(href_list["change_prefix"]) var/char var/keys[0] do - char = input(usr, "Enter a single special character.\nYou may re-select the same characters.\nThe following characters are already in use by radio: ; : .\nThe following characters are already in use by special say commands: ! * ^", "Enter Character - [3 - keys.len] remaining") as null|text + char = tgui_input_text(usr, "Enter a single special character.\nYou may re-select the same characters.\nThe following characters are already in use by radio: ; : .\nThe following characters are already in use by special say commands: ! * ^", "Enter Character - [3 - keys.len] remaining") if(char) if(length(char) > 1) tgui_alert_async(user, "Only single characters allowed.", "Error") diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 4db2d5ebe5..692a05cb54 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -1,1361 +1,1361 @@ -var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-") - -/datum/preferences - var/equip_preview_mob = EQUIP_PREVIEW_ALL - - var/icon/bgstate = "000" - var/list/bgstate_options = list("000", "midgrey", "FFF", "white", "steel", "techmaint", "dark", "plating", "reinforced") - - var/ear_style // Type of selected ear style - var/r_ears = 30 // Ear color. - var/g_ears = 30 // Ear color - var/b_ears = 30 // Ear color - var/r_ears2 = 30 // Ear extra color. - var/g_ears2 = 30 // Ear extra color - var/b_ears2 = 30 // Ear extra color - var/r_ears3 = 30 // Ear tertiary color. - var/g_ears3 = 30 // Ear tertiary color - var/b_ears3 = 30 // Ear tertiary color - var/tail_style // Type of selected tail style - var/r_tail = 30 // Tail/Taur color - var/g_tail = 30 // Tail/Taur color - var/b_tail = 30 // Tail/Taur color - var/r_tail2 = 30 // For extra overlay. - var/g_tail2 = 30 // For extra overlay. - var/b_tail2 = 30 // For extra overlay. - var/r_tail3 = 30 // For tertiary overlay. - var/g_tail3 = 30 // For tertiary overlay. - var/b_tail3 = 30 // For tertiary overlay. - var/wing_style // Type of selected wing style - var/r_wing = 30 // Wing color - var/g_wing = 30 // Wing color - var/b_wing = 30 // Wing color - var/r_wing2 = 30 // Wing extra color - var/g_wing2 = 30 // Wing extra color - var/b_wing2 = 30 // Wing extra color - var/r_wing3 = 30 // Wing tertiary color - var/g_wing3 = 30 // Wing tertiary color - var/b_wing3 = 30 // Wing tertiary color - -// Sanitize ear/wing/tail styles -/datum/preferences/proc/sanitize_body_styles() - - // Grandfather in anyone loading paths from a save. - if(ispath(ear_style, /datum/sprite_accessory)) - var/datum/sprite_accessory/instance = global.ear_styles_list[ear_style] - if(istype(instance)) - ear_style = instance.name - if(ispath(wing_style, /datum/sprite_accessory)) - var/datum/sprite_accessory/instance = global.wing_styles_list[wing_style] - if(istype(instance)) - wing_style = instance.name - if(ispath(tail_style, /datum/sprite_accessory)) - var/datum/sprite_accessory/instance = global.tail_styles_list[tail_style] - if(istype(instance)) - tail_style = instance.name - - // Sanitize for non-existent keys. - if(ear_style && !(ear_style in get_available_styles(global.ear_styles_list))) - ear_style = null - if(wing_style && !(wing_style in get_available_styles(global.wing_styles_list))) - wing_style = null - if(tail_style && !(tail_style in get_available_styles(global.tail_styles_list))) - tail_style = null - -/datum/preferences/proc/get_available_styles(var/style_list) - . = list("Normal" = null) - for(var/path in style_list) - var/datum/sprite_accessory/instance = style_list[path] - if(!istype(instance)) - continue - if(instance.ckeys_allowed && (!client || !(client.ckey in instance.ckeys_allowed))) - continue - if(instance.species_allowed && (!species || !(species in instance.species_allowed)) && (!client || !check_rights(R_ADMIN | R_EVENT | R_FUN, 0, client)) && (!custom_base || !(custom_base in instance.species_allowed))) //VOREStation Edit: Custom Species - continue - .[instance.name] = instance - -/datum/category_item/player_setup_item/general/body - name = "Body" - sort_order = 3 - -/datum/category_item/player_setup_item/general/body/load_character(var/savefile/S) - S["species"] >> pref.species - S["hair_red"] >> pref.r_hair - S["hair_green"] >> pref.g_hair - S["hair_blue"] >> pref.b_hair - S["facial_red"] >> pref.r_facial - S["grad_red"] >> pref.r_grad - S["grad_green"] >> pref.g_grad - S["grad_blue"] >> pref.b_grad - S["facial_green"] >> pref.g_facial - S["facial_blue"] >> pref.b_facial - S["skin_tone"] >> pref.s_tone - S["skin_red"] >> pref.r_skin - S["skin_green"] >> pref.g_skin - S["skin_blue"] >> pref.b_skin - S["hair_style_name"] >> pref.h_style - S["facial_style_name"] >> pref.f_style - S["grad_style_name"] >> pref.grad_style - S["eyes_red"] >> pref.r_eyes - S["eyes_green"] >> pref.g_eyes - S["eyes_blue"] >> pref.b_eyes - S["b_type"] >> pref.b_type - S["disabilities"] >> pref.disabilities - S["organ_data"] >> pref.organ_data - S["rlimb_data"] >> pref.rlimb_data - S["body_markings"] >> pref.body_markings - S["synth_color"] >> pref.synth_color - S["synth_red"] >> pref.r_synth - S["synth_green"] >> pref.g_synth - S["synth_blue"] >> pref.b_synth - S["synth_markings"] >> pref.synth_markings - S["bgstate"] >> pref.bgstate - S["body_descriptors"] >> pref.body_descriptors - S["ear_style"] >> pref.ear_style - S["r_ears"] >> pref.r_ears - S["g_ears"] >> pref.g_ears - S["b_ears"] >> pref.b_ears - S["r_ears2"] >> pref.r_ears2 - S["g_ears2"] >> pref.g_ears2 - S["b_ears2"] >> pref.b_ears2 - S["r_ears3"] >> pref.r_ears3 - S["g_ears3"] >> pref.g_ears3 - S["b_ears3"] >> pref.b_ears3 - S["tail_style"] >> pref.tail_style - S["r_tail"] >> pref.r_tail - S["g_tail"] >> pref.g_tail - S["b_tail"] >> pref.b_tail - S["r_tail2"] >> pref.r_tail2 - S["g_tail2"] >> pref.g_tail2 - S["b_tail2"] >> pref.b_tail2 - S["r_tail3"] >> pref.r_tail3 - S["g_tail3"] >> pref.g_tail3 - S["b_tail3"] >> pref.b_tail3 - S["wing_style"] >> pref.wing_style - S["r_wing"] >> pref.r_wing - S["g_wing"] >> pref.g_wing - S["b_wing"] >> pref.b_wing - S["r_wing2"] >> pref.r_wing2 - S["g_wing2"] >> pref.g_wing2 - S["b_wing2"] >> pref.b_wing2 - S["r_wing3"] >> pref.r_wing3 - S["g_wing3"] >> pref.g_wing3 - S["b_wing3"] >> pref.b_wing3 - S["Wingdings"] >> pref.wingdings //YWadd start - S["colorblind_mono"] >> pref.colorblind_mono - S["colorblind_vulp"] >> pref.colorblind_vulp - S["colorblind_taj"] >> pref.colorblind_taj - S["haemophilia"] >> pref.haemophilia //YWadd end - -/datum/category_item/player_setup_item/general/body/save_character(var/savefile/S) - S["species"] << pref.species - S["hair_red"] << pref.r_hair - S["hair_green"] << pref.g_hair - S["hair_blue"] << pref.b_hair - S["grad_red"] << pref.r_grad - S["grad_green"] << pref.g_grad - S["grad_blue"] << pref.b_grad - S["facial_red"] << pref.r_facial - S["facial_green"] << pref.g_facial - S["facial_blue"] << pref.b_facial - S["skin_tone"] << pref.s_tone - S["skin_red"] << pref.r_skin - S["skin_green"] << pref.g_skin - S["skin_blue"] << pref.b_skin - S["hair_style_name"] << pref.h_style - S["facial_style_name"] << pref.f_style - S["grad_style_name"] << pref.grad_style - S["eyes_red"] << pref.r_eyes - S["eyes_green"] << pref.g_eyes - S["eyes_blue"] << pref.b_eyes - S["b_type"] << pref.b_type - S["disabilities"] << pref.disabilities - S["organ_data"] << pref.organ_data - S["rlimb_data"] << pref.rlimb_data - S["body_markings"] << pref.body_markings - S["synth_color"] << pref.synth_color - S["synth_red"] << pref.r_synth - S["synth_green"] << pref.g_synth - S["synth_blue"] << pref.b_synth - S["synth_markings"] << pref.synth_markings - S["bgstate"] << pref.bgstate - S["body_descriptors"] << pref.body_descriptors - S["ear_style"] << pref.ear_style - S["r_ears"] << pref.r_ears - S["g_ears"] << pref.g_ears - S["b_ears"] << pref.b_ears - S["r_ears2"] << pref.r_ears2 - S["g_ears2"] << pref.g_ears2 - S["b_ears2"] << pref.b_ears2 - S["r_ears3"] << pref.r_ears3 - S["g_ears3"] << pref.g_ears3 - S["b_ears3"] << pref.b_ears3 - S["tail_style"] << pref.tail_style - S["r_tail"] << pref.r_tail - S["g_tail"] << pref.g_tail - S["b_tail"] << pref.b_tail - S["r_tail2"] << pref.r_tail2 - S["g_tail2"] << pref.g_tail2 - S["b_tail2"] << pref.b_tail2 - S["r_tail3"] << pref.r_tail3 - S["g_tail3"] << pref.g_tail3 - S["b_tail3"] << pref.b_tail3 - S["wing_style"] << pref.wing_style - S["r_wing"] << pref.r_wing - S["g_wing"] << pref.g_wing - S["b_wing"] << pref.b_wing - S["r_wing2"] << pref.r_wing2 - S["g_wing2"] << pref.g_wing2 - S["b_wing2"] << pref.b_wing2 - S["r_wing3"] << pref.r_wing3 - S["g_wing3"] << pref.g_wing3 - S["b_wing3"] << pref.b_wing3 - S["Wingdings"] << pref.wingdings //YWadd start - S["colorblind_mono"] << pref.colorblind_mono - S["colorblind_vulp"] << pref.colorblind_vulp - S["colorblind_taj"] << pref.colorblind_taj - S["haemophilia"] << pref.haemophilia //YWadd end - -/datum/category_item/player_setup_item/general/body/sanitize_character(var/savefile/S) - if(!pref.species || !(pref.species in GLOB.playable_species)) - pref.species = SPECIES_HUMAN - pref.r_hair = sanitize_integer(pref.r_hair, 0, 255, initial(pref.r_hair)) - pref.g_hair = sanitize_integer(pref.g_hair, 0, 255, initial(pref.g_hair)) - pref.b_hair = sanitize_integer(pref.b_hair, 0, 255, initial(pref.b_hair)) - pref.r_grad = sanitize_integer(pref.r_grad, 0, 255, initial(pref.r_grad)) - pref.g_grad = sanitize_integer(pref.g_grad, 0, 255, initial(pref.g_grad)) - pref.b_grad = sanitize_integer(pref.b_grad, 0, 255, initial(pref.b_grad)) - pref.r_facial = sanitize_integer(pref.r_facial, 0, 255, initial(pref.r_facial)) - pref.g_facial = sanitize_integer(pref.g_facial, 0, 255, initial(pref.g_facial)) - pref.b_facial = sanitize_integer(pref.b_facial, 0, 255, initial(pref.b_facial)) - pref.s_tone = sanitize_integer(pref.s_tone, -185, 34, initial(pref.s_tone)) - pref.r_skin = sanitize_integer(pref.r_skin, 0, 255, initial(pref.r_skin)) - pref.g_skin = sanitize_integer(pref.g_skin, 0, 255, initial(pref.g_skin)) - pref.b_skin = sanitize_integer(pref.b_skin, 0, 255, initial(pref.b_skin)) - pref.h_style = sanitize_inlist(pref.h_style, hair_styles_list, initial(pref.h_style)) - pref.f_style = sanitize_inlist(pref.f_style, facial_hair_styles_list, initial(pref.f_style)) - pref.grad_style = sanitize_inlist(pref.grad_style, GLOB.hair_gradients, initial(pref.grad_style)) - pref.r_eyes = sanitize_integer(pref.r_eyes, 0, 255, initial(pref.r_eyes)) - pref.g_eyes = sanitize_integer(pref.g_eyes, 0, 255, initial(pref.g_eyes)) - pref.b_eyes = sanitize_integer(pref.b_eyes, 0, 255, initial(pref.b_eyes)) - pref.b_type = sanitize_text(pref.b_type, initial(pref.b_type)) - - pref.disabilities = sanitize_integer(pref.disabilities, 0, 65535, initial(pref.disabilities)) - if(!pref.organ_data) pref.organ_data = list() - if(!pref.rlimb_data) pref.rlimb_data = list() - if(!pref.body_markings) pref.body_markings = list() - else pref.body_markings &= body_marking_styles_list - if(!pref.bgstate || !(pref.bgstate in pref.bgstate_options)) - pref.bgstate = "000" - - pref.r_ears = sanitize_integer(pref.r_ears, 0, 255, initial(pref.r_ears)) - pref.g_ears = sanitize_integer(pref.g_ears, 0, 255, initial(pref.g_ears)) - pref.b_ears = sanitize_integer(pref.b_ears, 0, 255, initial(pref.b_ears)) - pref.r_ears2 = sanitize_integer(pref.r_ears2, 0, 255, initial(pref.r_ears2)) - pref.g_ears2 = sanitize_integer(pref.g_ears2, 0, 255, initial(pref.g_ears2)) - pref.b_ears2 = sanitize_integer(pref.b_ears2, 0, 255, initial(pref.b_ears2)) - pref.r_ears3 = sanitize_integer(pref.r_ears3, 0, 255, initial(pref.r_ears3)) - pref.g_ears3 = sanitize_integer(pref.g_ears3, 0, 255, initial(pref.g_ears3)) - pref.b_ears3 = sanitize_integer(pref.b_ears3, 0, 255, initial(pref.b_ears3)) - pref.r_tail = sanitize_integer(pref.r_tail, 0, 255, initial(pref.r_tail)) - pref.g_tail = sanitize_integer(pref.g_tail, 0, 255, initial(pref.g_tail)) - pref.b_tail = sanitize_integer(pref.b_tail, 0, 255, initial(pref.b_tail)) - pref.r_tail2 = sanitize_integer(pref.r_tail2, 0, 255, initial(pref.r_tail2)) - pref.g_tail2 = sanitize_integer(pref.g_tail2, 0, 255, initial(pref.g_tail2)) - pref.b_tail2 = sanitize_integer(pref.b_tail2, 0, 255, initial(pref.b_tail2)) - pref.r_tail3 = sanitize_integer(pref.r_tail3, 0, 255, initial(pref.r_tail3)) - pref.g_tail3 = sanitize_integer(pref.g_tail3, 0, 255, initial(pref.g_tail3)) - pref.b_tail3 = sanitize_integer(pref.b_tail3, 0, 255, initial(pref.b_tail3)) - pref.r_wing = sanitize_integer(pref.r_wing, 0, 255, initial(pref.r_wing)) - pref.g_wing = sanitize_integer(pref.g_wing, 0, 255, initial(pref.g_wing)) - pref.b_wing = sanitize_integer(pref.b_wing, 0, 255, initial(pref.b_wing)) - pref.r_wing2 = sanitize_integer(pref.r_wing2, 0, 255, initial(pref.r_wing2)) - pref.g_wing2 = sanitize_integer(pref.g_wing2, 0, 255, initial(pref.g_wing2)) - pref.b_wing2 = sanitize_integer(pref.b_wing2, 0, 255, initial(pref.b_wing2)) - pref.r_wing3 = sanitize_integer(pref.r_wing3, 0, 255, initial(pref.r_wing3)) - pref.g_wing3 = sanitize_integer(pref.g_wing3, 0, 255, initial(pref.g_wing3)) - pref.b_wing3 = sanitize_integer(pref.b_wing3, 0, 255, initial(pref.b_wing3)) - - pref.sanitize_body_styles() - -// Moved from /datum/preferences/proc/copy_to() -/datum/category_item/player_setup_item/general/body/copy_to_mob(var/mob/living/carbon/human/character) - // Copy basic values - character.r_eyes = pref.r_eyes - character.g_eyes = pref.g_eyes - character.b_eyes = pref.b_eyes - character.h_style = pref.h_style - character.r_hair = pref.r_hair - character.g_hair = pref.g_hair - character.b_hair = pref.b_hair - character.r_grad = pref.r_grad - character.g_grad = pref.g_grad - character.b_grad = pref.b_grad - character.f_style = pref.f_style - character.r_facial = pref.r_facial - character.g_facial = pref.g_facial - character.b_facial = pref.b_facial - character.r_skin = pref.r_skin - character.g_skin = pref.g_skin - character.b_skin = pref.b_skin - character.s_tone = pref.s_tone - character.h_style = pref.h_style - character.f_style = pref.f_style - character.grad_style= pref.grad_style - character.b_type = pref.b_type - character.synth_color = pref.synth_color - character.r_synth = pref.r_synth - character.g_synth = pref.g_synth - character.b_synth = pref.b_synth - character.synth_markings = pref.synth_markings - //YWadd START - if(pref.species == "Grey")//YWadd START - character.wingdings = pref.wingdings - - if(pref.colorblind_mono == 1) - character.add_modifier(/datum/modifier/trait/colorblind_monochrome) - - else if(pref.colorblind_vulp == 1) - character.add_modifier(/datum/modifier/trait/colorblind_vulp) - - else if(pref.colorblind_taj == 1) - character.add_modifier(/datum/modifier/trait/colorblind_taj) - - if(pref.haemophilia == 1) - character.add_modifier(/datum/modifier/trait/haemophilia) - //YWadd END - var/list/ear_styles = pref.get_available_styles(global.ear_styles_list) - character.ear_style = ear_styles[pref.ear_style] - character.r_ears = pref.r_ears - character.b_ears = pref.b_ears - character.g_ears = pref.g_ears - character.r_ears2 = pref.r_ears2 - character.b_ears2 = pref.b_ears2 - character.g_ears2 = pref.g_ears2 - character.r_ears3 = pref.r_ears3 - character.b_ears3 = pref.b_ears3 - character.g_ears3 = pref.g_ears3 - - var/list/tail_styles = pref.get_available_styles(global.tail_styles_list) - character.tail_style = tail_styles[pref.tail_style] - character.r_tail = pref.r_tail - character.b_tail = pref.b_tail - character.g_tail = pref.g_tail - character.r_tail2 = pref.r_tail2 - character.b_tail2 = pref.b_tail2 - character.g_tail2 = pref.g_tail2 - character.r_tail3 = pref.r_tail3 - character.b_tail3 = pref.b_tail3 - character.g_tail3 = pref.g_tail3 - - var/list/wing_styles = pref.get_available_styles(global.wing_styles_list) - character.wing_style = wing_styles[pref.wing_style] - character.r_wing = pref.r_wing - character.b_wing = pref.b_wing - character.g_wing = pref.g_wing - character.r_wing2 = pref.r_wing2 - character.b_wing2 = pref.b_wing2 - character.g_wing2 = pref.g_wing2 - character.r_wing3 = pref.r_wing3 - character.b_wing3 = pref.b_wing3 - character.g_wing3 = pref.g_wing3 - - character.set_gender(pref.biological_gender) - - // Destroy/cyborgize organs and limbs. - character.synthetic = null //Clear the existing var. - for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO)) - var/status = pref.organ_data[name] - var/obj/item/organ/external/O = character.organs_by_name[name] - if(O) - if(status == "amputated") - O.remove_rejuv() - else if(status == "cyborg") - if(pref.rlimb_data[name]) - O.robotize(pref.rlimb_data[name]) - else - O.robotize() - - for(var/name in list(O_HEART,O_EYES,O_VOICE,O_LUNGS,O_LIVER,O_KIDNEYS,O_SPLEEN,O_STOMACH,O_INTESTINE,O_BRAIN)) - var/status = pref.organ_data[name] - if(!status) - continue - var/obj/item/organ/I = character.internal_organs_by_name[name] - if(istype(I, /obj/item/organ/internal/brain)) - var/obj/item/organ/external/E = character.get_organ(I.parent_organ) - if(E.robotic < ORGAN_ASSISTED) - continue - if(I) - if(status == "assisted") - I.mechassist() - else if(status == "mechanical") - I.robotize() - else if(status == "digital") - I.digitize() - - for(var/N in character.organs_by_name) - var/obj/item/organ/external/O = character.organs_by_name[N] - O.markings.Cut() - - for(var/M in pref.body_markings) - var/datum/sprite_accessory/marking/mark_datum = body_marking_styles_list[M] - var/mark_color = "[pref.body_markings[M]]" - - for(var/BP in mark_datum.body_parts) - var/obj/item/organ/external/O = character.organs_by_name[BP] - if(O) - O.markings[M] = list("color" = mark_color, "datum" = mark_datum) - - var/list/last_descriptors = list() - if(islist(pref.body_descriptors)) - last_descriptors = pref.body_descriptors.Copy() - pref.body_descriptors = list() - - var/datum/species/mob_species = GLOB.all_species[pref.species] - if(LAZYLEN(mob_species.descriptors)) - for(var/entry in mob_species.descriptors) - var/datum/mob_descriptor/descriptor = mob_species.descriptors[entry] - if(istype(descriptor)) - if(isnull(last_descriptors[entry])) - pref.body_descriptors[entry] = descriptor.default_value // Species datums have initial default value. - else - pref.body_descriptors[entry] = CLAMP(last_descriptors[entry], 1, LAZYLEN(descriptor.standalone_value_descriptors)) - -/datum/category_item/player_setup_item/general/body/content(var/mob/user) - . = list() - - var/datum/species/mob_species = GLOB.all_species[pref.species] - . += "
| Body "
- . += "(®)"
- . += " " - . += "Species: [pref.species] " - . += "Blood Type: [pref.b_type] " - if(has_flag(mob_species, HAS_SKIN_TONE)) - . += "Skin Tone: [-pref.s_tone + 35]/220 " - . += "Disabilities Adjust " // YWadd - //YWcommented moved onto disabilities. += "Needs Glasses: [pref.disabilities & NEARSIGHTED ? "Yes" : "No"] " - . += "Limbs: Adjust Reset " - . += "Internal Organs: Adjust " - //display limbs below - var/ind = 0 - for(var/name in pref.organ_data) - var/status = pref.organ_data[name] - var/organ_name = null - - switch(name) - if(BP_TORSO) - organ_name = "torso" - if(BP_GROIN) - organ_name = "groin" - if(BP_HEAD) - organ_name = "head" - if(BP_L_ARM) - organ_name = "left arm" - if(BP_R_ARM) - organ_name = "right arm" - if(BP_L_LEG) - organ_name = "left leg" - if(BP_R_LEG) - organ_name = "right leg" - if(BP_L_FOOT) - organ_name = "left foot" - if(BP_R_FOOT) - organ_name = "right foot" - if(BP_L_HAND) - organ_name = "left hand" - if(BP_R_HAND) - organ_name = "right hand" - if(O_HEART) - organ_name = "heart" - if(O_EYES) - organ_name = "eyes" - if(O_VOICE) - organ_name = "larynx" - if(O_BRAIN) - organ_name = "brain" - if(O_LUNGS) - organ_name = "lungs" - if(O_LIVER) - organ_name = "liver" - if(O_KIDNEYS) - organ_name = "kidneys" - if(O_SPLEEN) - organ_name = "spleen" - if(O_STOMACH) - organ_name = "stomach" - if(O_INTESTINE) - organ_name = "intestines" - - if(status == "cyborg") - ++ind - if(ind > 1) - . += ", " - var/datum/robolimb/R - if(pref.rlimb_data[name] && all_robolimbs[pref.rlimb_data[name]]) - R = all_robolimbs[pref.rlimb_data[name]] - else - R = basic_robolimb - . += "\t[R.company] [organ_name] prosthesis" - else if(status == "amputated") - ++ind - if(ind > 1) - . += ", " - . += "\tAmputated [organ_name]" - else if(status == "mechanical") - ++ind - if(ind > 1) - . += ", " - switch(organ_name) - if ("brain") - . += "\tPositronic [organ_name]" - else - . += "\tSynthetic [organ_name]" - else if(status == "digital") - ++ind - if(ind > 1) - . += ", " - . += "\tDigital [organ_name]" - else if(status == "assisted") - ++ind - if(ind > 1) - . += ", " - switch(organ_name) - if("heart") - . += "\tPacemaker-assisted [organ_name]" - if("lungs") - . += "\tAssisted [organ_name]" - if("voicebox") //on adding voiceboxes for speaking skrell/similar replacements - . += "\tSurgically altered [organ_name]" - if("eyes") - . += "\tRetinal overlayed [organ_name]" - if("brain") - . += "\tAssisted-interface [organ_name]" - else - . += "\tMechanically assisted [organ_name]" - if(!ind) - . += "\[...\] " - else - . += " " - - if(LAZYLEN(pref.body_descriptors)) - . += "
" - - . += " | Preview " - . += " Cycle background" - . += " [pref.equip_preview_mob & EQUIP_PREVIEW_LOADOUT ? "Hide loadout" : "Show loadout"]" - . += " [pref.equip_preview_mob & EQUIP_PREVIEW_JOB ? "Hide job gear" : "Show job gear"]" - . += " |
" - if(has_flag(mob_species, HAS_HAIR_COLOR)) - . += "Change Color [color_square(pref.r_hair, pref.g_hair, pref.b_hair)] " - . += " Style: < > [pref.h_style]
" //The < & > in this line is correct-- those extra characters are the arrows you click to switch between styles. - - . += "Gradient
" - . += "Change Color [color_square(pref.r_grad, pref.g_grad, pref.b_grad)] " - . += " Style: < > [pref.grad_style]
" - - . += "
Facial
" - if(has_flag(mob_species, HAS_HAIR_COLOR)) - . += "Change Color [color_square(pref.r_facial, pref.g_facial, pref.b_facial)] " - . += " Style: < > [pref.f_style]
" //Same as above with the extra > & < characters - - if(has_flag(mob_species, HAS_EYE_COLOR)) - . += "
Eyes
" - . += "Change Color [color_square(pref.r_eyes, pref.g_eyes, pref.b_eyes)]
" - - if(has_flag(mob_species, HAS_SKIN_COLOR)) - . += "
Body Color
" - . += "Change Color [color_square(pref.r_skin, pref.g_skin, pref.b_skin)]
" - - . += "
Genetics Settings
" - - var/list/ear_styles = pref.get_available_styles(global.ear_styles_list) - var/datum/sprite_accessory/ears/ear = ear_styles[pref.ear_style] - . += "Ears" - if(istype(ear)) - . += " Style: [ear.name]
" - if(ear.do_colouration) - . += "Change Color [color_square(pref.r_ears, pref.g_ears, pref.b_ears)]
" - if(ear.extra_overlay) - . += "Change Secondary Color [color_square(pref.r_ears2, pref.g_ears2, pref.b_ears2)]
" - if(ear.extra_overlay2) - . += "Change Tertiary Color [color_square(pref.r_ears3, pref.g_ears3, pref.b_ears3)]
" - else - . += " Style: Select
" - - var/list/tail_styles = pref.get_available_styles(global.tail_styles_list) - var/datum/sprite_accessory/tail/tail = tail_styles[pref.tail_style] - . += "Tail
" - if(istype(tail)) - . += " Style: [tail.name]
" - if(tail.do_colouration) - . += "Change Color [color_square(pref.r_tail, pref.g_tail, pref.b_tail)]
" - if(tail.extra_overlay) - . += "Change Secondary Color [color_square(pref.r_tail2, pref.g_tail2, pref.b_tail2)]
" - if(tail.extra_overlay2) - . += "Change Tertiary Color [color_square(pref.r_tail3, pref.g_tail3, pref.b_tail3)]
" - else - . += " Style: Select
" - - var/list/wing_styles = pref.get_available_styles(global.wing_styles_list) - var/datum/sprite_accessory/wing/wings = wing_styles[pref.wing_style] - . += "Wing
" - if(istype(wings)) - . += " Style: [wings.name]
" - if(wings.do_colouration) - . += "Change Color [color_square(pref.r_wing, pref.g_wing, pref.b_wing)]
" - if(wings.extra_overlay) - . += "Change Secondary Color [color_square(pref.r_wing2, pref.g_wing2, pref.b_wing2)]
" - if(wings.extra_overlay2) - . += "Change Secondary Color [color_square(pref.r_wing3, pref.g_wing3, pref.b_wing3)]
" - else - . += " Style: Select
" - - . += "
Body Markings +
" - . += "
| [M] | [pref.body_markings.len > 1 ? "˄ ˅ mv " : ""]- Color[color_square(hex = pref.body_markings[M])] |
" - . += "Allow Synth markings: [pref.synth_markings ? "Yes" : "No"]
" - . += "Allow Synth color: [pref.synth_color ? "Yes" : "No"]
" - if(pref.synth_color) - . += "Change Color [color_square(pref.r_synth, pref.g_synth, pref.b_synth)]" - - . = jointext(.,null) - -/datum/category_item/player_setup_item/general/body/proc/has_flag(var/datum/species/mob_species, var/flag) - return mob_species && (mob_species.appearance_flags & flag) - -/datum/category_item/player_setup_item/general/body/OnTopic(var/href,var/list/href_list, var/mob/user) - var/datum/species/mob_species = GLOB.all_species[pref.species] - - if(href_list["random"]) - pref.randomize_appearance_and_body_for() - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["change_descriptor"]) - if(mob_species.descriptors) - var/desc_id = href_list["change_descriptor"] - if(pref.body_descriptors[desc_id]) - var/datum/mob_descriptor/descriptor = mob_species.descriptors[desc_id] - var/choice = tgui_input_list(usr, "Please select a descriptor.", "Descriptor", descriptor.chargen_value_descriptors) - if(choice && mob_species.descriptors[desc_id]) // Check in case they sneakily changed species. - pref.body_descriptors[desc_id] = descriptor.chargen_value_descriptors[choice] - return TOPIC_REFRESH - - else if(href_list["blood_type"]) - var/new_b_type = tgui_input_list(user, "Choose your character's blood-type:", "Character Preference", valid_bloodtypes) - if(new_b_type && CanUseTopic(user)) - pref.b_type = new_b_type - return TOPIC_REFRESH - - else if(href_list["show_species"]) - // Actual whitelist checks are handled elsewhere, this is just for accessing the preview window. - var/choice = tgui_input_list(usr, "Which species would you like to look at?", "Species Choice", GLOB.playable_species) - if(!choice) return - pref.species_preview = choice - SetSpecies(preference_mob()) - pref.alternate_languages.Cut() // Reset their alternate languages. Todo: attempt to just fix it instead? - return TOPIC_HANDLED - - else if(href_list["disabilities_yw"]) - Disabilities_YW(usr) - - else if(href_list["set_species"]) - user << browse(null, "window=species") - if(!pref.species_preview || !(pref.species_preview in GLOB.all_species)) - return TOPIC_NOACTION - - var/datum/species/setting_species - - if(GLOB.all_species[href_list["set_species"]]) - setting_species = GLOB.all_species[href_list["set_species"]] - else - return TOPIC_NOACTION - - if(((!(setting_species.spawn_flags & SPECIES_CAN_JOIN)) || (!is_alien_whitelisted(preference_mob(),setting_species))) && !check_rights(R_ADMIN|R_EVENT, 0) && !(setting_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE)) //VOREStation Edit: selectability - return TOPIC_NOACTION - - var/prev_species = pref.species - pref.species = href_list["set_species"] - if(prev_species != pref.species) - if(!(pref.biological_gender in mob_species.genders)) - pref.set_biological_gender(mob_species.genders[1]) - pref.custom_species = null //VOREStation Edit - This is cleared on species changes - //grab one of the valid hair styles for the newly chosen species - var/list/valid_hairstyles = pref.get_valid_hairstyles() - - if(valid_hairstyles.len) - pref.h_style = pick(valid_hairstyles) - else - //this shouldn't happen - pref.h_style = hair_styles_list["Bald"] - - //grab one of the valid facial hair styles for the newly chosen species - var/list/valid_facialhairstyles = pref.get_valid_facialhairstyles() - - if(valid_facialhairstyles.len) - pref.f_style = pick(valid_facialhairstyles) - else - //this shouldn't happen - pref.f_style = facial_hair_styles_list["Shaved"] - - //reset hair colour and skin colour - pref.r_hair = 0//hex2num(copytext(new_hair, 2, 4)) - pref.g_hair = 0//hex2num(copytext(new_hair, 4, 6)) - pref.b_hair = 0//hex2num(copytext(new_hair, 6, 8)) - pref.s_tone = -75 - - reset_limbs() // Safety for species with incompatible manufacturers; easier than trying to do it case by case. - pref.body_markings.Cut() // Basically same as above. - - pref.sanitize_body_styles() - - var/min_age = get_min_age() - var/max_age = get_max_age() - pref.age = max(min(pref.age, max_age), min_age) - - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["hair_color"]) - if(!has_flag(mob_species, HAS_HAIR_COLOR)) - return TOPIC_NOACTION - var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference", rgb(pref.r_hair, pref.g_hair, pref.b_hair)) as color|null - if(new_hair && has_flag(mob_species, HAS_HAIR_COLOR) && CanUseTopic(user)) - pref.r_hair = hex2num(copytext(new_hair, 2, 4)) - pref.g_hair = hex2num(copytext(new_hair, 4, 6)) - pref.b_hair = hex2num(copytext(new_hair, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["grad_color"]) - if(!has_flag(mob_species, HAS_HAIR_COLOR)) - return TOPIC_NOACTION - var/new_grad = input(user, "Choose your character's secondary hair color:", "Character Preference", rgb(pref.r_grad, pref.g_grad, pref.b_grad)) as color|null - if(new_grad && has_flag(mob_species, HAS_HAIR_COLOR) && CanUseTopic(user)) - pref.r_grad = hex2num(copytext(new_grad, 2, 4)) - pref.g_grad = hex2num(copytext(new_grad, 4, 6)) - pref.b_grad = hex2num(copytext(new_grad, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["hair_style"]) - var/list/valid_hairstyles = pref.get_valid_hairstyles() - - var/new_h_style = tgui_input_list(user, "Choose your character's hair style:", "Character Preference", valid_hairstyles, pref.h_style) - if(new_h_style && CanUseTopic(user)) - pref.h_style = new_h_style - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["grad_style"]) - var/list/valid_gradients = GLOB.hair_gradients - - var/new_grad_style = tgui_input_list(user, "Choose a color pattern for your hair:", "Character Preference", valid_gradients, pref.grad_style) - if(new_grad_style && CanUseTopic(user)) - pref.grad_style = new_grad_style - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["hair_style_left"]) - var/H = href_list["hair_style_left"] - var/list/valid_hairstyles = pref.get_valid_hairstyles() - var/start = valid_hairstyles.Find(H) - - if(start != 1) //If we're not the beginning of the list, become the previous element. - pref.h_style = valid_hairstyles[start-1] - else //But if we ARE, become the final element. - pref.h_style = valid_hairstyles[valid_hairstyles.len] - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["hair_style_right"]) - var/H = href_list["hair_style_right"] - var/list/valid_hairstyles = pref.get_valid_hairstyles() - var/start = valid_hairstyles.Find(H) - - if(start != valid_hairstyles.len) //If we're not the end of the list, become the next element. - pref.h_style = valid_hairstyles[start+1] - else //But if we ARE, become the first element. - pref.h_style = valid_hairstyles[1] - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["facial_color"]) - if(!has_flag(mob_species, HAS_HAIR_COLOR)) - return TOPIC_NOACTION - var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference", rgb(pref.r_facial, pref.g_facial, pref.b_facial)) as color|null - if(new_facial && has_flag(mob_species, HAS_HAIR_COLOR) && CanUseTopic(user)) - pref.r_facial = hex2num(copytext(new_facial, 2, 4)) - pref.g_facial = hex2num(copytext(new_facial, 4, 6)) - pref.b_facial = hex2num(copytext(new_facial, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["eye_color"]) - if(!has_flag(mob_species, HAS_EYE_COLOR)) - return TOPIC_NOACTION - var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference", rgb(pref.r_eyes, pref.g_eyes, pref.b_eyes)) as color|null - if(new_eyes && has_flag(mob_species, HAS_EYE_COLOR) && CanUseTopic(user)) - pref.r_eyes = hex2num(copytext(new_eyes, 2, 4)) - pref.g_eyes = hex2num(copytext(new_eyes, 4, 6)) - pref.b_eyes = hex2num(copytext(new_eyes, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["skin_tone"]) - if(!has_flag(mob_species, HAS_SKIN_TONE)) - return TOPIC_NOACTION - var/new_s_tone = input(user, "Choose your character's skin-tone:\n(Light 1 - 220 Dark)", "Character Preference", (-pref.s_tone) + 35) as num|null - if(new_s_tone && has_flag(mob_species, HAS_SKIN_TONE) && CanUseTopic(user)) - pref.s_tone = 35 - max(min( round(new_s_tone), 220),1) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["skin_color"]) - if(!has_flag(mob_species, HAS_SKIN_COLOR)) - return TOPIC_NOACTION - var/new_skin = input(user, "Choose your character's skin colour: ", "Character Preference", rgb(pref.r_skin, pref.g_skin, pref.b_skin)) as color|null - if(new_skin && has_flag(mob_species, HAS_SKIN_COLOR) && CanUseTopic(user)) - pref.r_skin = hex2num(copytext(new_skin, 2, 4)) - pref.g_skin = hex2num(copytext(new_skin, 4, 6)) - pref.b_skin = hex2num(copytext(new_skin, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["facial_style"]) - var/list/valid_facialhairstyles = pref.get_valid_facialhairstyles() - - var/new_f_style = tgui_input_list(user, "Choose your character's facial-hair style:", "Character Preference", valid_facialhairstyles, pref.f_style) - if(new_f_style && CanUseTopic(user)) - pref.f_style = new_f_style - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["facial_style_left"]) - var/F = href_list["facial_style_left"] - var/list/valid_facialhairstyles = pref.get_valid_facialhairstyles() - var/start = valid_facialhairstyles.Find(F) - - if(start != 1) //If we're not the beginning of the list, become the previous element. - pref.f_style = valid_facialhairstyles[start-1] - else //But if we ARE, become the final element. - pref.f_style = valid_facialhairstyles[valid_facialhairstyles.len] - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["facial_style_right"]) - var/F = href_list["facial_style_right"] - var/list/valid_facialhairstyles = pref.get_valid_facialhairstyles() - var/start = valid_facialhairstyles.Find(F) - - if(start != valid_facialhairstyles.len) //If we're not the end of the list, become the next element. - pref.f_style = valid_facialhairstyles[start+1] - else //But if we ARE, become the first element. - pref.f_style = valid_facialhairstyles[1] - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["marking_style"]) - var/list/usable_markings = pref.body_markings.Copy() ^ body_marking_styles_list.Copy() - /* VOREStation Removal - No markings whitelist, let people mix/match - for(var/M in usable_markings) - var/datum/sprite_accessory/S = usable_markings[M] - if(!S.species_allowed.len) - continue - else if(!(pref.species in S.species_allowed)) - usable_markings -= M - */ //VOREStation Removal End - var/new_marking = tgui_input_list(user, "Choose a body marking:", "Character Preference", usable_markings) - if(new_marking && CanUseTopic(user)) - pref.body_markings[new_marking] = "#000000" //New markings start black - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["marking_up"]) - var/M = href_list["marking_up"] - var/start = pref.body_markings.Find(M) - if(start != 1) //If we're not the beginning of the list, swap with the previous element. - moveElement(pref.body_markings, start, start-1) - else //But if we ARE, become the final element -ahead- of everything else. - moveElement(pref.body_markings, start, pref.body_markings.len+1) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["marking_down"]) - var/M = href_list["marking_down"] - var/start = pref.body_markings.Find(M) - if(start != pref.body_markings.len) //If we're not the end of the list, swap with the next element. - moveElement(pref.body_markings, start, start+2) - else //But if we ARE, become the first element -behind- everything else. - moveElement(pref.body_markings, start, 1) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["marking_move"]) - var/M = href_list["marking_move"] - var/start = pref.body_markings.Find(M) - var/list/move_locs = pref.body_markings - M - if(start != 1) - move_locs -= pref.body_markings[start-1] - - var/inject_after = tgui_input_list(user, "Move [M] ahead of...", "Character Preference", move_locs) //Move ahead of any marking that isn't the current or previous one. - var/newpos = pref.body_markings.Find(inject_after) - if(newpos) - moveElement(pref.body_markings, start, newpos+1) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["marking_remove"]) - var/M = href_list["marking_remove"] - pref.body_markings -= M - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["marking_color"]) - var/M = href_list["marking_color"] - var/mark_color = input(user, "Choose the [M] color: ", "Character Preference", pref.body_markings[M]) as color|null - if(mark_color && CanUseTopic(user)) - pref.body_markings[M] = "[mark_color]" - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["reset_limbs"]) - reset_limbs() - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["limbs"]) - - var/list/limb_selection_list = list("Left Leg","Right Leg","Left Arm","Right Arm","Left Foot","Right Foot","Left Hand","Right Hand","Full Body") - - // Full prosthetic bodies without a brain are borderline unkillable so make sure they have a brain to remove/destroy. - var/datum/species/current_species = GLOB.all_species[pref.species] - if(!current_species.has_organ["brain"]) - limb_selection_list -= "Full Body" - else if(pref.organ_data[BP_TORSO] == "cyborg") - limb_selection_list |= "Head" - - var/organ_tag = tgui_input_list(user, "Which limb do you want to change?", "Limb Choice", limb_selection_list) - - if(!organ_tag || !CanUseTopic(user)) return TOPIC_NOACTION - - var/limb = null - var/second_limb = null // if you try to change the arm, the hand should also change - var/third_limb = null // if you try to unchange the hand, the arm should also change - - // Do not let them amputate their entire body, ty. - var/list/choice_options = list("Normal","Amputated","Prosthesis") - switch(organ_tag) - if("Left Leg") - limb = BP_L_LEG - second_limb = BP_L_FOOT - if("Right Leg") - limb = BP_R_LEG - second_limb = BP_R_FOOT - if("Left Arm") - limb = BP_L_ARM - second_limb = BP_L_HAND - if("Right Arm") - limb = BP_R_ARM - second_limb = BP_R_HAND - if("Left Foot") - limb = BP_L_FOOT - third_limb = BP_L_LEG - if("Right Foot") - limb = BP_R_FOOT - third_limb = BP_R_LEG - if("Left Hand") - limb = BP_L_HAND - third_limb = BP_L_ARM - if("Right Hand") - limb = BP_R_HAND - third_limb = BP_R_ARM - if("Head") - limb = BP_HEAD - choice_options = list("Prosthesis") - if("Full Body") - limb = BP_TORSO - second_limb = BP_HEAD - third_limb = BP_GROIN - choice_options = list("Normal","Prosthesis") - - var/new_state = tgui_input_list(user, "What state do you wish the limb to be in?", "State Choice", choice_options) - if(!new_state || !CanUseTopic(user)) return TOPIC_NOACTION - - switch(new_state) - if("Normal") - pref.organ_data[limb] = null - pref.rlimb_data[limb] = null - if(limb == BP_TORSO) - for(var/other_limb in BP_ALL - BP_TORSO) - pref.organ_data[other_limb] = null - pref.rlimb_data[other_limb] = null - for(var/internal in O_STANDARD) - pref.organ_data[internal] = null - pref.rlimb_data[internal] = null - if(third_limb) - pref.organ_data[third_limb] = null - pref.rlimb_data[third_limb] = null - - if("Amputated") - if(limb == BP_TORSO) - return - pref.organ_data[limb] = "amputated" - pref.rlimb_data[limb] = null - if(second_limb) - pref.organ_data[second_limb] = "amputated" - pref.rlimb_data[second_limb] = null - - if("Prosthesis") - var/tmp_species = pref.species ? pref.species : SPECIES_HUMAN - var/list/usable_manufacturers = list() - for(var/company in chargen_robolimbs) - var/datum/robolimb/M = chargen_robolimbs[company] - if(!(limb in M.parts)) - continue - if(tmp_species in M.species_cannot_use) - continue - //VOREStation Add - Cyberlimb whitelisting. - if(M.whitelisted_to && !(user.ckey in M.whitelisted_to)) - continue - //VOREStation Add End - usable_manufacturers[company] = M - if(!usable_manufacturers.len) - return - var/choice = tgui_input_list(user, "Which manufacturer do you wish to use for this limb?", "Manufacturer Choice", usable_manufacturers) - if(!choice) - return - - pref.rlimb_data[limb] = choice - pref.organ_data[limb] = "cyborg" - - if(second_limb) - pref.rlimb_data[second_limb] = choice - pref.organ_data[second_limb] = "cyborg" - if(third_limb && pref.organ_data[third_limb] == "amputated") - pref.organ_data[third_limb] = null - - if(limb == BP_TORSO) - for(var/other_limb in BP_ALL - BP_TORSO) - if(pref.organ_data[other_limb]) - continue - pref.organ_data[other_limb] = "cyborg" - pref.rlimb_data[other_limb] = choice - if(!pref.organ_data[O_BRAIN]) - pref.organ_data[O_BRAIN] = "assisted" - for(var/internal_organ in list(O_HEART,O_EYES)) - pref.organ_data[internal_organ] = "mechanical" - - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["organs"]) - - var/organ_name = tgui_input_list(user, "Which internal function do you want to change?", "Internal Organ", list("Heart", "Eyes", "Larynx", "Lungs", "Liver", "Kidneys", "Spleen", "Intestines", "Stomach", "Brain")) - if(!organ_name) return - - var/organ = null - switch(organ_name) - if("Heart") - organ = O_HEART - if("Eyes") - organ = O_EYES - if("Larynx") - organ = O_VOICE - if("Lungs") - organ = O_LUNGS - if("Liver") - organ = O_LIVER - if("Kidneys") - organ = O_KIDNEYS - if("Spleen") - organ = O_SPLEEN - if("Intestines") - organ = O_INTESTINE - if("Stomach") - organ = O_STOMACH - if("Brain") - if(pref.organ_data[BP_HEAD] != "cyborg") - to_chat(user, "You may only select a cybernetic or synthetic brain if you have a full prosthetic body.") - return - organ = "brain" - - var/datum/species/current_species = GLOB.all_species[pref.species] - var/list/organ_choices = list("Normal") - if(pref.organ_data[BP_TORSO] == "cyborg") - organ_choices -= "Normal" - if(organ_name == "Brain") - organ_choices += "Cybernetic" - if(!(current_species.spawn_flags & SPECIES_NO_POSIBRAIN)) - organ_choices += "Positronic" - if(!(current_species.spawn_flags & SPECIES_NO_DRONEBRAIN)) - organ_choices += "Drone" - else - organ_choices += "Assisted" - organ_choices += "Mechanical" - else - organ_choices += "Assisted" - organ_choices += "Mechanical" - - var/new_state = tgui_input_list(user, "What state do you wish the organ to be in?", "State Choice", organ_choices) - if(!new_state) return - - switch(new_state) - if("Normal") - pref.organ_data[organ] = null - if("Assisted") - pref.organ_data[organ] = "assisted" - if("Cybernetic") - pref.organ_data[organ] = "assisted" - if("Mechanical") - pref.organ_data[organ] = "mechanical" - if("Drone") - pref.organ_data[organ] = "digital" - if("Positronic") - pref.organ_data[organ] = "mechanical" - - return TOPIC_REFRESH - - else if(href_list["disabilities"]) - var/disability_flag = text2num(href_list["disabilities"]) - pref.disabilities ^= disability_flag - Disabilities_YW(usr) //YW Edit - - else if(href_list["toggle_preview_value"]) - pref.equip_preview_mob ^= text2num(href_list["toggle_preview_value"]) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["synth_color"]) - pref.synth_color = !pref.synth_color - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["synth2_color"]) - var/new_color = input(user, "Choose your character's synth colour: ", "Character Preference", rgb(pref.r_synth, pref.g_synth, pref.b_synth)) as color|null - if(new_color && CanUseTopic(user)) - pref.r_synth = hex2num(copytext(new_color, 2, 4)) - pref.g_synth = hex2num(copytext(new_color, 4, 6)) - pref.b_synth = hex2num(copytext(new_color, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["synth_markings"]) - pref.synth_markings = !pref.synth_markings - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["cycle_bg"]) - pref.bgstate = next_in_list(pref.bgstate, pref.bgstate_options) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["ear_style"]) - var/new_ear_style = tgui_input_list(user, "Select an ear style for this character:", "Character Preference", pref.get_available_styles(global.ear_styles_list), pref.ear_style) - if(new_ear_style) - pref.ear_style = new_ear_style - - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["ear_color"]) - var/new_earc = input(user, "Choose your character's ear colour:", "Character Preference", - rgb(pref.r_ears, pref.g_ears, pref.b_ears)) as color|null - if(new_earc) - pref.r_ears = hex2num(copytext(new_earc, 2, 4)) - pref.g_ears = hex2num(copytext(new_earc, 4, 6)) - pref.b_ears = hex2num(copytext(new_earc, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["ear_color2"]) - var/new_earc2 = input(user, "Choose your character's ear colour:", "Character Preference", - rgb(pref.r_ears2, pref.g_ears2, pref.b_ears2)) as color|null - if(new_earc2) - pref.r_ears2 = hex2num(copytext(new_earc2, 2, 4)) - pref.g_ears2 = hex2num(copytext(new_earc2, 4, 6)) - pref.b_ears2 = hex2num(copytext(new_earc2, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["ear_color3"]) - var/new_earc3 = input(user, "Choose your character's tertiary ear colour:", "Character Preference", - rgb(pref.r_ears3, pref.g_ears3, pref.b_ears3)) as color|null - if(new_earc3) - pref.r_ears3 = hex2num(copytext(new_earc3, 2, 4)) - pref.g_ears3 = hex2num(copytext(new_earc3, 4, 6)) - pref.b_ears3 = hex2num(copytext(new_earc3, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["tail_style"]) - var/new_tail_style = tgui_input_list(user, "Select a tail style for this character:", "Character Preference", pref.get_available_styles(global.tail_styles_list), pref.tail_style) - if(new_tail_style) - pref.tail_style = new_tail_style - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["tail_color"]) - var/new_tailc = input(user, "Choose your character's tail/taur colour:", "Character Preference", - rgb(pref.r_tail, pref.g_tail, pref.b_tail)) as color|null - if(new_tailc) - pref.r_tail = hex2num(copytext(new_tailc, 2, 4)) - pref.g_tail = hex2num(copytext(new_tailc, 4, 6)) - pref.b_tail = hex2num(copytext(new_tailc, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["tail_color2"]) - var/new_tailc2 = input(user, "Choose your character's secondary tail/taur colour:", "Character Preference", - rgb(pref.r_tail2, pref.g_tail2, pref.b_tail2)) as color|null - if(new_tailc2) - pref.r_tail2 = hex2num(copytext(new_tailc2, 2, 4)) - pref.g_tail2 = hex2num(copytext(new_tailc2, 4, 6)) - pref.b_tail2 = hex2num(copytext(new_tailc2, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["tail_color3"]) - var/new_tailc3 = input(user, "Choose your character's tertiary tail/taur colour:", "Character Preference", - rgb(pref.r_tail3, pref.g_tail3, pref.b_tail3)) as color|null - if(new_tailc3) - pref.r_tail3 = hex2num(copytext(new_tailc3, 2, 4)) - pref.g_tail3 = hex2num(copytext(new_tailc3, 4, 6)) - pref.b_tail3 = hex2num(copytext(new_tailc3, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["wing_style"]) - var/new_wing_style = tgui_input_list(user, "Select a wing style for this character:", "Character Preference", pref.get_available_styles(global.wing_styles_list), pref.wing_style) - if(new_wing_style) - pref.wing_style = new_wing_style - - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["wing_color"]) - var/new_wingc = input(user, "Choose your character's wing colour:", "Character Preference", - rgb(pref.r_wing, pref.g_wing, pref.b_wing)) as color|null - if(new_wingc) - pref.r_wing = hex2num(copytext(new_wingc, 2, 4)) - pref.g_wing = hex2num(copytext(new_wingc, 4, 6)) - pref.b_wing = hex2num(copytext(new_wingc, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["wing_color2"]) - var/new_wingc2 = input(user, "Choose your character's secondary wing colour:", "Character Preference", - rgb(pref.r_wing2, pref.g_wing2, pref.b_wing2)) as color|null - if(new_wingc2) - pref.r_wing2 = hex2num(copytext(new_wingc2, 2, 4)) - pref.g_wing2 = hex2num(copytext(new_wingc2, 4, 6)) - pref.b_wing2 = hex2num(copytext(new_wingc2, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["wing_color3"]) - var/new_wingc3 = input(user, "Choose your character's tertiary wing colour:", "Character Preference", - rgb(pref.r_wing3, pref.g_wing3, pref.b_wing3)) as color|null - if(new_wingc3) - pref.r_wing3 = hex2num(copytext(new_wingc3, 2, 4)) - pref.g_wing3 = hex2num(copytext(new_wingc3, 4, 6)) - pref.b_wing3 = hex2num(copytext(new_wingc3, 6, 8)) - return TOPIC_REFRESH_UPDATE_PREVIEW - - //YW Add Start - else if(href_list["wingdings"]) - pref.wingdings = !pref.wingdings - Disabilities_YW(usr) - - else if(href_list["colorblind_mono"]) - pref.colorblind_mono = !pref.colorblind_mono - Disabilities_YW(usr) - - else if(href_list["colorblind_vulp"]) - pref.colorblind_vulp = !pref.colorblind_vulp - Disabilities_YW(usr) - - else if(href_list["colorblind_taj"]) - pref.colorblind_taj = !pref.colorblind_taj - Disabilities_YW(usr) - - else if(href_list["haemophilia"]) - pref.haemophilia = !pref.haemophilia - Disabilities_YW(usr) - - else if(href_list["reset_disabilities"]) - pref.wingdings = 0 - pref.colorblind_mono = 0 - pref.colorblind_taj = 0 - pref.colorblind_vulp = 0 - pref.haemophilia = 0 - Disabilities_YW(usr) - - //YW Add End - - return ..() - -/datum/category_item/player_setup_item/general/body/proc/reset_limbs() - - for(var/organ in pref.organ_data) - pref.organ_data[organ] = null - while(null in pref.organ_data) - pref.organ_data -= null - - for(var/organ in pref.rlimb_data) - pref.rlimb_data[organ] = null - while(null in pref.rlimb_data) - pref.rlimb_data -= null - - // Sanitize the name so that there aren't any numbers sticking around. - pref.real_name = sanitize_name(pref.real_name, pref.species) - if(!pref.real_name) - pref.real_name = random_name(pref.identifying_gender, pref.species) - -/datum/category_item/player_setup_item/general/body/proc/SetSpecies(mob/user) - if(!pref.species_preview || !(pref.species_preview in GLOB.all_species)) - pref.species_preview = SPECIES_HUMAN - var/datum/species/current_species = GLOB.all_species[pref.species_preview] - var/dat = "" - dat += "
[current_species.name] \[change\]
" - dat += "
| [current_species.blurb] See the wiki for more details. | "
- else
- dat += "[current_species.blurb] | " - //vorestation edit end - dat += ""
- if("preview" in cached_icon_states(current_species.icobase))
- usr << browse_rsc(icon(current_species.icobase,"preview"), "species_preview_[current_species.name].png")
- dat += " " - dat += "Language: [current_species.species_language] " - dat += "" - if(current_species.spawn_flags & SPECIES_CAN_JOIN) - switch(current_species.rarity_value) - if(1 to 2) - dat += "Often present on human stations." - if(3 to 4) - dat += "Rarely present on human stations." - if(5) - dat += "Unheard of on human stations." - else - dat += "May be present on human stations." - if(current_species.spawn_flags & SPECIES_IS_WHITELISTED) - dat += "Whitelist restricted." - if(!current_species.has_organ[O_HEART]) - dat += "Does not have a circulatory system." - if(!current_species.has_organ[O_LUNGS]) - dat += "Does not have a respiratory system." - if(current_species.flags & NO_SCAN) - dat += "Does not have DNA." - if(current_species.flags & NO_DEFIB) - dat += "Cannot be defibrillated." - if(current_species.flags & NO_PAIN) - dat += "Does not feel pain." - if(current_species.flags & NO_SLIP) - dat += "Has excellent traction." - if(current_species.flags & NO_POISON) - dat += "Immune to most poisons." - if(current_species.appearance_flags & HAS_SKIN_TONE) - dat += "Has a variety of skin tones." - if(current_species.appearance_flags & HAS_SKIN_COLOR) - dat += "Has a variety of skin colours." - if(current_species.appearance_flags & HAS_EYE_COLOR) - dat += "Has a variety of eye colours." - if(current_species.flags & IS_PLANT) - dat += "Has a plantlike physiology." - dat += " | "
- dat += "
" - - var/restricted = 0 - - if(!(current_species.spawn_flags & SPECIES_CAN_JOIN)) - restricted = 2 - else if(!is_alien_whitelisted(preference_mob(),current_species)) - restricted = 1 - - if(restricted) - if(restricted == 1) - dat += "You cannot play as this species.If you wish to be whitelisted, you can make an application post on the forums." - else if(restricted == 2) - dat += "You cannot play as this species.This species is not available for play as a station race.." - if(!restricted || check_rights(R_ADMIN|R_EVENT, 0) || current_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE) //VOREStation Edit: selectability - dat += "\[select\]" - dat += "
| Body "
+ . += "(®)"
+ . += " " + . += "Species: [pref.species] " + . += "Blood Type: [pref.b_type] " + if(has_flag(mob_species, HAS_SKIN_TONE)) + . += "Skin Tone: [-pref.s_tone + 35]/220 " + . += "Disabilities Adjust " // YWadd + //YWcommented moved onto disabilities. += "Needs Glasses: [pref.disabilities & NEARSIGHTED ? "Yes" : "No"] " + . += "Limbs: Adjust Reset " + . += "Internal Organs: Adjust " + //display limbs below + var/ind = 0 + for(var/name in pref.organ_data) + var/status = pref.organ_data[name] + var/organ_name = null + + switch(name) + if(BP_TORSO) + organ_name = "torso" + if(BP_GROIN) + organ_name = "groin" + if(BP_HEAD) + organ_name = "head" + if(BP_L_ARM) + organ_name = "left arm" + if(BP_R_ARM) + organ_name = "right arm" + if(BP_L_LEG) + organ_name = "left leg" + if(BP_R_LEG) + organ_name = "right leg" + if(BP_L_FOOT) + organ_name = "left foot" + if(BP_R_FOOT) + organ_name = "right foot" + if(BP_L_HAND) + organ_name = "left hand" + if(BP_R_HAND) + organ_name = "right hand" + if(O_HEART) + organ_name = "heart" + if(O_EYES) + organ_name = "eyes" + if(O_VOICE) + organ_name = "larynx" + if(O_BRAIN) + organ_name = "brain" + if(O_LUNGS) + organ_name = "lungs" + if(O_LIVER) + organ_name = "liver" + if(O_KIDNEYS) + organ_name = "kidneys" + if(O_SPLEEN) + organ_name = "spleen" + if(O_STOMACH) + organ_name = "stomach" + if(O_INTESTINE) + organ_name = "intestines" + + if(status == "cyborg") + ++ind + if(ind > 1) + . += ", " + var/datum/robolimb/R + if(pref.rlimb_data[name] && all_robolimbs[pref.rlimb_data[name]]) + R = all_robolimbs[pref.rlimb_data[name]] + else + R = basic_robolimb + . += "\t[R.company] [organ_name] prosthesis" + else if(status == "amputated") + ++ind + if(ind > 1) + . += ", " + . += "\tAmputated [organ_name]" + else if(status == "mechanical") + ++ind + if(ind > 1) + . += ", " + switch(organ_name) + if ("brain") + . += "\tPositronic [organ_name]" + else + . += "\tSynthetic [organ_name]" + else if(status == "digital") + ++ind + if(ind > 1) + . += ", " + . += "\tDigital [organ_name]" + else if(status == "assisted") + ++ind + if(ind > 1) + . += ", " + switch(organ_name) + if("heart") + . += "\tPacemaker-assisted [organ_name]" + if("lungs") + . += "\tAssisted [organ_name]" + if("voicebox") //on adding voiceboxes for speaking skrell/similar replacements + . += "\tSurgically altered [organ_name]" + if("eyes") + . += "\tRetinal overlayed [organ_name]" + if("brain") + . += "\tAssisted-interface [organ_name]" + else + . += "\tMechanically assisted [organ_name]" + if(!ind) + . += "\[...\] " + else + . += " " + + if(LAZYLEN(pref.body_descriptors)) + . += "
" + + . += " | Preview " + . += " Cycle background" + . += " [pref.equip_preview_mob & EQUIP_PREVIEW_LOADOUT ? "Hide loadout" : "Show loadout"]" + . += " [pref.equip_preview_mob & EQUIP_PREVIEW_JOB ? "Hide job gear" : "Show job gear"]" + . += " |
" + if(has_flag(mob_species, HAS_HAIR_COLOR)) + . += "Change Color [color_square(pref.r_hair, pref.g_hair, pref.b_hair)] " + . += " Style: < > [pref.h_style]
" //The < & > in this line is correct-- those extra characters are the arrows you click to switch between styles. + + . += "Gradient
" + . += "Change Color [color_square(pref.r_grad, pref.g_grad, pref.b_grad)] " + . += " Style: < > [pref.grad_style]
" + + . += "
Facial
" + if(has_flag(mob_species, HAS_HAIR_COLOR)) + . += "Change Color [color_square(pref.r_facial, pref.g_facial, pref.b_facial)] " + . += " Style: < > [pref.f_style]
" //Same as above with the extra > & < characters + + if(has_flag(mob_species, HAS_EYE_COLOR)) + . += "
Eyes
" + . += "Change Color [color_square(pref.r_eyes, pref.g_eyes, pref.b_eyes)]
" + + if(has_flag(mob_species, HAS_SKIN_COLOR)) + . += "
Body Color
" + . += "Change Color [color_square(pref.r_skin, pref.g_skin, pref.b_skin)]
" + + . += "
Genetics Settings
" + + var/list/ear_styles = pref.get_available_styles(global.ear_styles_list) + var/datum/sprite_accessory/ears/ear = ear_styles[pref.ear_style] + . += "Ears" + if(istype(ear)) + . += " Style: [ear.name]
" + if(ear.do_colouration) + . += "Change Color [color_square(pref.r_ears, pref.g_ears, pref.b_ears)]
" + if(ear.extra_overlay) + . += "Change Secondary Color [color_square(pref.r_ears2, pref.g_ears2, pref.b_ears2)]
" + if(ear.extra_overlay2) + . += "Change Tertiary Color [color_square(pref.r_ears3, pref.g_ears3, pref.b_ears3)]
" + else + . += " Style: Select
" + + var/list/tail_styles = pref.get_available_styles(global.tail_styles_list) + var/datum/sprite_accessory/tail/tail = tail_styles[pref.tail_style] + . += "Tail
" + if(istype(tail)) + . += " Style: [tail.name]
" + if(tail.do_colouration) + . += "Change Color [color_square(pref.r_tail, pref.g_tail, pref.b_tail)]
" + if(tail.extra_overlay) + . += "Change Secondary Color [color_square(pref.r_tail2, pref.g_tail2, pref.b_tail2)]
" + if(tail.extra_overlay2) + . += "Change Tertiary Color [color_square(pref.r_tail3, pref.g_tail3, pref.b_tail3)]
" + else + . += " Style: Select
" + + var/list/wing_styles = pref.get_available_styles(global.wing_styles_list) + var/datum/sprite_accessory/wing/wings = wing_styles[pref.wing_style] + . += "Wing
" + if(istype(wings)) + . += " Style: [wings.name]
" + if(wings.do_colouration) + . += "Change Color [color_square(pref.r_wing, pref.g_wing, pref.b_wing)]
" + if(wings.extra_overlay) + . += "Change Secondary Color [color_square(pref.r_wing2, pref.g_wing2, pref.b_wing2)]
" + if(wings.extra_overlay2) + . += "Change Secondary Color [color_square(pref.r_wing3, pref.g_wing3, pref.b_wing3)]
" + else + . += " Style: Select
" + + . += "
Body Markings +
" + . += "
| [M] | [pref.body_markings.len > 1 ? "˄ ˅ mv " : ""]- Color[color_square(hex = pref.body_markings[M])] |
" + . += "Allow Synth markings: [pref.synth_markings ? "Yes" : "No"]
" + . += "Allow Synth color: [pref.synth_color ? "Yes" : "No"]
" + if(pref.synth_color) + . += "Change Color [color_square(pref.r_synth, pref.g_synth, pref.b_synth)]" + + . = jointext(.,null) + +/datum/category_item/player_setup_item/general/body/proc/has_flag(var/datum/species/mob_species, var/flag) + return mob_species && (mob_species.appearance_flags & flag) + +/datum/category_item/player_setup_item/general/body/OnTopic(var/href,var/list/href_list, var/mob/user) + var/datum/species/mob_species = GLOB.all_species[pref.species] + + if(href_list["random"]) + pref.randomize_appearance_and_body_for() + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["change_descriptor"]) + if(mob_species.descriptors) + var/desc_id = href_list["change_descriptor"] + if(pref.body_descriptors[desc_id]) + var/datum/mob_descriptor/descriptor = mob_species.descriptors[desc_id] + var/choice = tgui_input_list(usr, "Please select a descriptor.", "Descriptor", descriptor.chargen_value_descriptors) + if(choice && mob_species.descriptors[desc_id]) // Check in case they sneakily changed species. + pref.body_descriptors[desc_id] = descriptor.chargen_value_descriptors[choice] + return TOPIC_REFRESH + + else if(href_list["blood_type"]) + var/new_b_type = tgui_input_list(user, "Choose your character's blood-type:", "Character Preference", valid_bloodtypes) + if(new_b_type && CanUseTopic(user)) + pref.b_type = new_b_type + return TOPIC_REFRESH + + else if(href_list["show_species"]) + // Actual whitelist checks are handled elsewhere, this is just for accessing the preview window. + var/choice = tgui_input_list(usr, "Which species would you like to look at?", "Species Choice", GLOB.playable_species) + if(!choice) return + pref.species_preview = choice + SetSpecies(preference_mob()) + pref.alternate_languages.Cut() // Reset their alternate languages. Todo: attempt to just fix it instead? + return TOPIC_HANDLED + + else if(href_list["disabilities_yw"]) + Disabilities_YW(usr) + + else if(href_list["set_species"]) + user << browse(null, "window=species") + if(!pref.species_preview || !(pref.species_preview in GLOB.all_species)) + return TOPIC_NOACTION + + var/datum/species/setting_species + + if(GLOB.all_species[href_list["set_species"]]) + setting_species = GLOB.all_species[href_list["set_species"]] + else + return TOPIC_NOACTION + + if(((!(setting_species.spawn_flags & SPECIES_CAN_JOIN)) || (!is_alien_whitelisted(preference_mob(),setting_species))) && !check_rights(R_ADMIN|R_EVENT, 0) && !(setting_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE)) //VOREStation Edit: selectability + return TOPIC_NOACTION + + var/prev_species = pref.species + pref.species = href_list["set_species"] + if(prev_species != pref.species) + if(!(pref.biological_gender in mob_species.genders)) + pref.set_biological_gender(mob_species.genders[1]) + pref.custom_species = null //VOREStation Edit - This is cleared on species changes + //grab one of the valid hair styles for the newly chosen species + var/list/valid_hairstyles = pref.get_valid_hairstyles() + + if(valid_hairstyles.len) + pref.h_style = pick(valid_hairstyles) + else + //this shouldn't happen + pref.h_style = hair_styles_list["Bald"] + + //grab one of the valid facial hair styles for the newly chosen species + var/list/valid_facialhairstyles = pref.get_valid_facialhairstyles() + + if(valid_facialhairstyles.len) + pref.f_style = pick(valid_facialhairstyles) + else + //this shouldn't happen + pref.f_style = facial_hair_styles_list["Shaved"] + + //reset hair colour and skin colour + pref.r_hair = 0//hex2num(copytext(new_hair, 2, 4)) + pref.g_hair = 0//hex2num(copytext(new_hair, 4, 6)) + pref.b_hair = 0//hex2num(copytext(new_hair, 6, 8)) + pref.s_tone = -75 + + reset_limbs() // Safety for species with incompatible manufacturers; easier than trying to do it case by case. + pref.body_markings.Cut() // Basically same as above. + + pref.sanitize_body_styles() + + var/min_age = get_min_age() + var/max_age = get_max_age() + pref.age = max(min(pref.age, max_age), min_age) + + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["hair_color"]) + if(!has_flag(mob_species, HAS_HAIR_COLOR)) + return TOPIC_NOACTION + var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference", rgb(pref.r_hair, pref.g_hair, pref.b_hair)) as color|null + if(new_hair && has_flag(mob_species, HAS_HAIR_COLOR) && CanUseTopic(user)) + pref.r_hair = hex2num(copytext(new_hair, 2, 4)) + pref.g_hair = hex2num(copytext(new_hair, 4, 6)) + pref.b_hair = hex2num(copytext(new_hair, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["grad_color"]) + if(!has_flag(mob_species, HAS_HAIR_COLOR)) + return TOPIC_NOACTION + var/new_grad = input(user, "Choose your character's secondary hair color:", "Character Preference", rgb(pref.r_grad, pref.g_grad, pref.b_grad)) as color|null + if(new_grad && has_flag(mob_species, HAS_HAIR_COLOR) && CanUseTopic(user)) + pref.r_grad = hex2num(copytext(new_grad, 2, 4)) + pref.g_grad = hex2num(copytext(new_grad, 4, 6)) + pref.b_grad = hex2num(copytext(new_grad, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["hair_style"]) + var/list/valid_hairstyles = pref.get_valid_hairstyles() + + var/new_h_style = tgui_input_list(user, "Choose your character's hair style:", "Character Preference", valid_hairstyles, pref.h_style) + if(new_h_style && CanUseTopic(user)) + pref.h_style = new_h_style + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["grad_style"]) + var/list/valid_gradients = GLOB.hair_gradients + + var/new_grad_style = tgui_input_list(user, "Choose a color pattern for your hair:", "Character Preference", valid_gradients, pref.grad_style) + if(new_grad_style && CanUseTopic(user)) + pref.grad_style = new_grad_style + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["hair_style_left"]) + var/H = href_list["hair_style_left"] + var/list/valid_hairstyles = pref.get_valid_hairstyles() + var/start = valid_hairstyles.Find(H) + + if(start != 1) //If we're not the beginning of the list, become the previous element. + pref.h_style = valid_hairstyles[start-1] + else //But if we ARE, become the final element. + pref.h_style = valid_hairstyles[valid_hairstyles.len] + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["hair_style_right"]) + var/H = href_list["hair_style_right"] + var/list/valid_hairstyles = pref.get_valid_hairstyles() + var/start = valid_hairstyles.Find(H) + + if(start != valid_hairstyles.len) //If we're not the end of the list, become the next element. + pref.h_style = valid_hairstyles[start+1] + else //But if we ARE, become the first element. + pref.h_style = valid_hairstyles[1] + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["facial_color"]) + if(!has_flag(mob_species, HAS_HAIR_COLOR)) + return TOPIC_NOACTION + var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference", rgb(pref.r_facial, pref.g_facial, pref.b_facial)) as color|null + if(new_facial && has_flag(mob_species, HAS_HAIR_COLOR) && CanUseTopic(user)) + pref.r_facial = hex2num(copytext(new_facial, 2, 4)) + pref.g_facial = hex2num(copytext(new_facial, 4, 6)) + pref.b_facial = hex2num(copytext(new_facial, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["eye_color"]) + if(!has_flag(mob_species, HAS_EYE_COLOR)) + return TOPIC_NOACTION + var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference", rgb(pref.r_eyes, pref.g_eyes, pref.b_eyes)) as color|null + if(new_eyes && has_flag(mob_species, HAS_EYE_COLOR) && CanUseTopic(user)) + pref.r_eyes = hex2num(copytext(new_eyes, 2, 4)) + pref.g_eyes = hex2num(copytext(new_eyes, 4, 6)) + pref.b_eyes = hex2num(copytext(new_eyes, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["skin_tone"]) + if(!has_flag(mob_species, HAS_SKIN_TONE)) + return TOPIC_NOACTION + var/new_s_tone = tgui_input_number(user, "Choose your character's skin-tone:\n(Light 1 - 220 Dark)", "Character Preference", (-pref.s_tone) + 35, 220, 1) + if(new_s_tone && has_flag(mob_species, HAS_SKIN_TONE) && CanUseTopic(user)) + pref.s_tone = 35 - max(min( round(new_s_tone), 220),1) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["skin_color"]) + if(!has_flag(mob_species, HAS_SKIN_COLOR)) + return TOPIC_NOACTION + var/new_skin = input(user, "Choose your character's skin colour: ", "Character Preference", rgb(pref.r_skin, pref.g_skin, pref.b_skin)) as color|null + if(new_skin && has_flag(mob_species, HAS_SKIN_COLOR) && CanUseTopic(user)) + pref.r_skin = hex2num(copytext(new_skin, 2, 4)) + pref.g_skin = hex2num(copytext(new_skin, 4, 6)) + pref.b_skin = hex2num(copytext(new_skin, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["facial_style"]) + var/list/valid_facialhairstyles = pref.get_valid_facialhairstyles() + + var/new_f_style = tgui_input_list(user, "Choose your character's facial-hair style:", "Character Preference", valid_facialhairstyles, pref.f_style) + if(new_f_style && CanUseTopic(user)) + pref.f_style = new_f_style + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["facial_style_left"]) + var/F = href_list["facial_style_left"] + var/list/valid_facialhairstyles = pref.get_valid_facialhairstyles() + var/start = valid_facialhairstyles.Find(F) + + if(start != 1) //If we're not the beginning of the list, become the previous element. + pref.f_style = valid_facialhairstyles[start-1] + else //But if we ARE, become the final element. + pref.f_style = valid_facialhairstyles[valid_facialhairstyles.len] + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["facial_style_right"]) + var/F = href_list["facial_style_right"] + var/list/valid_facialhairstyles = pref.get_valid_facialhairstyles() + var/start = valid_facialhairstyles.Find(F) + + if(start != valid_facialhairstyles.len) //If we're not the end of the list, become the next element. + pref.f_style = valid_facialhairstyles[start+1] + else //But if we ARE, become the first element. + pref.f_style = valid_facialhairstyles[1] + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["marking_style"]) + var/list/usable_markings = pref.body_markings.Copy() ^ body_marking_styles_list.Copy() + /* VOREStation Removal - No markings whitelist, let people mix/match + for(var/M in usable_markings) + var/datum/sprite_accessory/S = usable_markings[M] + if(!S.species_allowed.len) + continue + else if(!(pref.species in S.species_allowed)) + usable_markings -= M + */ //VOREStation Removal End + var/new_marking = tgui_input_list(user, "Choose a body marking:", "Character Preference", usable_markings) + if(new_marking && CanUseTopic(user)) + pref.body_markings[new_marking] = "#000000" //New markings start black + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["marking_up"]) + var/M = href_list["marking_up"] + var/start = pref.body_markings.Find(M) + if(start != 1) //If we're not the beginning of the list, swap with the previous element. + moveElement(pref.body_markings, start, start-1) + else //But if we ARE, become the final element -ahead- of everything else. + moveElement(pref.body_markings, start, pref.body_markings.len+1) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["marking_down"]) + var/M = href_list["marking_down"] + var/start = pref.body_markings.Find(M) + if(start != pref.body_markings.len) //If we're not the end of the list, swap with the next element. + moveElement(pref.body_markings, start, start+2) + else //But if we ARE, become the first element -behind- everything else. + moveElement(pref.body_markings, start, 1) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["marking_move"]) + var/M = href_list["marking_move"] + var/start = pref.body_markings.Find(M) + var/list/move_locs = pref.body_markings - M + if(start != 1) + move_locs -= pref.body_markings[start-1] + + var/inject_after = tgui_input_list(user, "Move [M] ahead of...", "Character Preference", move_locs) //Move ahead of any marking that isn't the current or previous one. + var/newpos = pref.body_markings.Find(inject_after) + if(newpos) + moveElement(pref.body_markings, start, newpos+1) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["marking_remove"]) + var/M = href_list["marking_remove"] + pref.body_markings -= M + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["marking_color"]) + var/M = href_list["marking_color"] + var/mark_color = input(user, "Choose the [M] color: ", "Character Preference", pref.body_markings[M]) as color|null + if(mark_color && CanUseTopic(user)) + pref.body_markings[M] = "[mark_color]" + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["reset_limbs"]) + reset_limbs() + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["limbs"]) + + var/list/limb_selection_list = list("Left Leg","Right Leg","Left Arm","Right Arm","Left Foot","Right Foot","Left Hand","Right Hand","Full Body") + + // Full prosthetic bodies without a brain are borderline unkillable so make sure they have a brain to remove/destroy. + var/datum/species/current_species = GLOB.all_species[pref.species] + if(!current_species.has_organ["brain"]) + limb_selection_list -= "Full Body" + else if(pref.organ_data[BP_TORSO] == "cyborg") + limb_selection_list |= "Head" + + var/organ_tag = tgui_input_list(user, "Which limb do you want to change?", "Limb Choice", limb_selection_list) + + if(!organ_tag || !CanUseTopic(user)) return TOPIC_NOACTION + + var/limb = null + var/second_limb = null // if you try to change the arm, the hand should also change + var/third_limb = null // if you try to unchange the hand, the arm should also change + + // Do not let them amputate their entire body, ty. + var/list/choice_options = list("Normal","Amputated","Prosthesis") + switch(organ_tag) + if("Left Leg") + limb = BP_L_LEG + second_limb = BP_L_FOOT + if("Right Leg") + limb = BP_R_LEG + second_limb = BP_R_FOOT + if("Left Arm") + limb = BP_L_ARM + second_limb = BP_L_HAND + if("Right Arm") + limb = BP_R_ARM + second_limb = BP_R_HAND + if("Left Foot") + limb = BP_L_FOOT + third_limb = BP_L_LEG + if("Right Foot") + limb = BP_R_FOOT + third_limb = BP_R_LEG + if("Left Hand") + limb = BP_L_HAND + third_limb = BP_L_ARM + if("Right Hand") + limb = BP_R_HAND + third_limb = BP_R_ARM + if("Head") + limb = BP_HEAD + choice_options = list("Prosthesis") + if("Full Body") + limb = BP_TORSO + second_limb = BP_HEAD + third_limb = BP_GROIN + choice_options = list("Normal","Prosthesis") + + var/new_state = tgui_input_list(user, "What state do you wish the limb to be in?", "State Choice", choice_options) + if(!new_state || !CanUseTopic(user)) return TOPIC_NOACTION + + switch(new_state) + if("Normal") + pref.organ_data[limb] = null + pref.rlimb_data[limb] = null + if(limb == BP_TORSO) + for(var/other_limb in BP_ALL - BP_TORSO) + pref.organ_data[other_limb] = null + pref.rlimb_data[other_limb] = null + for(var/internal in O_STANDARD) + pref.organ_data[internal] = null + pref.rlimb_data[internal] = null + if(third_limb) + pref.organ_data[third_limb] = null + pref.rlimb_data[third_limb] = null + + if("Amputated") + if(limb == BP_TORSO) + return + pref.organ_data[limb] = "amputated" + pref.rlimb_data[limb] = null + if(second_limb) + pref.organ_data[second_limb] = "amputated" + pref.rlimb_data[second_limb] = null + + if("Prosthesis") + var/tmp_species = pref.species ? pref.species : SPECIES_HUMAN + var/list/usable_manufacturers = list() + for(var/company in chargen_robolimbs) + var/datum/robolimb/M = chargen_robolimbs[company] + if(!(limb in M.parts)) + continue + if(tmp_species in M.species_cannot_use) + continue + //VOREStation Add - Cyberlimb whitelisting. + if(M.whitelisted_to && !(user.ckey in M.whitelisted_to)) + continue + //VOREStation Add End + usable_manufacturers[company] = M + if(!usable_manufacturers.len) + return + var/choice = tgui_input_list(user, "Which manufacturer do you wish to use for this limb?", "Manufacturer Choice", usable_manufacturers) + if(!choice) + return + + pref.rlimb_data[limb] = choice + pref.organ_data[limb] = "cyborg" + + if(second_limb) + pref.rlimb_data[second_limb] = choice + pref.organ_data[second_limb] = "cyborg" + if(third_limb && pref.organ_data[third_limb] == "amputated") + pref.organ_data[third_limb] = null + + if(limb == BP_TORSO) + for(var/other_limb in BP_ALL - BP_TORSO) + if(pref.organ_data[other_limb]) + continue + pref.organ_data[other_limb] = "cyborg" + pref.rlimb_data[other_limb] = choice + if(!pref.organ_data[O_BRAIN]) + pref.organ_data[O_BRAIN] = "assisted" + for(var/internal_organ in list(O_HEART,O_EYES)) + pref.organ_data[internal_organ] = "mechanical" + + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["organs"]) + + var/organ_name = tgui_input_list(user, "Which internal function do you want to change?", "Internal Organ", list("Heart", "Eyes", "Larynx", "Lungs", "Liver", "Kidneys", "Spleen", "Intestines", "Stomach", "Brain")) + if(!organ_name) return + + var/organ = null + switch(organ_name) + if("Heart") + organ = O_HEART + if("Eyes") + organ = O_EYES + if("Larynx") + organ = O_VOICE + if("Lungs") + organ = O_LUNGS + if("Liver") + organ = O_LIVER + if("Kidneys") + organ = O_KIDNEYS + if("Spleen") + organ = O_SPLEEN + if("Intestines") + organ = O_INTESTINE + if("Stomach") + organ = O_STOMACH + if("Brain") + if(pref.organ_data[BP_HEAD] != "cyborg") + to_chat(user, "You may only select a cybernetic or synthetic brain if you have a full prosthetic body.") + return + organ = "brain" + + var/datum/species/current_species = GLOB.all_species[pref.species] + var/list/organ_choices = list("Normal") + if(pref.organ_data[BP_TORSO] == "cyborg") + organ_choices -= "Normal" + if(organ_name == "Brain") + organ_choices += "Cybernetic" + if(!(current_species.spawn_flags & SPECIES_NO_POSIBRAIN)) + organ_choices += "Positronic" + if(!(current_species.spawn_flags & SPECIES_NO_DRONEBRAIN)) + organ_choices += "Drone" + else + organ_choices += "Assisted" + organ_choices += "Mechanical" + else + organ_choices += "Assisted" + organ_choices += "Mechanical" + + var/new_state = tgui_input_list(user, "What state do you wish the organ to be in?", "State Choice", organ_choices) + if(!new_state) return + + switch(new_state) + if("Normal") + pref.organ_data[organ] = null + if("Assisted") + pref.organ_data[organ] = "assisted" + if("Cybernetic") + pref.organ_data[organ] = "assisted" + if("Mechanical") + pref.organ_data[organ] = "mechanical" + if("Drone") + pref.organ_data[organ] = "digital" + if("Positronic") + pref.organ_data[organ] = "mechanical" + + return TOPIC_REFRESH + + else if(href_list["disabilities"]) + var/disability_flag = text2num(href_list["disabilities"]) + pref.disabilities ^= disability_flag + Disabilities_YW(usr) //YW Edit + + else if(href_list["toggle_preview_value"]) + pref.equip_preview_mob ^= text2num(href_list["toggle_preview_value"]) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["synth_color"]) + pref.synth_color = !pref.synth_color + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["synth2_color"]) + var/new_color = input(user, "Choose your character's synth colour: ", "Character Preference", rgb(pref.r_synth, pref.g_synth, pref.b_synth)) as color|null + if(new_color && CanUseTopic(user)) + pref.r_synth = hex2num(copytext(new_color, 2, 4)) + pref.g_synth = hex2num(copytext(new_color, 4, 6)) + pref.b_synth = hex2num(copytext(new_color, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["synth_markings"]) + pref.synth_markings = !pref.synth_markings + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["cycle_bg"]) + pref.bgstate = next_in_list(pref.bgstate, pref.bgstate_options) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["ear_style"]) + var/new_ear_style = tgui_input_list(user, "Select an ear style for this character:", "Character Preference", pref.get_available_styles(global.ear_styles_list), pref.ear_style) + if(new_ear_style) + pref.ear_style = new_ear_style + + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["ear_color"]) + var/new_earc = input(user, "Choose your character's ear colour:", "Character Preference", + rgb(pref.r_ears, pref.g_ears, pref.b_ears)) as color|null + if(new_earc) + pref.r_ears = hex2num(copytext(new_earc, 2, 4)) + pref.g_ears = hex2num(copytext(new_earc, 4, 6)) + pref.b_ears = hex2num(copytext(new_earc, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["ear_color2"]) + var/new_earc2 = input(user, "Choose your character's ear colour:", "Character Preference", + rgb(pref.r_ears2, pref.g_ears2, pref.b_ears2)) as color|null + if(new_earc2) + pref.r_ears2 = hex2num(copytext(new_earc2, 2, 4)) + pref.g_ears2 = hex2num(copytext(new_earc2, 4, 6)) + pref.b_ears2 = hex2num(copytext(new_earc2, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["ear_color3"]) + var/new_earc3 = input(user, "Choose your character's tertiary ear colour:", "Character Preference", + rgb(pref.r_ears3, pref.g_ears3, pref.b_ears3)) as color|null + if(new_earc3) + pref.r_ears3 = hex2num(copytext(new_earc3, 2, 4)) + pref.g_ears3 = hex2num(copytext(new_earc3, 4, 6)) + pref.b_ears3 = hex2num(copytext(new_earc3, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["tail_style"]) + var/new_tail_style = tgui_input_list(user, "Select a tail style for this character:", "Character Preference", pref.get_available_styles(global.tail_styles_list), pref.tail_style) + if(new_tail_style) + pref.tail_style = new_tail_style + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["tail_color"]) + var/new_tailc = input(user, "Choose your character's tail/taur colour:", "Character Preference", + rgb(pref.r_tail, pref.g_tail, pref.b_tail)) as color|null + if(new_tailc) + pref.r_tail = hex2num(copytext(new_tailc, 2, 4)) + pref.g_tail = hex2num(copytext(new_tailc, 4, 6)) + pref.b_tail = hex2num(copytext(new_tailc, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["tail_color2"]) + var/new_tailc2 = input(user, "Choose your character's secondary tail/taur colour:", "Character Preference", + rgb(pref.r_tail2, pref.g_tail2, pref.b_tail2)) as color|null + if(new_tailc2) + pref.r_tail2 = hex2num(copytext(new_tailc2, 2, 4)) + pref.g_tail2 = hex2num(copytext(new_tailc2, 4, 6)) + pref.b_tail2 = hex2num(copytext(new_tailc2, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["tail_color3"]) + var/new_tailc3 = input(user, "Choose your character's tertiary tail/taur colour:", "Character Preference", + rgb(pref.r_tail3, pref.g_tail3, pref.b_tail3)) as color|null + if(new_tailc3) + pref.r_tail3 = hex2num(copytext(new_tailc3, 2, 4)) + pref.g_tail3 = hex2num(copytext(new_tailc3, 4, 6)) + pref.b_tail3 = hex2num(copytext(new_tailc3, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["wing_style"]) + var/new_wing_style = tgui_input_list(user, "Select a wing style for this character:", "Character Preference", pref.get_available_styles(global.wing_styles_list), pref.wing_style) + if(new_wing_style) + pref.wing_style = new_wing_style + + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["wing_color"]) + var/new_wingc = input(user, "Choose your character's wing colour:", "Character Preference", + rgb(pref.r_wing, pref.g_wing, pref.b_wing)) as color|null + if(new_wingc) + pref.r_wing = hex2num(copytext(new_wingc, 2, 4)) + pref.g_wing = hex2num(copytext(new_wingc, 4, 6)) + pref.b_wing = hex2num(copytext(new_wingc, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["wing_color2"]) + var/new_wingc2 = input(user, "Choose your character's secondary wing colour:", "Character Preference", + rgb(pref.r_wing2, pref.g_wing2, pref.b_wing2)) as color|null + if(new_wingc2) + pref.r_wing2 = hex2num(copytext(new_wingc2, 2, 4)) + pref.g_wing2 = hex2num(copytext(new_wingc2, 4, 6)) + pref.b_wing2 = hex2num(copytext(new_wingc2, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["wing_color3"]) + var/new_wingc3 = input(user, "Choose your character's tertiary wing colour:", "Character Preference", + rgb(pref.r_wing3, pref.g_wing3, pref.b_wing3)) as color|null + if(new_wingc3) + pref.r_wing3 = hex2num(copytext(new_wingc3, 2, 4)) + pref.g_wing3 = hex2num(copytext(new_wingc3, 4, 6)) + pref.b_wing3 = hex2num(copytext(new_wingc3, 6, 8)) + return TOPIC_REFRESH_UPDATE_PREVIEW + + //YW Add Start + else if(href_list["wingdings"]) + pref.wingdings = !pref.wingdings + Disabilities_YW(usr) + + else if(href_list["colorblind_mono"]) + pref.colorblind_mono = !pref.colorblind_mono + Disabilities_YW(usr) + + else if(href_list["colorblind_vulp"]) + pref.colorblind_vulp = !pref.colorblind_vulp + Disabilities_YW(usr) + + else if(href_list["colorblind_taj"]) + pref.colorblind_taj = !pref.colorblind_taj + Disabilities_YW(usr) + + else if(href_list["haemophilia"]) + pref.haemophilia = !pref.haemophilia + Disabilities_YW(usr) + + else if(href_list["reset_disabilities"]) + pref.wingdings = 0 + pref.colorblind_mono = 0 + pref.colorblind_taj = 0 + pref.colorblind_vulp = 0 + pref.haemophilia = 0 + Disabilities_YW(usr) + + //YW Add End + + return ..() + +/datum/category_item/player_setup_item/general/body/proc/reset_limbs() + + for(var/organ in pref.organ_data) + pref.organ_data[organ] = null + while(null in pref.organ_data) + pref.organ_data -= null + + for(var/organ in pref.rlimb_data) + pref.rlimb_data[organ] = null + while(null in pref.rlimb_data) + pref.rlimb_data -= null + + // Sanitize the name so that there aren't any numbers sticking around. + pref.real_name = sanitize_name(pref.real_name, pref.species) + if(!pref.real_name) + pref.real_name = random_name(pref.identifying_gender, pref.species) + +/datum/category_item/player_setup_item/general/body/proc/SetSpecies(mob/user) + if(!pref.species_preview || !(pref.species_preview in GLOB.all_species)) + pref.species_preview = SPECIES_HUMAN + var/datum/species/current_species = GLOB.all_species[pref.species_preview] + var/dat = "" + dat += "
[current_species.name] \[change\]
" + dat += "
| [current_species.blurb] See the wiki for more details. | "
+ else
+ dat += "[current_species.blurb] | " + //vorestation edit end + dat += ""
+ if("preview" in cached_icon_states(current_species.icobase))
+ usr << browse_rsc(icon(current_species.icobase,"preview"), "species_preview_[current_species.name].png")
+ dat += " " + dat += "Language: [current_species.species_language] " + dat += "" + if(current_species.spawn_flags & SPECIES_CAN_JOIN) + switch(current_species.rarity_value) + if(1 to 2) + dat += "Often present on human stations." + if(3 to 4) + dat += "Rarely present on human stations." + if(5) + dat += "Unheard of on human stations." + else + dat += "May be present on human stations." + if(current_species.spawn_flags & SPECIES_IS_WHITELISTED) + dat += "Whitelist restricted." + if(!current_species.has_organ[O_HEART]) + dat += "Does not have a circulatory system." + if(!current_species.has_organ[O_LUNGS]) + dat += "Does not have a respiratory system." + if(current_species.flags & NO_SCAN) + dat += "Does not have DNA." + if(current_species.flags & NO_DEFIB) + dat += "Cannot be defibrillated." + if(current_species.flags & NO_PAIN) + dat += "Does not feel pain." + if(current_species.flags & NO_SLIP) + dat += "Has excellent traction." + if(current_species.flags & NO_POISON) + dat += "Immune to most poisons." + if(current_species.appearance_flags & HAS_SKIN_TONE) + dat += "Has a variety of skin tones." + if(current_species.appearance_flags & HAS_SKIN_COLOR) + dat += "Has a variety of skin colours." + if(current_species.appearance_flags & HAS_EYE_COLOR) + dat += "Has a variety of eye colours." + if(current_species.flags & IS_PLANT) + dat += "Has a plantlike physiology." + dat += " | "
+ dat += "
" + + var/restricted = 0 + + if(!(current_species.spawn_flags & SPECIES_CAN_JOIN)) + restricted = 2 + else if(!is_alien_whitelisted(preference_mob(),current_species)) + restricted = 1 + + if(restricted) + if(restricted == 1) + dat += "You cannot play as this species.If you wish to be whitelisted, you can make an application post on the forums." + else if(restricted == 2) + dat += "You cannot play as this species.This species is not available for play as a station race.." + if(!restricted || check_rights(R_ADMIN|R_EVENT, 0) || current_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE) //VOREStation Edit: selectability + dat += "\[select\]" + dat += "
" @@ -52,7 +58,9 @@ . += "Ambience Chance: [pref.ambience_chance]
" . += "tgui Window Mode: [(pref.tgui_fancy) ? "Fancy (default)" : "Compatible (slower)"]
" . += "tgui Window Placement: [(pref.tgui_lock) ? "Primary Monitor" : "Free (default)"]
" - . += "Input Mode (Say, Me, Whisper, Subtle): [(pref.tgui_input_mode) ? "TGUI" : "BYOND (default)"]
" + . += "TGUI Input Framework: [(pref.tgui_input_mode) ? "Enabled" : "Disabled (default)"]
" + . += "TGUI Large Buttons: [(pref.tgui_large_buttons) ? "Enabled (default)" : "Disabled"]
" + . += "TGUI Swapped Buttons: [(pref.tgui_swapped_buttons) ? "Enabled" : "Disabled (default)"]
" if(can_select_ooc_color(user)) . += "OOC Color:" if(pref.ooccolor == initial(pref.ooccolor)) @@ -74,7 +82,7 @@ return TOPIC_REFRESH else if(href_list["select_alpha"]) - var/UI_style_alpha_new = input(user, "Select UI alpha (transparency) level, between 50 and 255.", "Global Preference", pref.UI_style_alpha) as num|null + var/UI_style_alpha_new = tgui_input_number(user, "Select UI alpha (transparency) level, between 50 and 255.", "Global Preference", pref.UI_style_alpha, 255, 50) if(isnull(UI_style_alpha_new) || (UI_style_alpha_new < 50 || UI_style_alpha_new > 255) || !CanUseTopic(user)) return TOPIC_NOACTION pref.UI_style_alpha = UI_style_alpha_new return TOPIC_REFRESH @@ -92,7 +100,7 @@ return TOPIC_REFRESH else if(href_list["select_client_fps"]) - var/fps_new = input(user, "Input Client FPS (1-200, 0 uses server FPS)", "Global Preference", pref.client_fps) as null|num + var/fps_new = tgui_input_number(user, "Input Client FPS (1-200, 0 uses server FPS)", "Global Preference", pref.client_fps, 200, 0) if(isnull(fps_new) || !CanUseTopic(user)) return TOPIC_NOACTION if(fps_new < 0 || fps_new > MAX_CLIENT_FPS) return TOPIC_NOACTION pref.client_fps = fps_new @@ -101,14 +109,14 @@ return TOPIC_REFRESH else if(href_list["select_ambience_freq"]) - var/ambience_new = input(user, "Input how often you wish to hear ambience repeated! (1-60 MINUTES, 0 for disabled)", "Global Preference", pref.ambience_freq) as null|num + var/ambience_new = tgui_input_number(user, "Input how often you wish to hear ambience repeated! (1-60 MINUTES, 0 for disabled)", "Global Preference", pref.ambience_freq, 60, 0) if(isnull(ambience_new) || !CanUseTopic(user)) return TOPIC_NOACTION if(ambience_new < 0 || ambience_new > 60) return TOPIC_NOACTION pref.ambience_freq = ambience_new return TOPIC_REFRESH else if(href_list["select_ambience_chance"]) - var/ambience_chance_new = input(user, "Input the chance you'd like to hear ambience played to you (On area change, or by random ambience). 35 means a 35% chance to play ambience. This is a range from 0-100. 0 disables ambience playing entirely. This is also affected by Ambience Frequency.", "Global Preference", pref.ambience_freq) as null|num + var/ambience_chance_new = tgui_input_number(user, "Input the chance you'd like to hear ambience played to you (On area change, or by random ambience). 35 means a 35% chance to play ambience. This is a range from 0-100. 0 disables ambience playing entirely. This is also affected by Ambience Frequency.", "Global Preference", pref.ambience_freq, 100, 0) if(isnull(ambience_chance_new) || !CanUseTopic(user)) return TOPIC_NOACTION if(ambience_chance_new < 0 || ambience_chance_new > 100) return TOPIC_NOACTION pref.ambience_chance = ambience_chance_new @@ -126,6 +134,14 @@ pref.tgui_input_mode = !pref.tgui_input_mode return TOPIC_REFRESH + else if(href_list["tgui_large_buttons"]) + pref.tgui_large_buttons = !pref.tgui_large_buttons + return TOPIC_REFRESH + + else if(href_list["tgui_swapped_buttons"]) + pref.tgui_swapped_buttons = !pref.tgui_swapped_buttons + return TOPIC_REFRESH + else if(href_list["reset"]) switch(href_list["reset"]) if("ui") diff --git a/code/modules/client/preference_setup/global/02_settings.dm b/code/modules/client/preference_setup/global/02_settings.dm index b3da6ef214..fcdb85b843 100644 --- a/code/modules/client/preference_setup/global/02_settings.dm +++ b/code/modules/client/preference_setup/global/02_settings.dm @@ -91,7 +91,7 @@ preference = list(preference) for(var/p in preference) var/datum/client_preference/cp = get_client_preference(p) - if(!cp || !(cp.key in prefs.preferences_enabled)) + if(!prefs || !cp || !(cp.key in prefs.preferences_enabled)) return FALSE return TRUE diff --git a/code/modules/client/preference_setup/global/03_pai.dm b/code/modules/client/preference_setup/global/03_pai.dm index 01c5f7a850..c4d81e552b 100644 --- a/code/modules/client/preference_setup/global/03_pai.dm +++ b/code/modules/client/preference_setup/global/03_pai.dm @@ -42,19 +42,19 @@ var/t switch(href_list["option"]) if("name") - t = sanitizeName(input(user, "Enter a name for your pAI", "Global Preference", candidate.name) as text|null, MAX_NAME_LEN, 1) + t = sanitizeName(tgui_input_text(user, "Enter a name for your pAI", "Global Preference", candidate.name, MAX_NAME_LEN), MAX_NAME_LEN, 1) if(t && CanUseTopic(user)) candidate.name = t if("desc") - t = input(user, "Enter a description for your pAI", "Global Preference", html_decode(candidate.description)) as message|null + t = tgui_input_text(user, "Enter a description for your pAI", "Global Preference", html_decode(candidate.description), multiline = TRUE, prevent_enter = TRUE) if(!isnull(t) && CanUseTopic(user)) candidate.description = sanitize(t) if("role") - t = input(user, "Enter a role for your pAI", "Global Preference", html_decode(candidate.role)) as text|null + t = tgui_input_text(user, "Enter a role for your pAI", "Global Preference", html_decode(candidate.role)) if(!isnull(t) && CanUseTopic(user)) candidate.role = sanitize(t) if("ooc") - t = input(user, "Enter any OOC comments", "Global Preference", html_decode(candidate.comments)) as message + t = tgui_input_text(user, "Enter any OOC comments", "Global Preference", html_decode(candidate.comments), multiline = TRUE, prevent_enter = TRUE) if(!isnull(t) && CanUseTopic(user)) candidate.comments = sanitize(t) return TOPIC_REFRESH diff --git a/code/modules/client/preference_setup/loadout/gear_tweaks.dm b/code/modules/client/preference_setup/loadout/gear_tweaks.dm index 11e0f1f777..ed5306412b 100644 --- a/code/modules/client/preference_setup/loadout/gear_tweaks.dm +++ b/code/modules/client/preference_setup/loadout/gear_tweaks.dm @@ -172,7 +172,7 @@ var/datum/gear_tweak/custom_name/gear_tweak_free_name = new() return if(valid_custom_names) return tgui_input_list(user, "Choose an item name.", "Character Preference", valid_custom_names, metadata) - var/san_input = sanitize(input(user, "Choose the item's name. Leave it blank to use the default name.", "Item Name", metadata) as text|null, MAX_LNAME_LEN, extra = 0) + var/san_input = sanitize(tgui_input_text(user, "Choose the item's name. Leave it blank to use the default name.", "Item Name", metadata, MAX_LNAME_LEN), MAX_LNAME_LEN, extra = 0) return san_input ? san_input : get_default() /datum/gear_tweak/custom_name/tweak_item(var/obj/item/I, var/metadata) @@ -204,7 +204,7 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new() return if(valid_custom_desc) return tgui_input_list(user, "Choose an item description.", "Character Preference",valid_custom_desc, metadata) - var/san_input = sanitize(input(user, "Choose the item's description. Leave it blank to use the default description.", "Item Description", metadata) as message|null, extra = 0) + var/san_input = sanitize(tgui_input_text(user, "Choose the item's description. Leave it blank to use the default description.", "Item Description", metadata, multiline = TRUE, prevent_enter = TRUE), extra = 0) return san_input ? san_input : get_default() /datum/gear_tweak/custom_desc/tweak_item(var/obj/item/I, var/metadata) diff --git a/code/modules/client/preference_setup/loadout/gear_tweaks_vr.dm b/code/modules/client/preference_setup/loadout/gear_tweaks_vr.dm index 488a62fbc9..4de3362d6f 100644 --- a/code/modules/client/preference_setup/loadout/gear_tweaks_vr.dm +++ b/code/modules/client/preference_setup/loadout/gear_tweaks_vr.dm @@ -5,7 +5,7 @@ return "" /datum/gear_tweak/collar_tag/get_metadata(var/user, var/metadata) - return sanitize( input(user, "Choose the tag text", "Character Preference", metadata) as text , MAX_NAME_LEN ) + return sanitize( tgui_input_text(user, "Choose the tag text", "Character Preference", metadata, MAX_NAME_LEN), MAX_NAME_LEN ) /datum/gear_tweak/collar_tag/tweak_item(var/obj/item/clothing/accessory/collar/C, var/metadata) if(metadata == "") diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 4801ee9d82..db6ac1e5f3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -1396,7 +1396,13 @@ /datum/gear/fluff/nehi_radio path = /obj/item/device/radio/headset/fluff/zodiacshadow - display_name = "Nehi's Radio" + display_name = "Nehi's 'phones" + ckeywhitelist = list("zodiacshadow") + character_name = list("Nehi Maximus") + +/datum/gear/fluff/nehi_health_medal + path = /obj/item/clothing/accessory/medal/silver/fluff/zodiacshadow + display_name = "Health Service Achievement medal" ckeywhitelist = list("zodiacshadow") character_name = list("Nehi Maximus") diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index 417b1c5257..75697053aa 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -129,3 +129,17 @@ Talon winter coat /datum/gear/suit/russofurcoat display_name = "long fur coat" path = /obj/item/clothing/suit/storage/vest/hoscoat/russofurcoat + +//Colorable Hoodie + +/datum/gear/suit/hoodie_vr + display_name = "hoodie with hood (colorable)" + path = /obj/item/clothing/suit/storage/hooded/hoodie + +/datum/gear/suit/hoodie_vr/New() + var/list/hoodies = list() + for(var/hoodie_style in typesof(/obj/item/clothing/suit/storage/hooded/hoodie)) + var/obj/item/clothing/suit/storage/toggle/hoodie/hoodie = hoodie_style + hoodies[initial(hoodie.name)] = hoodie + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hoodies)) + gear_tweaks += gear_tweak_free_color_choice diff --git a/code/modules/client/preference_setup/volume_sliders/01_volume.dm b/code/modules/client/preference_setup/volume_sliders/01_volume.dm index 90c0b227c0..7dea5d2053 100644 --- a/code/modules/client/preference_setup/volume_sliders/01_volume.dm +++ b/code/modules/client/preference_setup/volume_sliders/01_volume.dm @@ -40,7 +40,7 @@ var/channel = href_list["change_volume"] if(!(channel in pref.volume_channels)) pref.volume_channels["[channel]"] = 1 - var/value = input(usr, "Choose your volume for [channel] (0-200%)", "[channel] volume", (pref.volume_channels[channel] * 100)) + var/value = tgui_input_number(usr, "Choose your volume for [channel] (0-200%)", "[channel] volume", (pref.volume_channels[channel] * 100), 200, 0) if(isnum(value)) value = CLAMP(value, 0, 200) pref.volume_channels["[channel]"] = (value / 100) diff --git a/code/modules/client/preference_setup/volume_sliders/02_media.dm b/code/modules/client/preference_setup/volume_sliders/02_media.dm index 3fbb972ad2..98f7bb4cfe 100644 --- a/code/modules/client/preference_setup/volume_sliders/02_media.dm +++ b/code/modules/client/preference_setup/volume_sliders/02_media.dm @@ -33,7 +33,7 @@ /datum/category_item/player_setup_item/volume_sliders/media/OnTopic(var/href, var/list/href_list, var/mob/user) if(href_list["change_media_volume"]) if(CanUseTopic(user)) - var/value = input(usr, "Choose your Jukebox volume (0-100%)", "Jukebox volume", round(pref.media_volume * 100)) + var/value = tgui_input_number(usr, "Choose your Jukebox volume (0-100%)", "Jukebox volume", round(pref.media_volume * 100), 100, 0) if(isnum(value)) value = CLAMP(value, 0, 100) pref.media_volume = value/100.0 diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm index 95a944e931..37a71587b1 100644 --- a/code/modules/client/preference_setup/vore/02_size.dm +++ b/code/modules/client/preference_setup/vore/02_size.dm @@ -58,7 +58,7 @@ /datum/category_item/player_setup_item/vore/size/OnTopic(var/href, var/list/href_list, var/mob/user) if(href_list["size_multiplier"]) - var/new_size = input(user, "Choose your character's size, ranging from 25% to 200%", "Set Size") as num|null + var/new_size = tgui_input_number(user, "Choose your character's size, ranging from 25% to 200%", "Set Size", null, 200, 25) if (!ISINRANGE(new_size,25,200)) pref.size_multiplier = 1 to_chat(user, "Invalid size.") @@ -72,11 +72,11 @@ return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["weight"]) - var/new_weight = input(user, "Choose your character's relative body weight.\n\ + var/new_weight = tgui_input_number(user, "Choose your character's relative body weight.\n\ This measurement should be set relative to a normal 5'10'' person's body and not the actual size of your character.\n\ If you set your weight to 500 because you're a naga or have metal implants then complain that you're a blob I\n\ swear to god I will find you and I will punch you for not reading these directions!\n\ - ([WEIGHT_MIN]-[WEIGHT_MAX])", "Character Preference") as num|null + ([WEIGHT_MIN]-[WEIGHT_MAX])", "Character Preference", null, WEIGHT_MAX, WEIGHT_MIN) if(new_weight) var/unit_of_measurement = tgui_alert(user, "Is that number in pounds (lb) or kilograms (kg)?", "Confirmation", list("Pounds", "Kilograms")) if(unit_of_measurement == "Pounds") @@ -87,7 +87,7 @@ return TOPIC_REFRESH else if(href_list["weight_gain"]) - var/weight_gain_rate = tgui_input_num(user, "Choose your character's rate of weight gain between 100% \ + var/weight_gain_rate = tgui_input_number(user, "Choose your character's rate of weight gain between 100% \ (full realism body fat gain) and 0% (no body fat gain).\n\ (If you want to disable weight gain, set this to 0.01 to round it to 0%.)\ ([WEIGHT_CHANGE_MIN]-[WEIGHT_CHANGE_MAX])", "Character Preference", pref.weight_gain) @@ -96,7 +96,7 @@ return TOPIC_REFRESH else if(href_list["weight_loss"]) - var/weight_loss_rate = tgui_input_num(user, "Choose your character's rate of weight loss between 100% \ + var/weight_loss_rate = tgui_input_number(user, "Choose your character's rate of weight loss between 100% \ (full realism body fat loss) and 0% (no body fat loss).\n\ (If you want to disable weight loss, set this to 0.01 round it to 0%.)\ ([WEIGHT_CHANGE_MIN]-[WEIGHT_CHANGE_MAX])", "Character Preference", pref.weight_loss) diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index 931a3c1f58..e6a1652d80 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -20,7 +20,7 @@ var/list/neg_traits = list() var/traits_cheating = 0 //Varedit by admins allows saving new maximums on people who apply/etc - var/starting_trait_points = STARTING_SPECIES_POINTS + var/starting_trait_points = 0 var/max_traits = MAX_SPECIES_TRAITS var/dirty_synth = 0 //Are you a synth var/gross_meatbag = 0 //Where'd I leave my Voight-Kampff test kit? @@ -72,7 +72,11 @@ pref.blood_color = sanitize_hexcolor(pref.blood_color, default="#A10808") if(!pref.traits_cheating) - pref.starting_trait_points = STARTING_SPECIES_POINTS + var/datum/species/S = GLOB.all_species[pref.species] + if(S) + pref.starting_trait_points = S.trait_points + else + pref.starting_trait_points = 0 pref.max_traits = MAX_SPECIES_TRAITS if(pref.organ_data[O_BRAIN]) //Checking if we have a synth on our hands, boys. @@ -82,14 +86,14 @@ pref.gross_meatbag = 1 pref.dirty_synth = 0 - if(pref.species != SPECIES_CUSTOM) - pref.pos_traits.Cut() - pref.neg_traits.Cut() // Clean up positive traits for(var/datum/trait/path as anything in pref.pos_traits) if(!(path in positive_traits)) pref.pos_traits -= path continue + if(!(pref.species == SPECIES_CUSTOM) && !(path in everyone_traits_positive)) + pref.pos_traits -= path + continue var/take_flags = initial(path.can_take) if((pref.dirty_synth && !(take_flags & SYNTHETICS)) || (pref.gross_meatbag && !(take_flags & ORGANICS))) pref.pos_traits -= path @@ -98,7 +102,7 @@ if(!(path in neutral_traits)) pref.neu_traits -= path continue - if(!(pref.species == SPECIES_CUSTOM) && !(path in everyone_traits)) + if(!(pref.species == SPECIES_CUSTOM) && !(path in everyone_traits_neutral)) pref.neu_traits -= path continue var/take_flags = initial(path.can_take) @@ -109,6 +113,9 @@ if(!(path in negative_traits)) pref.neg_traits -= path continue + if(!(pref.species == SPECIES_CUSTOM) && !(path in everyone_traits_negative)) + pref.neg_traits -= path + continue var/take_flags = initial(path.can_take) if((pref.dirty_synth && !(take_flags & SYNTHETICS)) || (pref.gross_meatbag && !(take_flags & ORGANICS))) pref.neg_traits -= path @@ -141,6 +148,9 @@ var/datum/species/S = character.species var/datum/species/new_S = S.produceCopy(pref.pos_traits + pref.neu_traits + pref.neg_traits, character, pref.custom_base) + for(var/datum/trait/T in new_S.traits) + T.apply_pref(src) + //Any additional non-trait settings can be applied here new_S.blood_color = pref.blood_color @@ -148,8 +158,6 @@ //Statistics for this would be nice var/english_traits = english_list(new_S.traits, and_text = ";", comma_text = ";") log_game("TRAITS [pref.client_ckey]/([character]) with: [english_traits]") //Terrible 'fake' key_name()... but they aren't in the same entity yet - else - /datum/category_item/player_setup_item/vore/traits/content(var/mob/user) . += "Custom Species Name: " @@ -162,36 +170,38 @@ var/traits_left = pref.max_traits - if(pref.species == SPECIES_CUSTOM) - var/points_left = pref.starting_trait_points - for(var/T in pref.pos_traits + pref.neg_traits) - points_left -= traits_costs[T] - traits_left-- - . += "Traits Left: [traits_left]
" - . += "Points Left: [points_left]
" - if(points_left < 0 || traits_left < 0 || !pref.custom_species) - . += "^ Fix things! ^
" + var/points_left = pref.starting_trait_points - . += "Positive Trait +
" - . += "
- "
- for(var/T in pref.pos_traits)
- var/datum/trait/trait = positive_traits[T]
- . += "
" + . += "Points Left: [points_left]
" + if(points_left < 0 || traits_left < 0 || (!pref.custom_species && pref.species == SPECIES_CUSTOM)) + . += "^ Fix things! ^
" + + . += "Positive Trait +
" + . += "
- "
+ for(var/T in pref.pos_traits)
+ var/datum/trait/trait = positive_traits[T]
+ . += "
" - . += "
- "
- for(var/T in pref.neg_traits)
- var/datum/trait/trait = negative_traits[T]
- . += "
" . += "
- "
for(var/T in pref.neu_traits)
var/datum/trait/trait = neutral_traits[T]
. += "
" + . += "
- "
+ for(var/T in pref.neg_traits)
+ var/datum/trait/trait = negative_traits[T]
+ . += "
" @@ -219,8 +229,8 @@ return TOPIC_NOACTION else if(href_list["custom_species"]) - var/raw_choice = sanitize(input(user, "Input your custom species name:", - "Character Preference", pref.custom_species) as null|text, MAX_NAME_LEN) + var/raw_choice = sanitize(tgui_input_text(user, "Input your custom species name:", + "Character Preference", pref.custom_species, MAX_NAME_LEN), MAX_NAME_LEN) if (CanUseTopic(user)) pref.custom_species = raw_choice return TOPIC_REFRESH @@ -251,6 +261,8 @@ var/choice = tgui_alert(usr, "Remove [initial(trait.name)] and regain [initial(trait.cost)] points?","Remove Trait",list("Remove","Cancel")) if(choice == "Remove") pref.pos_traits -= trait + var/datum/trait/instance = all_traits[trait] + instance.remove_pref(pref) return TOPIC_REFRESH else if(href_list["clicked_neu_trait"]) @@ -258,6 +270,8 @@ var/choice = tgui_alert(usr, "Remove [initial(trait.name)]?","Remove Trait",list("Remove","Cancel")) if(choice == "Remove") pref.neu_traits -= trait + var/datum/trait/instance = all_traits[trait] + instance.remove_pref(pref) return TOPIC_REFRESH else if(href_list["clicked_neg_trait"]) @@ -265,28 +279,30 @@ var/choice = tgui_alert(usr, "Remove [initial(trait.name)] and lose [initial(trait.cost)] points?","Remove Trait",list("Remove","Cancel")) if(choice == "Remove") pref.neg_traits -= trait + var/datum/trait/instance = all_traits[trait] + instance.remove_pref(pref) return TOPIC_REFRESH else if(href_list["custom_say"]) - var/say_choice = sanitize(input(usr, "This word or phrase will appear instead of 'says': [pref.real_name] says, \"Hi.\"", "Custom Say", pref.custom_say) as null|text, 12) + var/say_choice = sanitize(tgui_input_text(usr, "This word or phrase will appear instead of 'says': [pref.real_name] says, \"Hi.\"", "Custom Say", pref.custom_say, 12), 12) if(say_choice) pref.custom_say = say_choice return TOPIC_REFRESH else if(href_list["custom_whisper"]) - var/whisper_choice = sanitize(input(usr, "This word or phrase will appear instead of 'whispers': [pref.real_name] whispers, \"Hi...\"", "Custom Whisper", pref.custom_whisper) as null|text, 12) + var/whisper_choice = sanitize(tgui_input_text(usr, "This word or phrase will appear instead of 'whispers': [pref.real_name] whispers, \"Hi...\"", "Custom Whisper", pref.custom_whisper, 12), 12) if(whisper_choice) pref.custom_whisper = whisper_choice return TOPIC_REFRESH else if(href_list["custom_ask"]) - var/ask_choice = sanitize(input(usr, "This word or phrase will appear instead of 'asks': [pref.real_name] asks, \"Hi?\"", "Custom Ask", pref.custom_ask) as null|text, 12) + var/ask_choice = sanitize(tgui_input_text(usr, "This word or phrase will appear instead of 'asks': [pref.real_name] asks, \"Hi?\"", "Custom Ask", pref.custom_ask, 12), 12) if(ask_choice) pref.custom_ask = ask_choice return TOPIC_REFRESH else if(href_list["custom_exclaim"]) - var/exclaim_choice = sanitize(input(usr, "This word or phrase will appear instead of 'exclaims', 'shouts' or 'yells': [pref.real_name] exclaims, \"Hi!\"", "Custom Exclaim", pref.custom_exclaim) as null|text, 12) + var/exclaim_choice = sanitize(tgui_input_text(usr, "This word or phrase will appear instead of 'exclaims', 'shouts' or 'yells': [pref.real_name] exclaims, \"Hi!\"", "Custom Exclaim", pref.custom_exclaim, 12), 12) if(exclaim_choice) pref.custom_exclaim = exclaim_choice return TOPIC_REFRESH @@ -321,18 +337,26 @@ var/list/mylist switch(mode) if(POSITIVE_MODE) - picklist = positive_traits.Copy() - pref.pos_traits - mylist = pref.pos_traits + if(pref.species == SPECIES_CUSTOM) + picklist = positive_traits.Copy() - pref.pos_traits + mylist = pref.pos_traits + else + picklist = everyone_traits_positive.Copy() - pref.pos_traits + mylist = pref.pos_traits if(NEUTRAL_MODE) if(pref.species == SPECIES_CUSTOM) picklist = neutral_traits.Copy() - pref.neu_traits mylist = pref.neu_traits else - picklist = everyone_traits.Copy() - pref.neu_traits + picklist = everyone_traits_neutral.Copy() - pref.neu_traits mylist = pref.neu_traits if(NEGATIVE_MODE) - picklist = negative_traits.Copy() - pref.neg_traits - mylist = pref.neg_traits + if(pref.species == SPECIES_CUSTOM) + picklist = negative_traits.Copy() - pref.neg_traits + mylist = pref.neg_traits + else + picklist = everyone_traits_negative.Copy() - pref.neg_traits + mylist = pref.neg_traits else if(isnull(picklist)) @@ -417,10 +441,16 @@ conflict = instance_test.name break varconflict + for(var/V in instance.var_changes_pref) + if(V in instance_test.var_changes_pref) + conflict = instance_test.name + break varconflict + if(conflict) tgui_alert_async(usr, "You cannot take this trait and [conflict] at the same time. Please remove that trait, or pick another trait to add.", "Error") return TOPIC_REFRESH + instance.apply_pref(pref) mylist += path return TOPIC_REFRESH diff --git a/code/modules/client/preference_setup/vore/09_misc.dm b/code/modules/client/preference_setup/vore/09_misc.dm index fff3bb6af4..94fe6b0153 100644 --- a/code/modules/client/preference_setup/vore/09_misc.dm +++ b/code/modules/client/preference_setup/vore/09_misc.dm @@ -58,7 +58,7 @@ pref.directory_erptag = new_erptag return TOPIC_REFRESH else if(href_list["directory_ad"]) - var/msg = sanitize(input(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad)) as message, extra = 0) //VOREStation Edit: separating out OOC notes + var/msg = sanitize(tgui_input_text(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad), multiline = TRUE, prevent_enter = TRUE), extra = 0) //VOREStation Edit: separating out OOC notes pref.directory_ad = msg return TOPIC_REFRESH else if(href_list["toggle_sensor_setting"]) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index c663ff8f6f..f49d7c040b 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -28,7 +28,9 @@ var/list/preferences_datums = list() var/tgui_fancy = TRUE var/tgui_lock = FALSE - var/tgui_input_mode = FALSE // Say, Me, Whisper, Subtle Input Mode; Disabled by default; FALSE = BYOND, TRUE = TGUI + var/tgui_input_mode = FALSE // All the Input Boxes (Text,Number,List,Alert) + var/tgui_large_buttons = TRUE + var/tgui_swapped_buttons = FALSE //character preferences var/real_name //our character's name diff --git a/code/modules/client/ui_style.dm b/code/modules/client/ui_style.dm index 4b321f2f53..8317d977e3 100644 --- a/code/modules/client/ui_style.dm +++ b/code/modules/client/ui_style.dm @@ -48,7 +48,7 @@ var/global/list/all_tooltip_styles = list( var/UI_style_new = tgui_input_list(usr, "Select a style. White is recommended for customization", "UI Style Choice", all_ui_styles) if(!UI_style_new) return - var/UI_style_alpha_new = input(usr, "Select a new alpha (transparency) parameter for your UI, between 50 and 255") as null|num + var/UI_style_alpha_new = tgui_input_number(usr, "Select a new alpha (transparency) parameter for your UI, between 50 and 255", null, null, 255, 50) if(!UI_style_alpha_new || !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return var/UI_style_color_new = input(usr, "Choose your UI color. Dark colors are not recommended!") as color|null diff --git a/code/modules/client/verbs/character_directory.dm b/code/modules/client/verbs/character_directory.dm index fc003569d5..8e7162cc78 100644 --- a/code/modules/client/verbs/character_directory.dm +++ b/code/modules/client/verbs/character_directory.dm @@ -137,7 +137,7 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) return var/current_ad = usr.client.prefs.directory_ad - var/new_ad = sanitize(input(usr, "Change your character ad", "Character Ad", current_ad) as message|null, extra = 0) + var/new_ad = sanitize(tgui_input_text(usr, "Change your character ad", "Character Ad", current_ad, multiline = TRUE, prevent_enter = TRUE), extra = 0) if(isnull(new_ad)) return usr.client.prefs.directory_ad = new_ad diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 7936322924..282c1c6cca 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -779,7 +779,7 @@ var/image/standing = ..() if(taurized) //Special snowflake var on suits standing.pixel_x = -16 - standing.layer = BODY_LAYER + 15 // 15 is above tail layer, so will not be covered by taurbody. + standing.layer = BODY_LAYER + 16 // 16 is above tail layer, so will not be covered by taurbody. return standing /obj/item/clothing/suit/apply_accessories(var/image/standing) diff --git a/code/modules/clothing/head/hood.dm b/code/modules/clothing/head/hood.dm index 8f7f752ee0..4243b0fa27 100644 --- a/code/modules/clothing/head/hood.dm +++ b/code/modules/clothing/head/hood.dm @@ -203,9 +203,16 @@ name = "techpriest hood" desc = "A techpriest hood." icon_state = "techpriesthood" - + /obj/item/clothing/head/hood/siffet_hood name = "siffet hood" desc = "A hood that looks vaguely like a siffet's head. Guaranteed to traumatize your Promethean coworkers." icon_state = "siffet" item_state_slots = list(slot_r_hand_str = "siffet", slot_l_hand_str = "siffet") + +/obj/item/clothing/head/hood/hoodie + name = "hood" + desc = "The hood of a hoodie. Cosy!" + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' + icon_state = "hood_plain" diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 56f69bda52..d748ace993 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -7,7 +7,7 @@ desc = "A cheap NT knock-off of an Unathi battle-rig. Looks like a fish, moves like a fish, steers like a cow." suit_type = "\improper NT breacher" icon_state = "breacher_rig_cheap" - armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 70, bio = 100, rad = 50) + armor = list(melee = 60, bullet = 45, laser = 35, energy = 35, bomb = 70, bio = 100, rad = 50) emp_protection = -20 slowdown = 6 offline_slowdown = 10 diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index f1eb67dc03..5945e2f982 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -60,6 +60,8 @@ hood.canremove = FALSE icon_state = "[toggleicon]_t" H.update_inv_wear_suit() + if(color != hood.color) + hood.color = color else RemoveHood() diff --git a/code/modules/clothing/suits/hooded_vr.dm b/code/modules/clothing/suits/hooded_vr.dm index cb279936aa..4b79a4e3c0 100644 --- a/code/modules/clothing/suits/hooded_vr.dm +++ b/code/modules/clothing/suits/hooded_vr.dm @@ -78,3 +78,45 @@ icon_state = "taloncoat" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) hoodtype = /obj/item/clothing/head/hood/winter/talon + +//Functional hoodie + +/obj/item/clothing/suit/storage/hooded/hoodie + name = "hoodie" + desc = "A warm jacket, now featuring a hood!" + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "hoodie_plain" + item_state_slots = list(slot_r_hand_str = "grey_hoodie", slot_l_hand_str = "grey_hoodie") + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + flags_inv = HIDEHOLSTER + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + hoodtype = /obj/item/clothing/head/hood/hoodie + allowed = list(/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, + /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit) + +/obj/item/clothing/suit/storage/hooded/hoodie/redtrim + name = "red-trimmed hoodie" + desc = "A warm jacket, now featuring a hood and a bold red trim!" + icon_state = "hoodie_redtrim" + +/obj/item/clothing/suit/storage/hooded/hoodie/bluetrim + name = "blue-trimmed hoodie" + desc = "A warm jacket, now featuring a hood and a cool blue trim!" + icon_state = "hoodie_bluetrim" + +/obj/item/clothing/suit/storage/hooded/hoodie/greentrim + name = "green-trimmed hoodie" + desc = "A warm jacket, now featuring a hood and a chilled green trim!" + icon_state = "hoodie_greentrim" + +/obj/item/clothing/suit/storage/hooded/hoodie/purpletrim + name = "purple-trimmed hoodie" + desc = "A warm jacket, now featuring a hood and a smart purple trim!" + icon_state = "hoodie_purpletrim" + +/obj/item/clothing/suit/storage/hooded/hoodie/yellowtrim + name = "yellow-trimmed hoodie" + desc = "A warm jacket, now featuring a hood and an eye-catching yellow trim!" + icon_state = "hoodie_yellowtrim" diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index d337ef47a4..4c68c2be59 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -167,7 +167,7 @@ var/new_frequency = sanitize_frequency(frequency + text2num(href_list["freq"])) set_frequency(new_frequency) if(href_list["tag"]) - var/str = copytext(reject_bad_text(input(usr,"Tag text?","Set tag","")),1,MAX_NAME_LEN) + var/str = copytext(reject_bad_text(tgui_input_text(usr,"Tag text?","Set tag","",MAX_NAME_LEN)),1,MAX_NAME_LEN) if(!str || !length(str)) to_chat(usr,"[name]'s tag set to be blank.") name = initial(name) @@ -300,7 +300,7 @@ return to_chat(user,"You adjust the [name]'s tag.") - var/str = copytext(reject_bad_text(input(user,"Tag text?","Set tag","")),1,MAX_NAME_LEN) + var/str = copytext(reject_bad_text(tgui_input_text(user,"Tag text?","Set tag","",MAX_NAME_LEN)),1,MAX_NAME_LEN) if(!str || !length(str)) to_chat(user,"[name]'s tag set to be blank.") @@ -337,7 +337,7 @@ if(!(istype(user.get_active_hand(),I)) || !(istype(user.get_inactive_hand(),src)) || (user.stat)) return - var/str = copytext(reject_bad_text(input(user,"Tag text?","Set tag","")),1,MAX_NAME_LEN) + var/str = copytext(reject_bad_text(tgui_input_text(user,"Tag text?","Set tag","",MAX_NAME_LEN)),1,MAX_NAME_LEN) if(!str || !length(str)) if(!writtenon) diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 72690c590f..e52df06471 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -76,7 +76,7 @@ to_chat(H,"You must be WEARING the uniform to change your size.") return - var/new_size = input(usr, "Put the desired size (25-200%), or (1-600%) in dormitory areas.", "Set Size", 200) as num|null + var/new_size = tgui_input_number(usr, "Put the desired size (25-200%), or (1-600%) in dormitory areas.", "Set Size", 200, 600, 1) if(!new_size) return //cancelled diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm index 237f1206cb..8fa9fe73e4 100644 --- a/code/modules/economy/Accounts_DB.dm +++ b/code/modules/economy/Accounts_DB.dm @@ -127,12 +127,12 @@ creating_new_account = 1 if("add_funds") - var/amount = input(usr, "Enter the amount you wish to add", "Silently add funds") as num + var/amount = tgui_input_number(usr, "Enter the amount you wish to add", "Silently add funds") if(detailed_account_view) detailed_account_view.money = min(detailed_account_view.money + amount, fund_cap) if("remove_funds") - var/amount = input(usr, "Enter the amount you wish to remove", "Silently remove funds") as num + var/amount = tgui_input_number(usr, "Enter the amount you wish to remove", "Silently remove funds") if(detailed_account_view) detailed_account_view.money = max(detailed_account_view.money - amount, -fund_cap) diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index 1517af0cc0..beae04ee7c 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -145,9 +145,9 @@ if(href_list["choice"]) switch(href_list["choice"]) if("change_code") - var/attempt_code = input(usr, "Re-enter the current EFTPOS access code", "Confirm old EFTPOS code") as num + var/attempt_code = tgui_input_number(usr, "Re-enter the current EFTPOS access code", "Confirm old EFTPOS code") if(attempt_code == access_code) - var/trycode = input(usr, "Enter a new access code for this device (4-6 digits, numbers only)", "Enter new EFTPOS code") as num + var/trycode = tgui_input_number(usr, "Enter a new access code for this device (4-6 digits, numbers only)", "Enter new EFTPOS code", null, 999999, 1000) if(trycode >= 1000 && trycode <= 999999) access_code = trycode else @@ -163,8 +163,8 @@ else to_chat(usr, "[bicon(src)]Incorrect code entered.") if("link_account") - var/attempt_account_num = input(usr, "Enter account number to pay EFTPOS charges into", "New account number") as num - var/attempt_pin = input(usr, "Enter pin code", "Account pin") as num + var/attempt_account_num = tgui_input_number(usr, "Enter account number to pay EFTPOS charges into", "New account number") + var/attempt_pin = tgui_input_number(usr, "Enter pin code", "Account pin") linked_account = attempt_account_access(attempt_account_num, attempt_pin, 1) if(linked_account) if(linked_account.suspended) @@ -176,7 +176,7 @@ var/choice = sanitize(input(usr, "Enter reason for EFTPOS transaction", "Transaction purpose")) if(choice) transaction_purpose = choice if("trans_value") - var/try_num = input(usr, "Enter amount for EFTPOS transaction", "Transaction amount") as num + var/try_num = tgui_input_number(usr, "Enter amount for EFTPOS transaction", "Transaction amount") if(try_num < 0) tgui_alert_async(usr, "That is not a valid amount!") else @@ -187,7 +187,7 @@ transaction_locked = 0 transaction_paid = 0 else - var/attempt_code = input(usr, "Enter EFTPOS access code", "Reset Transaction") as num + var/attempt_code = tgui_input_number(usr, "Enter EFTPOS access code", "Reset Transaction") if(attempt_code == access_code) transaction_locked = 0 transaction_paid = 0 @@ -229,7 +229,7 @@ var/attempt_pin = "" var/datum/money_account/D = get_account(C.associated_account_number) if(D.security_level) - attempt_pin = input(usr, "Enter pin code", "EFTPOS transaction") as num + attempt_pin = tgui_input_number(usr, "Enter pin code", "EFTPOS transaction") D = null D = attempt_account_access(C.associated_account_number, attempt_pin, 2) if(D) diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index ec2ad51dca..e5a539f5e8 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -80,7 +80,7 @@ return worth /obj/item/weapon/spacecash/attack_self() - var/amount = input(usr, "How many [initial_name]s do you want to take? (0 to [src.worth])", "Take Money", 20) as num + var/amount = tgui_input_number(usr, "How many [initial_name]s do you want to take? (0 to [src.worth])", "Take Money", 20) if(!src || QDELETED(src)) return amount = round(CLAMP(amount, 0, src.worth)) diff --git a/code/modules/economy/cash_register.dm b/code/modules/economy/cash_register.dm index 9286401aae..08d4ab66d8 100644 --- a/code/modules/economy/cash_register.dm +++ b/code/modules/economy/cash_register.dm @@ -107,8 +107,8 @@ if("toggle_cash_lock") cash_locked = !cash_locked if("link_account") - var/attempt_account_num = input(usr, "Enter account number", "New account number") as num - var/attempt_pin = input(usr, "Enter PIN", "Account PIN") as num + var/attempt_account_num = tgui_input_number(usr, "Enter account number", "New account number") + var/attempt_pin = tgui_input_number(usr, "Enter PIN", "Account PIN") linked_account = attempt_account_access(attempt_account_num, attempt_pin, 1) if(linked_account) if(linked_account.suspended) @@ -117,11 +117,11 @@ else to_chat(usr, "[bicon(src)]Account not found.") if("custom_order") - var/t_purpose = sanitize(input(usr, "Enter purpose", "New purpose") as text) + var/t_purpose = sanitize(tgui_input_text(usr, "Enter purpose", "New purpose")) if (!t_purpose || !Adjacent(usr)) return transaction_purpose = t_purpose item_list += t_purpose - var/t_amount = round(input(usr, "Enter price", "New price") as num) + var/t_amount = round(tgui_input_number(usr, "Enter price", "New price")) if (!t_amount || !Adjacent(usr) || t_amount < 0) return transaction_amount += t_amount price_list += t_amount @@ -129,7 +129,7 @@ src.visible_message("[bicon(src)][transaction_purpose]: [t_amount] Thaler\s.") if("set_amount") var/item_name = locate(href_list["item"]) - var/n_amount = round(input(usr, "Enter amount", "New amount") as num) + var/n_amount = round(tgui_input_number(usr, "Enter amount", "New amount")) n_amount = CLAMP(n_amount, 0, 20) if (!item_list[item_name] || !Adjacent(usr)) return transaction_amount += (n_amount - item_list[item_name]) * price_list[item_name] @@ -234,7 +234,7 @@ var/datum/money_account/D = get_account(I.associated_account_number) var/attempt_pin = "" if(D && D.security_level) - attempt_pin = input(usr, "Enter PIN", "Transaction") as num + attempt_pin = tgui_input_number(usr, "Enter PIN", "Transaction") D = null D = attempt_account_access(I.associated_account_number, attempt_pin, 2) diff --git a/code/modules/economy/casinocash.dm b/code/modules/economy/casinocash.dm index 25486c33f8..201c6147db 100644 --- a/code/modules/economy/casinocash.dm +++ b/code/modules/economy/casinocash.dm @@ -112,7 +112,7 @@ return worth /obj/item/weapon/spacecasinocash/attack_self() - var/amount = input(usr, "How much credits worth of chips do you want to take? (0 to [src.worth])", "Take chips", 20) as num + var/amount = tgui_input_number(usr, "How much credits worth of chips do you want to take? (0 to [src.worth])", "Take chips", 20) if(!src || QDELETED(src)) return amount = round(CLAMP(amount, 0, src.worth)) diff --git a/code/modules/economy/lorenews.dm b/code/modules/economy/lorenews.dm index 4f82c6f12a..fd812fec95 100644 --- a/code/modules/economy/lorenews.dm +++ b/code/modules/economy/lorenews.dm @@ -68,7 +68,7 @@ "The EIO has officially raised the Emergence Threat Level in [pick(solgov)] to Blue. Citizens are reminded to comply with all EIO Agent requests. Failure to do so will be met with legal action, up to and including imprisonment.", "All SolGov citizens beware, the scourge know as the Vox have increased the frequency of their attacks on isolated and poorly defended SolGov territories in [pick(bowl)]. Citizens have been advised to travel in groups and remain aware of their surroundings at all times.", "The Unathi have recently moved a large amount of material into Abel's Rest, under the premise of building additional power plants. According to our sources, the material is in fact being channeled into domestic terrorist groups on both sides, in an attempt to incite a SolGov response. More news as the story develops.", - "Controversial Kishari director [random_name(FEMALE)] announced this Friday a sequel to the 2525 animated series Soldiers of the Yearlong War. Open auditions for supporting cast members have been called.", + "Controversial Kishari director [random_name(FEMALE)] announced this Friday a sequel to the 2281 animated series Soldiers of the Yearlong War. Open auditions for supporting cast members have been called.", "Amid concerns that it promotes a pro-transtech agenda, a high-profile screening of the award-winning animated film \"The Inventor's Marvelous Mechanical Maidens\" was canceled today on [pick(pick(core, heights))].", "A radiation leak caused by a power unit rupture at a [pick(solgov)] hazardous materials reclamation plant has left several workers and neighboring residents with acute radiation poisoning. Witnesses report that a basic lifting drone failed to recognize and collided with the misplaced unit.", "Xenophobic fringe group Humanity First has claimed credit for a bombing at a local government office on [pick(solgov)] which left three seriously injured. Police report that they have two suspects in custody, but details remain sparse.", @@ -89,7 +89,7 @@ "Miners in [pick(bowl)] were dismayed to discover that their boss was actually a C-class drone intelligence! \"I should've known there was something wrong,\" says dumbfounded miner [random_name(MALE)],\"I'd say good morning and he'd just start listing off mineral densities and coordinates. I just thought he loved his job a little too much.\"", "The remains of an early 22nd century voidcraft containing \"Period artifacts, technology and human remains\" has been located on the surface of Luna after centuries of being disregarded as worthless wreck. Historians hope the find will provide insight into daily life under the short-lived Selene Federation.", "The unexpected discovery of the remains of a what was believed to be a previously undiscovered species by workers on [pick("Nisp", "Binma", "Sif", "Kishar", "Abel's Rest", "Merelar")] has now been dismissed. Upon close analysis of the specimen, it was identified as a \"Bear with mange\", apparently dumped there some weeks prior.", - "According to a public statement by electronics giant Ward-Takahashi, many artificial intelligence systems - ranging from household appliances to industrial drones and habitat control networks - manufactured before 2550 could be at risk from a new virus dubbed \"Cap-3k\".", + "According to a public statement by electronics giant Ward-Takahashi, many artificial intelligence systems - ranging from household appliances to industrial drones and habitat control networks - manufactured before 2300 could be at risk from a new virus dubbed \"Cap-3k\".", "A controversial opera billed as \"The true story of Nos Amis\" has been criticized by law enforcement agencies as \"glorifying\" some of the most infamous gangsters of the 22nd century. The Polish-language \"Z Francji, do Gwiazd\" is to be distributed exclusively in Alpha Centauri for one week only.", "Injury count continues to rise in the aftermath of the Positronic Rights Group Rally in [pick(pick(bowl, core, heights))]. Homemade teargas grenades were launched into the crowd at approximately 3:45 pm on Saturday by an unidentified person. Authorities urge anyone with information to call in, toll-free, at any time.", "Representatives report that investigations continue on a string of fires on [pick("Nisp", "Binma", "Sif", "Kishar", "Abel's Rest", "Merelar")]. While no information has been released to the public, authorities assure the press that they are doing everything in their power to find those responsible.", diff --git a/code/modules/economy/retail_scanner.dm b/code/modules/economy/retail_scanner.dm index 6e68b644aa..d9755b5041 100644 --- a/code/modules/economy/retail_scanner.dm +++ b/code/modules/economy/retail_scanner.dm @@ -101,8 +101,8 @@ else to_chat(usr, "[bicon(src)]Insufficient access.") if("link_account") - var/attempt_account_num = input(usr, "Enter account number", "New account number") as num - var/attempt_pin = input(usr, "Enter PIN", "Account PIN") as num + var/attempt_account_num = tgui_input_number(usr, "Enter account number", "New account number") + var/attempt_pin = tgui_input_number(usr, "Enter PIN", "Account PIN") linked_account = attempt_account_access(attempt_account_num, attempt_pin, 1) if(linked_account) if(linked_account.suspended) @@ -111,11 +111,11 @@ else to_chat(usr, "[bicon(src)]Account not found.") if("custom_order") - var/t_purpose = sanitize(input(usr, "Enter purpose", "New purpose") as text) + var/t_purpose = sanitize(tgui_input_text(usr, "Enter purpose", "New purpose")) if (!t_purpose || !Adjacent(usr)) return transaction_purpose = t_purpose item_list += t_purpose - var/t_amount = round(input(usr, "Enter price", "New price") as num) + var/t_amount = round(tgui_input_number(usr, "Enter price", "New price")) if (!t_amount || !Adjacent(usr)) return transaction_amount += t_amount price_list += t_amount @@ -123,7 +123,7 @@ src.visible_message("[bicon(src)][transaction_purpose]: [t_amount] Thaler\s.") if("set_amount") var/item_name = locate(href_list["item"]) - var/n_amount = round(input(usr, "Enter amount", "New amount") as num) + var/n_amount = round(tgui_input_number(usr, "Enter amount", "New amount")) n_amount = CLAMP(n_amount, 0, 20) if (!item_list[item_name] || !Adjacent(usr)) return transaction_amount += (n_amount - item_list[item_name]) * price_list[item_name] @@ -211,7 +211,7 @@ var/datum/money_account/D = get_account(I.associated_account_number) var/attempt_pin = "" if(D && D.security_level) - attempt_pin = input(usr, "Enter PIN", "Transaction") as num + attempt_pin = tgui_input_number(usr, "Enter PIN", "Transaction") D = null D = attempt_account_access(I.associated_account_number, attempt_pin, 2) diff --git a/code/modules/economy/vending.dm b/code/modules/economy/vending.dm index f073f3f396..55c726539a 100644 --- a/code/modules/economy/vending.dm +++ b/code/modules/economy/vending.dm @@ -327,7 +327,7 @@ GLOBAL_LIST_EMPTY(vending_products) // Have the customer punch in the PIN before checking if there's enough money. Prevents people from figuring out acct is // empty at high security levels if(customer_account.security_level != 0) //If card requires pin authentication (ie seclevel 1 or 2) - var/attempt_pin = input(usr, "Enter pin code", "Vendor transaction") as num + var/attempt_pin = tgui_input_number(usr, "Enter pin code", "Vendor transaction") customer_account = attempt_account_access(I.associated_account_number, attempt_pin, 2) if(!customer_account) diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm index 4df078aa11..d702a32d3a 100644 --- a/code/modules/emotes/definitions/audible.dm +++ b/code/modules/emotes/definitions/audible.dm @@ -205,6 +205,14 @@ emote_message_3p = "purrs." emote_sound = 'sound/voice/cat_purr_long.ogg' +/decl/emote/audible/fennecscream + key = "fennecscream" + emote_message_3p = "screeches!" + +/decl/emote/audible/zoom + key = "zoom" + emote_message_3p = "zooms." + /decl/emote/audible/teshsqueak key = "surprised" emote_message_1p = "You chirp in surprise!" diff --git a/code/modules/emotes/definitions/synthetics.dm b/code/modules/emotes/definitions/synthetics.dm index 32e7bdf504..4f94b7b59b 100644 --- a/code/modules/emotes/definitions/synthetics.dm +++ b/code/modules/emotes/definitions/synthetics.dm @@ -63,6 +63,7 @@ emote_message_3p_target = "boops at TARGET!" emote_message_3p = "boops." emote_sound = 'sound/voice/roboboop.ogg' + sound_vary = TRUE /decl/emote/audible/synth/robochirp key = "robochirp" @@ -71,3 +72,4 @@ emote_message_3p_target = "chirps at TARGET!" emote_message_3p = "chirps." emote_sound = 'sound/voice/robochirp.ogg' + sound_vary = TRUE diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm index 14e7481d5d..7aed1e982f 100644 --- a/code/modules/emotes/emote_define.dm +++ b/code/modules/emotes/emote_define.dm @@ -44,7 +44,7 @@ var/global/list/emotes_by_key var/emote_range = 0 // If >0, restricts emote visibility to viewers within range. var/sound_preferences = list(/datum/client_preference/emote_noises) // Default emote sound_preferences is just emote_noises. Belch emote overrides this list for pref-checks. - var/sound_vary = TRUE + var/sound_vary = FALSE /decl/emote/Initialize() . = ..() diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm index b0b3fce0bb..0a6a0793fb 100644 --- a/code/modules/emotes/emote_mob.dm +++ b/code/modules/emotes/emote_mob.dm @@ -54,7 +54,7 @@ if(act == "custom") if(!message) - message = sanitize_or_reflect(input(src,"Choose an emote to display.") as text|null, src) //VOREStation Edit - Reflect too long messages, within reason + message = sanitize_or_reflect(tgui_input_text(src,"Choose an emote to display."), src) //VOREStation Edit - Reflect too long messages, within reason if(!message) return if (!m_type) @@ -165,7 +165,7 @@ var/input if(!message) - input = sanitize(input(src,"Choose an emote to display.") as text|null) + input = sanitize(tgui_input_text(src,"Choose an emote to display.")) else input = message diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm index ea4f8d59cd..f8dca1824b 100644 --- a/code/modules/events/event_manager.dm +++ b/code/modules/events/event_manager.dm @@ -156,7 +156,7 @@ config.allow_random_events = text2num(href_list["pause_all"]) log_and_message_admins("has [config.allow_random_events ? "resumed" : "paused"] countdown for all events.") else if(href_list["interval"]) - var/delay = input(usr, "Enter delay modifier. A value less than one means events fire more often, higher than one less often.", "Set Interval Modifier") as num|null + var/delay = tgui_input_number(usr, "Enter delay modifier. A value less than one means events fire more often, higher than one less often.", "Set Interval Modifier") if(delay && delay > 0) var/datum/event_container/EC = locate(href_list["interval"]) EC.delay_modifier = delay @@ -173,7 +173,7 @@ else if(href_list["back"]) selected_event_container = null else if(href_list["set_name"]) - var/name = sanitize(input(usr, "Enter event name.", "Set Name") as text|null) + var/name = sanitize(tgui_input_text(usr, "Enter event name.", "Set Name")) if(name) var/datum/event_meta/EM = locate(href_list["set_name"]) EM.name = name @@ -183,7 +183,7 @@ var/datum/event_meta/EM = locate(href_list["set_type"]) EM.event_type = type else if(href_list["set_weight"]) - var/weight = input(usr, "Enter weight. A higher value means higher chance for the event of being selected.", "Set Weight") as num|null + var/weight = tgui_input_number(usr, "Enter weight. A higher value means higher chance for the event of being selected.", "Set Weight") if(weight && weight > 0) var/datum/event_meta/EM = locate(href_list["set_weight"]) EM.weight = weight diff --git a/code/modules/events/grubinfestation_vr.dm b/code/modules/events/grubinfestation_vr.dm index fa2742a6bc..34cbec6005 100644 --- a/code/modules/events/grubinfestation_vr.dm +++ b/code/modules/events/grubinfestation_vr.dm @@ -11,7 +11,8 @@ spawncount = rand(2 * severity, 6 * severity) for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in machines) - if(istype(get_area(temp_vent), /area/crew_quarters/sleep)) + var/area/A = get_area(temp_vent) + if(A.forbid_events) continue if(!temp_vent.welded && temp_vent.network && (temp_vent.loc.z in using_map.station_levels)) if(temp_vent.network.normal_members.len > 50) @@ -23,7 +24,8 @@ /datum/event/grub_infestation/start() while((spawncount >= 1) && vents.len) var/obj/vent = pick(vents) - new /mob/living/simple_mob/animal/solargrub_larva(get_turf(vent)) + var/mob/living/simple_mob/animal/solargrub_larva/larva = new(get_turf(vent)) + larva.tracked = TRUE vents -= vent spawncount-- vents.Cut() @@ -33,6 +35,14 @@ for(var/mob/living/G as anything in existing_solargrubs) if(!G || G.stat == DEAD) continue + if(istype(G, /mob/living/simple_mob/animal/solargrub_larva)) + var/mob/living/simple_mob/animal/solargrub_larva/L = G + if(!(L.tracked)) + continue + if(istype(G, /mob/living/simple_mob/vore/solargrub)) + var/mob/living/simple_mob/vore/solargrub/S = G + if(!(S.tracked)) + continue var/area/grub_area = get_area(G) if(!grub_area) //Huh, really? if(!get_turf(G)) //No turf either? diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index 7e7c82a18d..7cba7cbbd3 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -19,7 +19,9 @@ for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in machines) if(!temp_vent.welded && temp_vent.network && (temp_vent.loc.z in using_map.station_levels)) if(temp_vent.network.normal_members.len > 50) - vents += temp_vent + var/area/A = get_area(temp_vent) + if(!(A.forbid_events)) + vents += temp_vent while((spawncount >= 1) && vents.len) var/obj/vent = pick(vents) diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm index 5b137957db..2373db3bc2 100644 --- a/code/modules/food/food/condiment.dm +++ b/code/modules/food/food/condiment.dm @@ -135,6 +135,11 @@ desc = "Barbecue sauce, it's labeled 'sweet and spicy'." icon_state = "barbecue" center_of_mass = list("x"=16, "y"=6) + if("sprinkles") + name = "sprinkles" + desc = "Bottle of sprinkles, colourful!" + icon_state= "sprinkles" + center_of_mass = list("x"=16, "y"=6) else name = "Misc Condiment Bottle" if (reagents.reagent_list.len==1) @@ -208,6 +213,13 @@ . = ..() reagents.add_reagent("yeast", 50) +/obj/item/weapon/reagent_containers/food/condiment/sprinkles + name = "Sprinkles" + +/obj/item/weapon/reagent_containers/food/condiment/sprinkles/Initialize() + . = ..() + reagents.add_reagent("sprinkles", 50) + /obj/item/weapon/reagent_containers/food/condiment/small possible_transfer_amounts = list(1,20) amount_per_transfer_from_this = 1 @@ -448,22 +460,58 @@ //End of MRE stuff. -/obj/item/weapon/reagent_containers/food/condiment/flour - name = "flour sack" - desc = "A big bag of flour. Good for baking!" +/obj/item/weapon/reagent_containers/food/condiment/carton/flour + name = "flour carton" + desc = "A big carton of flour. Good for baking!" icon = 'icons/obj/food.dmi' icon_state = "flour" volume = 220 center_of_mass = list("x"=16, "y"=8) -/obj/item/weapon/reagent_containers/food/condiment/flour/on_reagent_change() +/obj/item/weapon/reagent_containers/food/condiment/carton/flour/on_reagent_change() + update_icon() return -/obj/item/weapon/reagent_containers/food/condiment/flour/Initialize() +/obj/item/weapon/reagent_containers/food/condiment/carton/flour/Initialize() . = ..() reagents.add_reagent("flour", 200) randpixel_xy() +/obj/item/weapon/reagent_containers/food/condiment/carton/update_icon() + overlays.Cut() + + if(reagents.total_volume) + var/image/filling = image('icons/obj/food.dmi', src, "[icon_state]10") + + filling.icon_state = "[icon_state]-[clamp(round(100 * reagents.total_volume / volume, 25), 0, 100)]" + + overlays += filling + +/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic + name = "flour sack" + desc = "An artisanal sack of flour. Classy!" + icon_state = "flour_bag" + +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar + name = "sugar carton" + desc = "A big carton of sugar. Sweet!" + icon_state = "sugar" + volume = 120 + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/on_reagent_change() + update_icon() + return + +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/Initialize() + . = ..() + reagents.add_reagent("sugar", 100) + +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic + name = "sugar sack" + desc = "An artisanal sack of sugar. Classy!" + icon_state = "sugar_bag" + /obj/item/weapon/reagent_containers/food/condiment/spacespice name = "space spices" desc = "An exotic blend of spices for cooking. Definitely not worms." @@ -477,4 +525,4 @@ /obj/item/weapon/reagent_containers/food/condiment/spacespice/Initialize() . = ..() - reagents.add_reagent("spacespice", 40) \ No newline at end of file + reagents.add_reagent("spacespice", 40) diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index c30f5053cf..8a9e434669 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -23,18 +23,18 @@ price_tag = null return -/obj/item/weapon/reagent_containers/food/drinks/proc/On_Consume(var/mob/M) - if(!usr) - usr = M - if(!reagents.total_volume) +/obj/item/weapon/reagent_containers/food/drinks/proc/On_Consume(var/mob/M, var/mob/user, var/changed = FALSE) + if(!user) + user = M + if(!reagents.total_volume && changed) M.visible_message("[M] finishes drinking \the [src].","You finish drinking \the [src].") if(trash) - usr.drop_from_inventory(src) //so icons update :[ + user.drop_from_inventory(src) //so icons update :[ if(ispath(trash,/obj/item)) - var/obj/item/TrashItem = new trash(usr) - usr.put_in_hands(TrashItem) + var/obj/item/TrashItem = new trash(user) + user.put_in_hands(TrashItem) else if(istype(trash,/obj/item)) - usr.put_in_hands(trash) + user.put_in_hands(trash) qdel(src) return @@ -73,8 +73,11 @@ if(!is_open_container()) to_chat(user, "You need to open [src]!") return 1 - On_Consume(target,user) - return ..() + var/original_volume = reagents.total_volume + .=..() + var/changed = !(reagents.total_volume == original_volume) + On_Consume(target,user,changed) + return /obj/item/weapon/reagent_containers/food/drinks/standard_dispenser_refill(var/mob/user, var/obj/structure/reagent_dispensers/target) if(!is_open_container()) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index db37cd13ce..233bd92156 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -3978,8 +3978,7 @@ /obj/item/weapon/reagent_containers/food/snacks/rawcutlet/Initialize() . = ..() - reagents.add_reagent("fishbait", 9) - reagents.add_reagent("protein", 3) + reagents.add_reagent("protein", 1) /obj/item/weapon/reagent_containers/food/snacks/cutlet name = "cutlet" @@ -3991,8 +3990,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cutlet/Initialize() . = ..() - reagents.add_reagent("fishbait", 15) - reagents.add_reagent("protein", 5) + reagents.add_reagent("protein", 2) /obj/item/weapon/reagent_containers/food/snacks/rawmeatball name = "raw meatball" @@ -4004,8 +4002,7 @@ /obj/item/weapon/reagent_containers/food/snacks/rawmeatball/Initialize() . = ..() - reagents.add_reagent("fishbait", 30) - reagents.add_reagent("protein", 10) + reagents.add_reagent("protein", 2) /obj/item/weapon/reagent_containers/food/snacks/hotdog name = "hotdog" @@ -4442,7 +4439,8 @@ /obj/item/weapon/reagent_containers/food/snacks/wormsickly/Initialize() . = ..() - reagents.add_reagent("fishbait", 10) + reagents.add_reagent("fishbait", 9) + reagents.add_reagent("protein", 3) /obj/item/weapon/reagent_containers/food/snacks/worm name = "strange worm" @@ -4455,7 +4453,8 @@ /obj/item/weapon/reagent_containers/food/snacks/worm/Initialize() . = ..() - reagents.add_reagent("fishbait", 20) + reagents.add_reagent("fishbait", 15) + reagents.add_reagent("protein", 5) /obj/item/weapon/reagent_containers/food/snacks/wormdeluxe name = "deluxe worm" @@ -4468,7 +4467,8 @@ /obj/item/weapon/reagent_containers/food/snacks/wormdeluxe/Initialize() . = ..() - reagents.add_reagent("fishbait", 40) + reagents.add_reagent("fishbait", 30) + reagents.add_reagent("protein", 10) /obj/item/weapon/reagent_containers/food/snacks/siffruit name = "pulsing fruit" diff --git a/code/modules/food/food/z_custom_food_vr.dm b/code/modules/food/food/z_custom_food_vr.dm index c72718c7ba..3ca9b4fa9a 100644 --- a/code/modules/food/food/z_custom_food_vr.dm +++ b/code/modules/food/food/z_custom_food_vr.dm @@ -49,7 +49,7 @@ var/global/ingredientLimit = 20000 I.forceMove(src) if(S.reagents) - S.reagents.trans_to(src,S.reagents.total_volume) + S.reagents.trans_to_holder(reagents,S.reagents.total_volume) ingredients += S @@ -142,7 +142,7 @@ var/global/ingredientLimit = 20000 /obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich/attackby(obj/item/I,mob/user) if(istype(I,/obj/item/weapon/reagent_containers/food/snacks/slice/bread) && !addTop) - I.reagents.trans_to(src,I.reagents.total_volume) + I.reagents.trans_to_holder(reagents,I.reagents.total_volume) qdel(I) addTop = 1 src.drawTopping() diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm index 981a809fd4..bd4a9d8e00 100644 --- a/code/modules/food/kitchen/cooking_machines/container.dm +++ b/code/modules/food/kitchen/cooking_machines/container.dm @@ -7,6 +7,7 @@ var/shortname var/max_space = 20//Maximum sum of w-classes of foods in this container at once var/max_reagents = 80//Maximum units of reagents + var/food_items = 0 // Used for icon updates flags = OPENCONTAINER | NOREACT var/list/insertable = list( /obj/item/weapon/reagent_containers/food/snacks, @@ -59,6 +60,8 @@ return I.forceMove(src) to_chat(user, "You put the [I] into the [src].") + food_items += 1 + update_icon() return /obj/item/weapon/reagent_containers/cooking_container/verb/empty() @@ -102,6 +105,8 @@ /obj/item/weapon/reagent_containers/cooking_container/AltClick(var/mob/user) do_empty(user) + food_items = 0 + update_icon() //Deletes contents of container. //Used when food is burned, before replacing it with a burned mess @@ -158,6 +163,22 @@ if (weights[I]) holder.trans_to(I, weights[I] / total) +/obj/item/weapon/reagent_containers/cooking_container/update_icon() + overlays.Cut() + + if(food_items) + var/image/filling = image('icons/obj/cooking_machines.dmi', src, "[icon_state]10") + + var/percent = round((food_items / max_space) * 100) + switch(percent) + if(0 to 2) filling.icon_state = "[icon_state]" + if(3 to 24) filling.icon_state = "[icon_state]1" + if(25 to 49) filling.icon_state = "[icon_state]2" + if(50 to 74) filling.icon_state = "[icon_state]3" + if(75 to 79) filling.icon_state = "[icon_state]4" + if(80 to INFINITY) filling.icon_state = "[icon_state]5" + + overlays += filling /obj/item/weapon/reagent_containers/cooking_container/oven name = "oven dish" @@ -186,4 +207,4 @@ name = "grill rack" shortname = "rack" desc = "Put ingredients 'in'/on this; designed for use with a grill. Warranty void if used incorrectly. Alt click to remove contents." - icon_state = "grillrack" \ No newline at end of file + icon_state = "grillrack" diff --git a/code/modules/food/kitchen/smartfridge/smartfridge.dm b/code/modules/food/kitchen/smartfridge/smartfridge.dm index f98da20f8c..11ce0e461e 100644 --- a/code/modules/food/kitchen/smartfridge/smartfridge.dm +++ b/code/modules/food/kitchen/smartfridge/smartfridge.dm @@ -216,7 +216,7 @@ if(params["amount"]) amount = params["amount"] else - amount = input(usr, "How many items?", "How many items would you like to take out?", 1) as num|null + amount = tgui_input_number(usr, "How many items?", "How many items would you like to take out?", 1) if(QDELETED(src) || QDELETED(usr) || !usr.Adjacent(src)) return FALSE diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 8c333aaf10..4ee2728bdb 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -157,7 +157,7 @@ players += player //players -= usr var/maxcards = max(min(cards.len,10),1) - var/dcard = input(usr, "How many card(s) do you wish to deal? You may deal up to [maxcards] cards.") as num + var/dcard = tgui_input_number(usr, "How many card(s) do you wish to deal? You may deal up to [maxcards] cards.", null, null, maxcards) if(dcard > maxcards) return var/mob/living/M = tgui_input_list(usr, "Who do you wish to deal [dcard] card(s)?", "Deal to whom?", players) @@ -188,7 +188,7 @@ if(P.name != "Blank Card") to_chat(user,"You cannot write on that card.") return - var/cardtext = sanitize(input(user, "What do you wish to write on the card?", "Card Editing") as text|null, MAX_PAPER_MESSAGE_LEN) + var/cardtext = sanitize(tgui_input_text(user, "What do you wish to write on the card?", "Card Editing", null, MAX_PAPER_MESSAGE_LEN), MAX_PAPER_MESSAGE_LEN) if(!cardtext) return P.name = cardtext @@ -321,7 +321,7 @@ var/i var/maxcards = min(cards.len,5) // Maximum of 5 cards at once - var/discards = input(usr, "How many cards do you want to discard? You may discard up to [maxcards] card(s)") as num + var/discards = tgui_input_number(usr, "How many cards do you want to discard? You may discard up to [maxcards] card(s)", null, null, maxcards, 0) if(discards > maxcards) return for (i = 0;i < discards;i++) diff --git a/code/modules/ghosttrap/trap.dm b/code/modules/ghosttrap/trap.dm index 594d6f2e45..4e68683542 100644 --- a/code/modules/ghosttrap/trap.dm +++ b/code/modules/ghosttrap/trap.dm @@ -93,7 +93,7 @@ var/list/ghost_traps // Allows people to set their own name. May or may not need to be removed for posibrains if people are dumbasses. /datum/ghosttrap/proc/set_new_name(var/mob/target) - var/newname = sanitizeSafe(input(target,"Enter a name, or leave blank for the default name.", "Name change","") as text, MAX_NAME_LEN) + var/newname = sanitizeSafe(tgui_input_text(target,"Enter a name, or leave blank for the default name.", "Name change","", MAX_NAME_LEN), MAX_NAME_LEN) if (newname != "") target.real_name = newname target.name = target.real_name diff --git a/code/modules/instruments/songs/editor.dm b/code/modules/instruments/songs/editor.dm index f88e06bce1..d63ae107cd 100644 --- a/code/modules/instruments/songs/editor.dm +++ b/code/modules/instruments/songs/editor.dm @@ -130,7 +130,7 @@ else if(href_list["import"]) var/t = "" do - t = html_encode(input(usr, "Please paste the entire song, formatted:", text("[]", name), t) as message) + t = html_encode(tgui_input_text(usr, "Please paste the entire song, formatted:", text("[]", name), t, multiline = TRUE, prevent_enter = TRUE)) if(!in_range(parent, usr)) return @@ -163,7 +163,7 @@ INVOKE_ASYNC(src, .proc/start_playing, usr) else if(href_list["newline"]) - var/newline = html_encode(input(usr, "Enter your line: ", parent.name) as text|null) + var/newline = html_encode(tgui_input_text(usr, "Enter your line: ", parent.name)) if(!newline || !in_range(parent, usr)) return if(lines.len > MUSIC_MAXLINES) @@ -191,22 +191,22 @@ stop_playing() else if(href_list["setlinearfalloff"]) - var/amount = input(usr, "Set linear sustain duration in seconds", "Linear Sustain Duration") as null|num + var/amount = tgui_input_number(usr, "Set linear sustain duration in seconds", "Linear Sustain Duration") if(!isnull(amount)) set_linear_falloff_duration(round(amount * 10, world.tick_lag)) else if(href_list["setexpfalloff"]) - var/amount = input(usr, "Set exponential sustain factor", "Exponential sustain factor") as null|num + var/amount = tgui_input_number(usr, "Set exponential sustain factor", "Exponential sustain factor") if(!isnull(amount)) set_exponential_drop_rate(round(amount, 0.00001)) else if(href_list["setvolume"]) - var/amount = input(usr, "Set volume", "Volume") as null|num + var/amount = tgui_input_number(usr, "Set volume", "Volume") if(!isnull(amount)) set_volume(round(amount, 1)) else if(href_list["setdropoffvolume"]) - var/amount = input(usr, "Set dropoff threshold", "Dropoff Threshold Volume") as null|num + var/amount = tgui_input_number(usr, "Set dropoff threshold", "Dropoff Threshold Volume") if(!isnull(amount)) set_dropoff_volume(round(amount, 0.01)) @@ -233,7 +233,7 @@ set_instrument(choice) else if(href_list["setnoteshift"]) - var/amount = input(usr, "Set note shift", "Note Shift") as null|num + var/amount = tgui_input_number(usr, "Set note shift", "Note Shift") if(!isnull(amount)) note_shift = clamp(amount, note_shift_min, note_shift_max) diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index 11f4a53a0d..1f08f1dec5 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -176,7 +176,7 @@ if(!check_interactivity(M)) return - var/input = sanitizeSafe(input(usr, "What do you want to name this?", "Rename", src.name) as null|text, MAX_NAME_LEN) + var/input = sanitizeSafe(tgui_input_text(usr, "What do you want to name this?", "Rename", src.name, MAX_NAME_LEN), MAX_NAME_LEN) if(src && input) to_chat(M, "The machine now has a label reading '[input]'.") name = input diff --git a/code/modules/integrated_electronics/core/integrated_circuit.dm b/code/modules/integrated_electronics/core/integrated_circuit.dm index 89cbf4fdd1..209b59d37a 100644 --- a/code/modules/integrated_electronics/core/integrated_circuit.dm +++ b/code/modules/integrated_electronics/core/integrated_circuit.dm @@ -68,7 +68,7 @@ a creative player the means to solve many problems. Circuits are held inside an if(!check_interactivity(M)) return - var/input = sanitizeSafe(input(usr, "What do you want to name the circuit?", "Rename", src.name) as null|text, MAX_NAME_LEN) + var/input = sanitizeSafe(tgui_input_text(usr, "What do you want to name the circuit?", "Rename", src.name, MAX_NAME_LEN), MAX_NAME_LEN) if(src && input && assembly.check_interactivity(M)) to_chat(M, "The circuit '[src.name]' is now labeled '[input]'.") displayed_name = input diff --git a/code/modules/integrated_electronics/core/pins.dm b/code/modules/integrated_electronics/core/pins.dm index 4020d03a34..c402cf022d 100644 --- a/code/modules/integrated_electronics/core/pins.dm +++ b/code/modules/integrated_electronics/core/pins.dm @@ -154,12 +154,12 @@ list[]( var/new_data = null switch(type_to_use) if("string") - new_data = input(usr, "Now type in a string.","[src] string writing", istext(default) ? default : null) as null|text + new_data = tgui_input_text(usr, "Now type in a string.","[src] string writing", istext(default) ? default : null) if(istext(new_data) && holder.check_interactivity(user) ) to_chat(user, "You input [new_data] into the pin.") return new_data if("number") - new_data = input(usr, "Now type in a number.","[src] number writing", isnum(default) ? default : null) as null|num + new_data = tgui_input_number(usr, "Now type in a number.","[src] number writing", isnum(default) ? default : null) if(isnum(new_data) && holder.check_interactivity(user) ) to_chat(user, "You input [new_data] into the pin.") return new_data diff --git a/code/modules/integrated_electronics/core/special_pins/char_pin.dm b/code/modules/integrated_electronics/core/special_pins/char_pin.dm index 0449b70549..734d4515be 100644 --- a/code/modules/integrated_electronics/core/special_pins/char_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/char_pin.dm @@ -3,7 +3,7 @@ name = "char pin" /datum/integrated_io/char/ask_for_pin_data(mob/user) - var/new_data = input(usr, "Please type in one character.","[src] char writing") as null|text + var/new_data = tgui_input_text(usr, "Please type in one character.","[src] char writing") if(holder.check_interactivity(user) ) to_chat(user, "You input [new_data ? "new_data" : "NULL"] into the pin.") write_data_to_pin(new_data) diff --git a/code/modules/integrated_electronics/core/special_pins/dir_pin.dm b/code/modules/integrated_electronics/core/special_pins/dir_pin.dm index 4b523f9114..368eb27b93 100644 --- a/code/modules/integrated_electronics/core/special_pins/dir_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/dir_pin.dm @@ -3,7 +3,7 @@ name = "dir pin" /datum/integrated_io/dir/ask_for_pin_data(mob/user) - var/new_data = input(usr, "Please type in a valid dir number. \ + var/new_data = tgui_input_number(usr, "Please type in a valid dir number. \ Valid dirs are;\n\ North/Fore = [NORTH],\n\ South/Aft = [SOUTH],\n\ @@ -14,7 +14,7 @@ Southeast = [SOUTHEAST],\n\ Southwest = [SOUTHWEST],\n\ Up = [UP],\n\ - Down = [DOWN]","[src] dir writing") as null|num + Down = [DOWN]","[src] dir writing") if(isnum(new_data) && holder.check_interactivity(user) ) to_chat(user, "You input [new_data] into the pin.") write_data_to_pin(new_data) diff --git a/code/modules/integrated_electronics/core/special_pins/number_pin.dm b/code/modules/integrated_electronics/core/special_pins/number_pin.dm index 92b07638bd..07fe8f089a 100644 --- a/code/modules/integrated_electronics/core/special_pins/number_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/number_pin.dm @@ -4,7 +4,7 @@ // data = 0 /datum/integrated_io/number/ask_for_pin_data(mob/user) - var/new_data = input(usr, "Please type in a number.","[src] number writing") as null|num + var/new_data = tgui_input_number(usr, "Please type in a number.","[src] number writing") if(isnum(new_data) && holder.check_interactivity(user) ) to_chat(user, "You input [new_data] into the pin.") write_data_to_pin(new_data) diff --git a/code/modules/integrated_electronics/core/special_pins/string_pin.dm b/code/modules/integrated_electronics/core/special_pins/string_pin.dm index a0428a12de..db9bc31944 100644 --- a/code/modules/integrated_electronics/core/special_pins/string_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/string_pin.dm @@ -3,7 +3,7 @@ name = "string pin" /datum/integrated_io/string/ask_for_pin_data(mob/user) - var/new_data = input(usr, "Please type in a string.","[src] string writing") as null|text + var/new_data = tgui_input_text(usr, "Please type in a string.","[src] string writing") new_data = sanitizeSafe(new_data, MAX_MESSAGE_LEN, 0, 0) if(new_data && holder.check_interactivity(user) ) diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm index e248ffe545..dcaaf58057 100644 --- a/code/modules/integrated_electronics/core/tools.dm +++ b/code/modules/integrated_electronics/core/tools.dm @@ -122,14 +122,14 @@ switch(type_to_use) if("string") accepting_refs = 0 - new_data = input(usr, "Now type in a string.","[src] string writing") as null|text + new_data = tgui_input_text(usr, "Now type in a string.","[src] string writing") new_data = sanitizeSafe(new_data, MAX_MESSAGE_LEN, 0, 0) if(istext(new_data) && CanInteract(user, GLOB.tgui_physical_state)) data_to_write = new_data to_chat(user, "You set \the [src]'s memory to \"[new_data]\".") if("number") accepting_refs = 0 - new_data = input(usr, "Now type in a number.","[src] number writing") as null|num + new_data = tgui_input_number(usr, "Now type in a number.","[src] number writing") if(isnum(new_data) && CanInteract(user, GLOB.tgui_physical_state)) data_to_write = new_data to_chat(user, "You set \the [src]'s memory to [new_data].") diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index e53b1397de..4b9f5a9152 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -53,7 +53,7 @@ power_draw_per_use = 4 /obj/item/integrated_circuit/input/numberpad/ask_for_input(mob/user) - var/new_input = input(user, "Enter a number, please.","Number pad", get_pin_data(IC_OUTPUT, 1)) as null|num + var/new_input = tgui_input_number(user, "Enter a number, please.","Number pad", get_pin_data(IC_OUTPUT, 1)) if(isnum(new_input) && CanInteract(user, GLOB.tgui_physical_state)) set_pin_data(IC_OUTPUT, 1, new_input) push_data() @@ -72,7 +72,7 @@ power_draw_per_use = 4 /obj/item/integrated_circuit/input/textpad/ask_for_input(mob/user) - var/new_input = input(user, "Enter some words, please.","Number pad", get_pin_data(IC_OUTPUT, 1)) as null|text + var/new_input = tgui_input_text(user, "Enter some words, please.","Number pad", get_pin_data(IC_OUTPUT, 1)) if(istext(new_input) && CanInteract(user, GLOB.tgui_physical_state)) set_pin_data(IC_OUTPUT, 1, new_input) push_data() diff --git a/code/modules/integrated_electronics/subtypes/memory.dm b/code/modules/integrated_electronics/subtypes/memory.dm index 2fb6ad4598..0148c01c05 100644 --- a/code/modules/integrated_electronics/subtypes/memory.dm +++ b/code/modules/integrated_electronics/subtypes/memory.dm @@ -96,13 +96,13 @@ switch(type_to_use) if("string") accepting_refs = 0 - new_data = input(usr, "Now type in a string.","[src] string writing") as null|text + new_data = tgui_input_text(usr, "Now type in a string.","[src] string writing") if(istext(new_data) && CanInteract(user, GLOB.tgui_physical_state)) O.data = new_data to_chat(user, "You set \the [src]'s memory to [O.display_data(O.data)].") if("number") accepting_refs = 0 - new_data = input(usr, "Now type in a number.","[src] number writing") as null|num + new_data = tgui_input_number(usr, "Now type in a number.","[src] number writing") if(isnum(new_data) && CanInteract(user, GLOB.tgui_physical_state)) O.data = new_data to_chat(user, "You set \the [src]'s memory to [O.display_data(O.data)].") diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 85a06cd571..62b5222552 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -33,7 +33,7 @@ O.loc = src update_icon() else if(istype(O, /obj/item/weapon/pen)) - var/newname = sanitizeSafe(input(usr, "What would you like to title this bookshelf?"), MAX_NAME_LEN) + var/newname = sanitizeSafe(tgui_input_text(usr, "What would you like to title this bookshelf?", null, null, MAX_NAME_LEN), MAX_NAME_LEN) if(!newname) return else @@ -229,7 +229,7 @@ Book Cart End var/choice = tgui_input_list(usr, "What would you like to change?", "Change What?", list("Title", "Contents", "Author", "Cancel")) switch(choice) if("Title") - var/newtitle = reject_bad_text(sanitizeSafe(input(usr, "Write a new title:"))) + var/newtitle = reject_bad_text(sanitizeSafe(tgui_input_text(usr, "Write a new title:"))) if(!newtitle) to_chat(usr, "The title is invalid.") return @@ -244,7 +244,7 @@ Book Cart End else src.dat += content if("Author") - var/newauthor = sanitize(input(usr, "Write the author's name:")) + var/newauthor = sanitize(tgui_input_text(usr, "Write the author's name:")) if(!newauthor) to_chat(usr, "The name is invalid.") return diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 41f0c8688e..a3ee1610c4 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -73,7 +73,7 @@ return if(href_list["settitle"]) - var/newtitle = input(usr, "Enter a title to search for:") as text|null + var/newtitle = tgui_input_text(usr, "Enter a title to search for:") if(newtitle) title = sanitize(newtitle) else @@ -87,7 +87,7 @@ category = "Any" category = sanitizeSQL(category) if(href_list["setauthor"]) - var/newauthor = input(usr, "Enter an author to search for:") as text|null + var/newauthor = tgui_input_text(usr, "Enter an author to search for:") if(newauthor) author = sanitize(newauthor) else @@ -365,9 +365,9 @@ if(checkoutperiod < 1) checkoutperiod = 1 if(href_list["editbook"]) - buffer_book = sanitizeSafe(input(usr, "Enter the book's title:") as text|null) + buffer_book = sanitizeSafe(tgui_input_text(usr, "Enter the book's title:")) if(href_list["editmob"]) - buffer_mob = sanitize(input(usr, "Enter the recipient's name:") as text|null, MAX_NAME_LEN) + buffer_mob = sanitize(tgui_input_text(usr, "Enter the recipient's name:", null, null, MAX_NAME_LEN), MAX_NAME_LEN) if(href_list["checkout"]) var/datum/borrowbook/b = new /datum/borrowbook b.bookname = sanitizeSafe(buffer_book) @@ -382,7 +382,7 @@ var/obj/item/weapon/book/b = locate(href_list["delbook"]) inventory.Remove(b) if(href_list["setauthor"]) - var/newauthor = sanitize(input(usr, "Enter the author's name: ") as text|null) + var/newauthor = sanitize(tgui_input_text(usr, "Enter the author's name: ")) if(newauthor) scanner.cache.author = newauthor if(href_list["setcategory"]) @@ -462,7 +462,7 @@ query.Execute() if(href_list["orderbyid"]) - var/orderid = input(usr, "Enter your order:") as num|null + var/orderid = tgui_input_number(usr, "Enter your order:") if(orderid) if(isnum(orderid)) var/nhref = "src=\ref[src];targetid=[orderid]" diff --git a/code/modules/materials/materials/organic/wood.dm b/code/modules/materials/materials/organic/wood.dm index d82eab063b..4c9fd7ac22 100644 --- a/code/modules/materials/materials/organic/wood.dm +++ b/code/modules/materials/materials/organic/wood.dm @@ -38,7 +38,6 @@ new /datum/stack_recipe("beehive frame", /obj/item/honey_frame, 1, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("book shelf", /obj/structure/bookcase, 5, time = 15, one_per_turf = 1, on_floor = 1, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("noticeboard frame", /obj/item/frame/noticeboard, 4, time = 5, one_per_turf = 0, on_floor = 1, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("wooden bucket", /obj/item/weapon/reagent_containers/glass/bucket/wood, 2, time = 4, one_per_turf = 0, on_floor = 0, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("coilgun stock", /obj/item/weapon/coilgun_assembly, 5, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("crude fishing rod", /obj/item/weapon/material/fishing_rod/built, 8, time = 10 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("wooden standup figure", /obj/structure/barricade/cutout, 5, time = 10 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), //VOREStation Add @@ -74,7 +73,7 @@ icon_base = "stone" icon_reinf = "reinf_stone" integrity = 65 //a bit stronger than regular wood - hardness = 20 + hardness = 20 weight = 20 //likewise, heavier /datum/material/wood/hardwood/generate_recipes() diff --git a/code/modules/materials/sheets/organic/animal_products.dm b/code/modules/materials/sheets/organic/animal_products.dm index c0084bf93c..4a0c9cd7bb 100644 --- a/code/modules/materials/sheets/organic/animal_products.dm +++ b/code/modules/materials/sheets/organic/animal_products.dm @@ -163,4 +163,4 @@ desc = "A handmade blindfold that covers the eyes, preventing sight." /obj/item/clothing/accessory/collar/craftable/attack_self(mob/living/user as mob) - given_name = sanitizeSafe(input(usr, "What would you like to label the collar?", "Collar Labelling", null) as text, MAX_NAME_LEN) + given_name = sanitizeSafe(tgui_input_text(usr, "What would you like to label the collar?", "Collar Labelling", null, MAX_NAME_LEN), MAX_NAME_LEN) diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 1b043ec8c1..f3a315827d 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -146,7 +146,7 @@ return to_chat(user, "The crate is locked with a Deca-code lock.") - var/input = input(usr, "Enter [codelen] digits. All digits must be unique.", "Deca-Code Lock", "") as text + var/input = tgui_input_text(usr, "Enter [codelen] digits. All digits must be unique.", "Deca-Code Lock", "") if(!Adjacent(user)) return var/list/sanitised = list() diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index 6265e29e93..3e2f6099a4 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -173,7 +173,7 @@ /obj/machinery/mining/drill/attackby(obj/item/O as obj, mob/user as mob) if(!active) if(istype(O, /obj/item/device/multitool)) - var/newtag = text2num(sanitizeSafe(input(user, "Enter new ID number or leave empty to cancel.", "Assign ID number") as text, 4)) + var/newtag = text2num(sanitizeSafe(tgui_input_text(user, "Enter new ID number or leave empty to cancel.", "Assign ID number", null, 4), 4)) if(newtag) name = "[initial(name)] #[newtag]" to_chat(user, "You changed the drill ID to: [newtag]") diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 4d81c2b4f9..1b298f303a 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -124,8 +124,13 @@ var/mob/living/carbon/human/H = body add_overlay(H.overlays_standing) - if(!T) T = pick(latejoin) //Safety in case we cannot find the body's position - forceMove(T) + if(!T) + T = pick(latejoin) //Safety in case we cannot find the body's position + if(T) + forceMove(T) + else + moveToNullspace() + to_chat(src, "Could not locate an observer spawn point. Use the Teleport verb to jump to the station map.") if(!name) //To prevent nameless ghosts name = capitalize(pick(first_names_male)) + " " + capitalize(pick(last_names)) @@ -161,10 +166,10 @@ I = getFlatIcon(src, defdir = SOUTH, no_anim = TRUE) set_cached_examine_icon(src, I, 200 SECONDS) return I - + /mob/observer/dead/examine(mob/user) . = ..() - + if(is_admin(user)) . += "\t>[ADMIN_FULLMONTY(src)]" @@ -337,7 +342,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/list/areas = return_sorted_areas() if(client?.holder) return areas - + for(var/key in areas) var/area/A = areas[key] if(A.z in using_map?.secret_levels) @@ -371,7 +376,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return var/area/A - + if(!areaname) var/list/areas = jumpable_areas() var/input = tgui_input_list(usr, "Select an area:", "Ghost Teleport", areas) @@ -413,29 +418,29 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return ManualFollow(M || jumpable_mobs()[mobname]) - + /mob/observer/dead/forceMove(atom/destination) if(client?.holder) return ..() - + if(get_z(destination) in using_map?.secret_levels) to_chat(src,SPAN_WARNING("Sorry, that z-level does not allow ghosts.")) if(following) stop_following() return - + return ..() /mob/observer/dead/Move(atom/newloc, direct = 0, movetime) if(client?.holder) return ..() - + if(get_z(newloc) in using_map?.secret_levels) to_chat(src,SPAN_WARNING("Sorry, that z-level does not allow ghosts.")) if(following) stop_following() return - + return ..() // This is the ghost's follow verb with an argument @@ -514,7 +519,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp for(var/mob/observer/dead/M in following_mobs) if(!.) M.stop_following() - + if(M.following != src) following_mobs -= M else @@ -763,7 +768,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/max_length = 50 - var/message = sanitize(input(usr, "Write a message. It cannot be longer than [max_length] characters.","Blood writing", "")) + var/message = sanitize(tgui_input_text(usr, "Write a message. It cannot be longer than [max_length] characters.","Blood writing", "", max_length)) if (message) @@ -867,7 +872,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Toggle Darkness" set desc = "Toggles your ability to see lighting overlays, and the darkness they create." set category = "Ghost" - + var/static/list/darkness_names = list("normal darkness levels", "30% darkness removed", "70% darkness removed", "no darkness") var/static/list/darkness_levels = list(255, 178, 76, 0) @@ -876,7 +881,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp index = 1 else index++ - + lighting_alpha = darkness_levels[index] updateghostsight() to_chat(src, "Your vision now has [darkness_names[index]].") @@ -928,7 +933,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/mob/living/M = tgui_input_list(src, "Select who to whisper to:", "Whisper to?", options) if(!M) return 0 - var/msg = sanitize(input(src, "Message:", "Spectral Whisper") as text|null) + var/msg = sanitize(tgui_input_text(src, "Message:", "Spectral Whisper")) if(msg) log_say("(SPECWHISP to [key_name(M)]): [msg]", src) to_chat(M, " You hear a strange, unidentifiable voice in your head... [msg]") @@ -977,15 +982,29 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set category = "Ghost" set name = "Blank pAI alert" set desc = "Flash an indicator light on available blank pAI devices for a smidgen of hope." - + + var/time_till_respawn = time_till_respawn() + if(time_till_respawn == -1) // Special case, never allowed to respawn + to_chat(usr, "Respawning is not allowed!") + else if(time_till_respawn) // Nonzero time to respawn + to_chat(usr, "You can't do that yet! You died too recently. You need to wait another [round(time_till_respawn/10/60, 0.1)] minutes.") + return + + if(jobban_isbanned(usr, "pAI")) + to_chat(usr,"You cannot alert pAI cards when you are banned from playing as a pAI.") + return + if(usr.client.prefs?.be_special & BE_PAI) + var/choice = tgui_alert(usr, "Would you like to submit yourself to the recruitment list too?", "Confirmation", list("No", "Yes")) + if(choice == "Yes") + paiController.recruitWindow(usr) var/count = 0 for(var/obj/item/device/paicard/p in GLOB.all_pai_cards) var/obj/item/device/paicard/PP = p if(PP.pai == null) count++ - PP.icon = 'icons/obj/pda_vr.dmi' // VOREStation Edit PP.add_overlay("pai-ghostalert") + PP.alertUpdate() spawn(54) PP.cut_overlays() to_chat(usr,"Flashing the displays of [count] unoccupied PAIs.") diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index f59ebf612c..48cdfa3ebd 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -23,7 +23,7 @@ var/input if(!message) - input = sanitize_or_reflect(input(src, "Choose an emote to display.") as text|null, src) //VOREStation Edit - Reflect too long messages, within reason + input = sanitize_or_reflect(tgui_input_text(src, "Choose an emote to display."), src) //VOREStation Edit - Reflect too long messages, within reason else input = message diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 54a86d9b28..797918d0f8 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -92,7 +92,7 @@ var/list/combined = combine_message(message_pieces, verb, speaker) var/message = combined["formatted"] if(message == "") - return + return FALSE if(sleeping || stat == UNCONSCIOUS) hear_sleep(multilingual_to_message(message_pieces)) @@ -129,9 +129,11 @@ var/turf/source = speaker ? get_turf(speaker) : get_turf(src) playsound_local(source, speech_sound, sound_vol, 1) + return TRUE + // Done here instead of on_hear_say() since that is NOT called if the mob is clientless (which includes most AI mobs). /mob/living/hear_say(var/list/message_pieces, var/verb = "says", var/italics = 0, var/mob/speaker = null, var/sound/speech_sound, var/sound_vol) - ..() + .=..() if(has_AI()) // Won't happen if no ai_holder exists or there's a player inside w/o autopilot active. ai_holder.on_hear_say(speaker, multilingual_to_message(message_pieces)) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 7bce6c10e4..a7728a0624 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -29,11 +29,13 @@ var/list/holder_mob_icon_cache = list() ASSERT(ismob(held)) . = ..() held.forceMove(src) + held.reset_view(src) START_PROCESSING(SSobj, src) /obj/item/weapon/holder/Entered(mob/held, atom/OldLoc) if(held_mob) held.forceMove(get_turf(src)) + held.reset_view(null) return ASSERT(ismob(held)) . = ..() @@ -71,6 +73,7 @@ var/list/holder_mob_icon_cache = list() held_mob.transform = original_transform held_mob.vis_flags = original_vis_flags held_mob.forceMove(get_turf(src)) + held_mob.reset_view(null) held_mob = null /obj/item/weapon/holder/throw_at(atom/target, range, speed, thrower) @@ -103,9 +106,12 @@ var/list/holder_mob_icon_cache = list() holster.clear_holster() to_chat(held, "You extricate yourself from [holster].") forceMove(get_turf(src)) + held.reset_view(null) + else if(isitem(loc)) to_chat(held, "You struggle free of [loc].") forceMove(get_turf(src)) + held.reset_view(null) //Mob specific holders. /obj/item/weapon/holder/diona @@ -167,6 +173,12 @@ var/list/holder_mob_icon_cache = list() item_state = "cat" /obj/item/weapon/holder/cat/runtime + +/obj/item/weapon/holder/fennec + origin_tech = list(TECH_BIO = 2) + +/obj/item/weapon/holder/cat/runtime + origin_tech = list(TECH_BIO = 2, TECH_DATA = 4) /obj/item/weapon/holder/cat/cak diff --git a/code/modules/mob/language/generic.dm b/code/modules/mob/language/generic.dm index 55ba735af4..0c2fecfabc 100644 --- a/code/modules/mob/language/generic.dm +++ b/code/modules/mob/language/generic.dm @@ -18,7 +18,7 @@ // 'basic' language; spoken by default. /datum/language/common name = LANGUAGE_GALCOM - desc = "The common galactic tongue, engineered for cross-species communication." + desc = "The common galactic tongue, engineered for cross-species communication. Every spacer there is knows this!" speech_verb = "says" whisper_verb = "whispers" key = "0" @@ -127,7 +127,7 @@ /datum/language/sign name = LANGUAGE_SIGN - desc = "A sign language commonly used for those who are deaf or mute." + desc = "A sign language commonly used for those who are deaf or mute. Especially popular with spacers, due to practicality in airless environments." signlang_verb = list("gestures") colour = "say_quote" key = "s" @@ -152,7 +152,7 @@ // Silly language for those times when you try to talk a languague you normally can't /datum/language/gibberish name = LANGUAGE_GIBBERISH - desc = "A completely incomprehensible language." + desc = "A completely incomprehensible gibberish that can barely be called a language." signlang_verb = list("flails") speech_verb = "spews" whisper_verb = "mumbles" diff --git a/code/modules/mob/language/monkey.dm b/code/modules/mob/language/monkey.dm index 6736b803fc..0ceaf4a88f 100644 --- a/code/modules/mob/language/monkey.dm +++ b/code/modules/mob/language/monkey.dm @@ -1,6 +1,6 @@ /datum/language/human/monkey name = "Chimpanzee" - desc = "Ook ook ook." + desc = "A collection of ooking noises made by monkeys" speech_verb = "chimpers" ask_verb = "chimpers" exclaim_verb = "screeches" @@ -10,28 +10,28 @@ /datum/language/skrell/monkey name = "Neaera" - desc = "Squik squik squik." + desc = "A collection of squiking noises made by naera." key = "8" - syllables = list("hiss","gronk") + syllables = list("squick","croak") machine_understands = 0 /datum/language/unathi/monkey name = "Stok" - desc = "Hiss hiss hiss." + desc = "A collection of hissing noises made by stok." key = "7" - syllables = list("squick","croak") + syllables = list("hiss","gronk") machine_understands = 0 /datum/language/tajaran/monkey name = "Farwa" - desc = "Meow meow meow." + desc = "A collection of meowing noises made by farwa." key = "9" syllables = list("meow","mew") machine_understands = 0 /datum/language/corgi name = "Dog" - desc = "Woof woof woof." + desc = "A set of barks and woofs that only dogs can understand." speech_verb = "barks" ask_verb = "woofs" exclaim_verb = "howls" @@ -43,7 +43,7 @@ /datum/language/cat name = "Cat" - desc = "Meow meow meow." + desc = "A set of meows and mrowls that only cats can understand." speech_verb = "meows" ask_verb = "mrowls" exclaim_verb = "yowls" @@ -55,7 +55,7 @@ /datum/language/mouse name = "Mouse" - desc = "Squeak squeak. *Nibbles on cheese*" + desc = "A set of squeaks that only mice can understand." speech_verb = "squeaks" ask_verb = "squeaks" exclaim_verb = "squeaks" @@ -67,7 +67,7 @@ /datum/language/bird name = "Bird" - desc = "Chirp chirp, give me food" + desc = "A set of chirps and squawks that only birds can understand." speech_verb = "chirps" ask_verb = "tweets" exclaim_verb = "squawks" @@ -76,3 +76,15 @@ machine_understands = 0 space_chance = 100 syllables = list("chirp", "squawk", "tweet") + +/datum/language/teppi + name = "Teppi" + desc = "A set of gyohs that only teppi can understand." + speech_verb = "rumbles" + ask_verb = "tilts" + exclaim_verb = "roars" + key = "i" + flags = WHITELISTED + machine_understands = 0 + space_chance = 100 + syllables = list("gyoh", "snoof", "gyoooooOOOooh", "iuuuuh", "gyuuuuh") diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index 77755a3807..0100d1d36e 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -114,7 +114,7 @@ /datum/language/skrell name = LANGUAGE_SKRELLIAN - desc = "A set of warbles and hums, the language itself a complex mesh of both melodic and rhythmic components, exceptionally capable of conveying intent and emotion of the speaker." + desc = "A set of warbles and hums, the language itself a complex mesh of both melodic and rhythmic components, exceptionally capable of conveying intent and emotion of the speaker. Native to Skrell." speech_verb = "warbles" ask_verb = "warbles" exclaim_verb = "sings" @@ -127,7 +127,7 @@ /datum/language/skrellfar name = LANGUAGE_SKRELLIANFAR - desc = "The most common language among the Skrellian Far Kingdoms. Has an even higher than usual concentration of inaudible phonemes." + desc = "The most common language among the Skrellian Far Kingdoms. Has an even higher than usual concentration of inaudible phonemes. Native to Skrell." speech_verb = "warbles" ask_verb = "warbles" exclaim_verb = "sings" @@ -145,7 +145,7 @@ /datum/language/human name = LANGUAGE_SOL_COMMON - desc = "A bastardized hybrid of many languages, including Chinese, English, French, and more; it is the common language of the Sol system." + desc = "A bastardized hybrid of many human languages, including Chinese, English, French, and more; it is the common language of the Sol system." speech_verb = "says" whisper_verb = "whispers" colour = "solcom" @@ -172,7 +172,7 @@ /datum/language/machine name = LANGUAGE_EAL - desc = "An efficient language of encoded tones developed by positronics." + desc = "An efficient language of encoded tones developed by positronics, although compatible with any synthetic lifeforms." speech_verb = "whistles" ask_verb = "chirps" exclaim_verb = "whistles loudly" @@ -190,7 +190,7 @@ /datum/language/teshari name = LANGUAGE_SCHECHI - desc = "A trilling language spoken by the diminutive Teshari." + desc = "A trilling language spoken by the Teshari." speech_verb = "chirps" ask_verb = "chirrups" exclaim_verb = "trills" @@ -222,7 +222,7 @@ /datum/language/promethean name = LANGUAGE_PROMETHEAN - desc = "A complex language composed of guttural noises and bioluminescent signals" + desc = "A complex language of prometheans, composed of guttural noises and bioluminescent signals." signlang_verb = list("flickers","flashes","rapidly flashes a light","quickly flickers a light") speech_verb = "gurgles" ask_verb = "gurgles" diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm index bcc1db723e..77375a9c80 100644 --- a/code/modules/mob/language/station_vr.dm +++ b/code/modules/mob/language/station_vr.dm @@ -11,7 +11,7 @@ /datum/language/birdsong name = LANGUAGE_BIRDSONG - desc = "A language primarily spoken by Narvians" + desc = "A tweety language primarily spoken by Nevreans." speech_verb = "chirps" colour = "birdsongc" key = "G" @@ -160,7 +160,7 @@ /datum/language/tavan name = LANGUAGE_TAVAN - desc = "A language native to the Altevians, it has been adopted by other rodent faring species over time." + desc = "A language native to the rat-like Altevians, it has been adopted by other rodent faring species over time." key = "E" speech_verb = "squeaks" whisper_verb = "squiks" @@ -171,7 +171,7 @@ /datum/language/echosong name = LANGUAGE_ECHOSONG - desc = "An ultrasound-based language, inaudible to those unable to understand it." + desc = "An ultrasound-based language, inaudible to those unable to understand it, spoken by few species capable of actually hearing it." key = "U" signlang_verb = list("opens their mouth soundlessly", "mouthes something silently") signlang_verb_understood = list("squeaks") diff --git a/code/modules/mob/living/bot/SLed209bot.dm b/code/modules/mob/living/bot/SLed209bot.dm index 82f3c43cc2..f016bc55f2 100644 --- a/code/modules/mob/living/bot/SLed209bot.dm +++ b/code/modules/mob/living/bot/SLed209bot.dm @@ -67,7 +67,7 @@ /obj/item/weapon/secbot_assembly/ed209_assembly/slime/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) // Here in the event it's added into a PoI or some such. Standard construction relies on the standard ED up until taser. if(istype(W, /obj/item/weapon/pen)) - var/t = sanitizeSafe(input(user, "Enter new robot name", name, created_name), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return if(!in_range(src, usr) && src.loc != usr) diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index c6d790adeb..3d854bd166 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -263,7 +263,7 @@ qdel(src) else if(istype(W, /obj/item/weapon/pen)) - var/t = sanitizeSafe(input(user, "Enter new robot name", name, created_name), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return if(!in_range(src, usr) && src.loc != usr) diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm index 8700988e59..f699191a66 100644 --- a/code/modules/mob/living/bot/ed209bot.dm +++ b/code/modules/mob/living/bot/ed209bot.dm @@ -87,7 +87,7 @@ ..() if(istype(W, /obj/item/weapon/pen)) - var/t = sanitizeSafe(input(user, "Enter new robot name", name, created_name), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return if(!in_range(src, usr) && src.loc != usr) diff --git a/code/modules/mob/living/bot/edCLNbot.dm b/code/modules/mob/living/bot/edCLNbot.dm index 5ef7cdf9c9..ffdcdb1f44 100644 --- a/code/modules/mob/living/bot/edCLNbot.dm +++ b/code/modules/mob/living/bot/edCLNbot.dm @@ -121,7 +121,7 @@ ..() if(istype(W, /obj/item/weapon/pen)) - var/t = sanitizeSafe(input(user, "Enter new robot name", name, created_name), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return if(!in_range(src, usr) && src.loc != usr) diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 969bfc1c83..938ed1d8e0 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -409,7 +409,7 @@ qdel(src) else if(istype(W, /obj/item/weapon/pen)) - var/t = input(user, "Enter new robot name", name, created_name) as text + var/t = tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN) t = sanitize(t, MAX_NAME_LEN) if(!t) return diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm index a7a7def771..22584ae359 100644 --- a/code/modules/mob/living/bot/floorbot.dm +++ b/code/modules/mob/living/bot/floorbot.dm @@ -382,7 +382,7 @@ user.drop_from_inventory(src) qdel(src) else if (istype(W, /obj/item/weapon/pen)) - var/t = sanitizeSafe(input(user, "Enter new robot name", name, created_name), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return if(!in_range(src, user) && loc != user) @@ -412,7 +412,7 @@ user.drop_from_inventory(src) qdel(src) else if(istype(W, /obj/item/weapon/pen)) - var/t = sanitizeSafe(input(user, "Enter new robot name", name, created_name), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return if(!in_range(src, user) && loc != user) diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm index ced48594f1..2866420be4 100644 --- a/code/modules/mob/living/bot/medbot.dm +++ b/code/modules/mob/living/bot/medbot.dm @@ -535,7 +535,7 @@ /obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if(istype(W, /obj/item/weapon/pen)) - var/t = sanitizeSafe(input(user, "Enter new robot name", name, created_name), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return if(!in_range(src, usr) && loc != usr) diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index f6a868d11a..a9854f0148 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -472,7 +472,7 @@ qdel(src) else if(istype(W, /obj/item/weapon/pen)) - var/t = sanitizeSafe(input(user, "Enter new robot name", name, created_name), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return if(!in_range(src, user) && loc != user) diff --git a/code/modules/mob/living/carbon/alien/progression.dm b/code/modules/mob/living/carbon/alien/progression.dm index 1c4c37b083..0dd4ba7e13 100644 --- a/code/modules/mob/living/carbon/alien/progression.dm +++ b/code/modules/mob/living/carbon/alien/progression.dm @@ -36,7 +36,7 @@ if(mind) mind.transfer_to(adult) if (can_namepick_as_adult) - var/newname = sanitize(input(adult, "You have become an adult. Choose a name for yourself.", "Adult Name") as null|text, MAX_NAME_LEN) + var/newname = sanitize(tgui_input_text(adult, "You have become an adult. Choose a name for yourself.", "Adult Name", null, MAX_NAME_LEN), MAX_NAME_LEN) if(!newname) adult.fully_replace_character_name(name, "[src.adult_name] ([instance_num])") diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index d195f8dbe6..6d5841659b 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -144,6 +144,8 @@ var/list/_human_default_emotes = list( /decl/emote/audible/coyawoo3, /decl/emote/audible/coyawoo4, /decl/emote/audible/coyawoo5, + /decl/emote/audible/fennecscream, + /decl/emote/audible/zoom, //VOREStation Add End //YW ADDITION: Add Start /decl/emote/audible/chirp, @@ -281,7 +283,10 @@ var/list/_simple_mob_default_emotes = list( /decl/emote/visible/blep, /decl/emote/audible/prbt, /decl/emote/audible/gyoh, - /decl/emote/audible/rumble + /decl/emote/audible/rumble, + /decl/emote/audible/fennecscream, + /decl/emote/audible/zoom + ) //VOREStation Add End @@ -300,7 +305,7 @@ var/list/_simple_mob_default_emotes = list( var/datum/gender/T = gender_datums[get_visible_gender()] - pose = sanitize(input(usr, "This is [src]. [T.he]...", "Pose", null) as text) + pose = sanitize(tgui_input_text(usr, "This is [src]. [T.he]...", "Pose", null)) /mob/living/carbon/human/verb/set_flavor() set name = "Set Flavour Text" diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index f2e4ffd67a..b7b494ae65 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -76,22 +76,12 @@ BP_L_LEG = skip_body & EXAMINE_SKIPLEGS, BP_R_LEG = skip_body & EXAMINE_SKIPLEGS) - var/datum/gender/T = gender_datums[get_visible_gender()] + var/gender_hidden = (skip_gear & EXAMINE_SKIPJUMPSUIT) && (skip_body & EXAMINE_SKIPFACE) + var/gender_key = get_visible_gender(user, gender_hidden) - if((skip_gear & EXAMINE_SKIPJUMPSUIT) && (skip_body & EXAMINE_SKIPFACE)) //big suits/masks/helmets make it hard to tell their gender - T = gender_datums[PLURAL] - - else if(species && species.ambiguous_genders) - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(H.species && !istype(species, H.species)) - T = gender_datums[PLURAL]// Species with ambiguous_genders will not show their true gender upon examine if the examiner is not also the same species. - if(!(issilicon(user) || isobserver(user))) // Ghosts and borgs are all knowing - T = gender_datums[PLURAL] - - if(!T) - // Just in case someone VVs the gender to something strange. It'll runtime anyway when it hits usages, better to CRASH() now with a helpful message. - CRASH("Gender datum was null; key was '[((skip_gear & EXAMINE_SKIPJUMPSUIT) && (skip_body & EXAMINE_SKIPFACE)) ? PLURAL : gender]'") + var/datum/gender/T = gender_datums[gender_key] + if (!T) + CRASH({"Null gender datum on examine: mob="[src]",hidden="[gender_hidden]",key="[gender_key]",bio="[gender]",id="[identifying_gender]""}) var/name_ender = "" if(!((skip_gear & EXAMINE_SKIPJUMPSUIT) && (skip_body & EXAMINE_SKIPFACE))) @@ -144,7 +134,7 @@ LAZYADD(pocket_msg, r_store_message) if(LAZYLEN(pocket_msg)) tie_msg += " Near the waist it has [english_list(pocket_msg)]." - + if(w_uniform.blood_DNA) msg += "[T.He] [T.is] wearing [bicon(w_uniform)] [w_uniform.gender==PLURAL?"some":"a"] [(w_uniform.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [w_uniform.name]![tie_msg]" else diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm index d2dcd9bfbd..8611142906 100644 --- a/code/modules/mob/living/carbon/human/examine_vr.dm +++ b/code/modules/mob/living/carbon/human/examine_vr.dm @@ -1,122 +1,61 @@ /mob/living/carbon/human/proc/examine_weight() - if(!show_pudge()) //Some clothing or equipment can hide this. + if(!show_pudge() || !weight_message_visible) //Some clothing or equipment can hide this. return "" var/message = "" var/weight_examine = round(weight) - var/t_He = "It" //capitalised for use at the start of each line. - var/t_he = "it" - var/t_his = "its" - var/t_His = "Its" - var/t_is = "is" - var/t_has = "has" - var/t_heavy = "heavy" - switch(identifying_gender) //Gender is their "real" gender. Identifying_gender is their "chosen" gender. - if(MALE) - t_He = "He" - t_he = "he" - t_His = "His" - t_his = "his" - t_heavy = "bulky" - if(FEMALE) - t_He = "She" - t_he = "she" - t_His = "Her" - t_his = "her" - t_heavy = "curvy" - if(PLURAL) - t_He = "They" - t_he = "they" - t_His = "Their" - t_his = "their" - t_is = "are" - t_has = "have" - if(NEUTER) - t_He = "It" - t_he = "it" - t_His = "Its" - t_his = "its" - if(HERM) - t_He = "Shi" - t_he = "shi" - t_His = "Hir" - t_his = "hir" - t_heavy = "curvy" - switch(weight_examine) if(0 to 74) - message = "[t_He] [t_is] terribly lithe and frail!" + message = weight_messages[1] if(75 to 99) - message = "[t_He] [t_has] a very slender frame." + message = weight_messages[2] if(100 to 124) - message = "[t_He] [t_has] a lightweight, athletic build." + message = weight_messages[3] if(125 to 174) - message = "[t_He] [t_has] a healthy, average body." + message = weight_messages[4] if(175 to 224) - message = "[t_He] [t_has] a thick, [t_heavy] physique." + message = weight_messages[5] if(225 to 274) - message = "[t_He] [t_has] a plush, chubby figure." + message = weight_messages[6] if(275 to 325) - message = "[t_He] [t_has] an especially plump body with a round potbelly and large hips." + message = weight_messages[7] if(325 to 374) - message = "[t_He] [t_has] a very fat frame with a bulging potbelly, squishy rolls of pudge, very wide hips, and plump set of jiggling thighs." + message = weight_messages[8] if(375 to 474) - message = "[t_He] [t_is] incredibly obese. [t_His] massive potbelly sags over [t_his] waistline while [t_his] fat ass would probably require two chairs to sit down comfortably!" + message = weight_messages[9] else - message += "[t_He] [t_is] so morbidly obese, you wonder how [t_he] can even stand, let alone waddle around the station. [t_He] can't get any fatter without being immobilized." + message = weight_messages[10] + if(message) + message = "[message]" return message //Credit to Aronai for helping me actually get this working! /mob/living/carbon/human/proc/examine_nutrition() - if(!show_pudge()) //Some clothing or equipment can hide this. + if(!show_pudge() || !nutrition_message_visible) //Some clothing or equipment can hide this. return "" var/message = "" var/nutrition_examine = round(nutrition) - var/t_He = "It" //capitalised for use at the start of each line. - var/t_His = "Its" - var/t_his = "its" - var/t_is = "is" - var/t_has = "has" - switch(identifying_gender) - if(MALE) - t_He = "He" - t_his = "his" - t_His = "His" - if(FEMALE) - t_He = "She" - t_his = "her" - t_His = "Her" - if(PLURAL) - t_He = "They" - t_his = "their" - t_His = "Their" - t_is = "are" - t_has = "have" - if(NEUTER) - t_He = "It" - t_his = "its" - t_His = "Its" - if(HERM) - t_He = "Shi" - t_his = "hir" - t_His = "Hir" switch(nutrition_examine) if(0 to 49) - message = "[t_He] [t_is] starving! You can hear [t_his] stomach snarling from across the room!" + message = nutrition_messages[1] if(50 to 99) - message = "[t_He] [t_is] extremely hungry. A deep growl occasionally rumbles from [t_his] empty stomach." + message = nutrition_messages[2] if(100 to 499) - return message //Well that's pretty normal, really. + message = nutrition_messages[3] if(500 to 999) // Fat. - message = "[t_He] [t_has] a stuffed belly, bloated fat and round from eating too much." + message = nutrition_messages[4] if(1000 to 1399) - message = "[t_He] [t_has] a rotund, thick gut. It bulges from their body obscenely, close to sagging under its own weight." + message = nutrition_messages[5] if(1400 to 1934) // One person fully digested. - message = "[t_He] [t_is] sporting a large, round, sagging stomach. It contains at least their body weight worth of glorping slush." + message = nutrition_messages[6] if(1935 to 3004) // Two people. - message = "[t_He] [t_is] engorged with a huge stomach that sags and wobbles as they move. [t_He] must have consumed at least twice their body weight. It looks incredibly soft." + message = nutrition_messages[7] if(3005 to 4074) // Three people. - message = "[t_His] stomach is firmly packed with digesting slop. [t_He] must have eaten at least a few times worth their body weight! It looks hard for them to stand, and [t_his] gut jiggles when they move." - if(4075 to INFINITY) // Four or more people. - message = "[t_He] [t_is] so absolutely stuffed that you aren't sure how it's possible to move. [t_He] can't seem to swell any bigger. The surface of [t_his] belly looks sorely strained!" + message = nutrition_messages[8] + if(4075 to 5124) // Four people. + message = nutrition_messages[9] + if(5125 to INFINITY) // More. + message = nutrition_messages[10] + if(message) + message = "[message]" return message //For OmniHUD records access for appropriate models diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index dbd5ea1189..1d4e67f509 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1,1651 +1,1663 @@ -/mob/living/carbon/human - name = "unknown" - real_name = "unknown" - voice_name = "unknown" - icon = 'icons/effects/effects.dmi' //We have an ultra-complex update icons that overlays everything, don't load some stupid random male human - icon_state = "nothing" - - has_huds = TRUE //We do have HUDs (like health, wanted, status, not inventory slots) - - var/embedded_flag //To check if we've need to roll for damage on movement while an item is imbedded in us. - var/obj/item/weapon/rig/wearing_rig // This is very not good, but it's much much better than calling get_rig() every update_canmove() call. - var/last_push_time //For human_attackhand.dm, keeps track of the last use of disarm - - var/spitting = 0 //Spitting and spitting related things. Any human based ranged attacks, be it innate or added abilities. - var/spit_projectile = null //Projectile type. - var/spit_name = null //String - var/last_spit = 0 //Timestamp. - - var/can_defib = 1 //Horrible damage (like beheadings) will prevent defibbing organics. - var/active_regen = FALSE //Used for the regenerate proc in human_powers.dm - var/active_regen_delay = 300 - -/mob/living/carbon/human/Initialize(mapload, var/new_species = null) - if(!dna) - dna = new /datum/dna(null) - // Species name is handled by set_species() - - if(!species) - if(new_species) - set_species(new_species,1) - else - set_species() - - if(species) - real_name = species.get_random_name(gender) - name = real_name - if(mind) - mind.name = real_name - - nutrition = rand(200,400) - - human_mob_list |= src - - . = ..() - - hide_underwear.Cut() - for(var/category in global_underwear.categories_by_name) - hide_underwear[category] = FALSE - - if(dna) - dna.ready_dna(src) - dna.real_name = real_name - sync_organ_dna() - - //verbs |= /mob/living/proc/toggle_selfsurgery //VOREStation Removal - AddComponent(/datum/component/personal_crafting) - -/mob/living/carbon/human/Destroy() - human_mob_list -= src - for(var/organ in organs) - qdel(organ) - QDEL_NULL(nif) //VOREStation Add - worn_clothing.Cut() - return ..() - -/mob/living/carbon/human/Stat() - ..() - if(statpanel("Status")) - stat("Intent:", "[a_intent]") - stat("Move Mode:", "[m_intent]") - if(emergency_shuttle) - var/eta_status = emergency_shuttle.get_status_panel_eta() - if(eta_status) - stat(null, eta_status) - - if (internal) - if (!internal.air_contents) - qdel(internal) - else - stat("Internal Atmosphere Info", internal.name) - stat("Tank Pressure", internal.air_contents.return_pressure()) - stat("Distribution Pressure", internal.distribute_pressure) - - var/obj/item/organ/internal/xenos/plasmavessel/P = internal_organs_by_name[O_PLASMA] //Xenomorphs. Mech. - if(P) - stat(null, "Phoron Stored: [P.stored_plasma]/[P.max_plasma]") - - - if(back && istype(back,/obj/item/weapon/rig)) - var/obj/item/weapon/rig/suit = back - var/cell_status = "ERROR" - if(suit.cell) cell_status = "[suit.cell.charge]/[suit.cell.maxcharge]" - stat(null, "Suit charge: [cell_status]") - - if(mind) - if(mind.changeling) - stat("Chemical Storage", mind.changeling.chem_charges) - stat("Genetic Damage Time", mind.changeling.geneticdamage) - stat("Re-Adaptations", "[mind.changeling.readapts]/[mind.changeling.max_readapts]") - if(species) - species.Stat(src) - -/mob/living/carbon/human/ex_act(severity) - if(!blinded) - flash_eyes() - - for(var/datum/modifier/M in modifiers) - if(!isnull(M.explosion_modifier)) - severity = CLAMP(severity + M.explosion_modifier, 1, 4) - - severity = round(severity) - - if(severity > 3) - return - - var/shielded = 0 - var/b_loss = null - var/f_loss = null - switch (severity) - if (1.0) - b_loss += 500 - if (!prob(getarmor(null, "bomb"))) - gib() - return - else - var/atom/target = get_edge_target_turf(src, get_dir(src, get_step_away(src, src))) - throw_at(target, 200, 4) - //return -// var/atom/target = get_edge_target_turf(user, get_dir(src, get_step_away(user, src))) - //user.throw_at(target, 200, 4) - - if (2.0) - if (!shielded) - b_loss += 60 - - f_loss += 60 - - if (prob(getarmor(null, "bomb"))) - b_loss = b_loss/1.5 - f_loss = f_loss/1.5 - - if (!get_ear_protection() >= 2) - ear_damage += 30 - ear_deaf += 120 - if (prob(70) && !shielded) - Paralyse(10) - - if(3.0) - b_loss += 30 - if (prob(getarmor(null, "bomb"))) - b_loss = b_loss/2 - if (!get_ear_protection() >= 2) - ear_damage += 15 - ear_deaf += 60 - if (prob(50) && !shielded) - Paralyse(10) - - var/blastsoak = getsoak(null, "bomb") - - b_loss = max(1, b_loss - blastsoak) - f_loss = max(1, f_loss - blastsoak) - - var/update = 0 - - // focus most of the blast on one organ - var/obj/item/organ/external/take_blast = pick(organs) - update |= take_blast.take_damage(b_loss * 0.9, f_loss * 0.9, used_weapon = "Explosive blast") - - // distribute the remaining 10% on all limbs equally - b_loss *= 0.1 - f_loss *= 0.1 - - var/weapon_message = "Explosive Blast" - - for(var/obj/item/organ/external/temp in organs) - switch(temp.organ_tag) - if(BP_HEAD) - update |= temp.take_damage(b_loss * 0.2, f_loss * 0.2, used_weapon = weapon_message) - if(BP_TORSO) - update |= temp.take_damage(b_loss * 0.4, f_loss * 0.4, used_weapon = weapon_message) - else - update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message) - if(update) UpdateDamageIcon() - -/mob/living/carbon/human/proc/implant_loyalty(override = FALSE) // Won't override by default. - if(!config.use_loyalty_implants && !override) return // Nuh-uh. - - var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(src) - if(L.handle_implant(src, BP_HEAD)) - L.post_implant(src) - -/mob/living/carbon/human/proc/is_loyalty_implanted() - for(var/L in src.contents) - if(istype(L, /obj/item/weapon/implant/loyalty)) - for(var/obj/item/organ/external/O in src.organs) - if(L in O.implants) - return 1 - return 0 - -/mob/living/carbon/human/restrained() - if (handcuffed) - return 1 - if (istype(wear_suit, /obj/item/clothing/suit/straight_jacket)) - return 1 - return 0 - -/mob/living/carbon/human/var/co2overloadtime = null -/mob/living/carbon/human/var/temperature_resistance = T0C+75 - -// called when something steps onto a human -// this handles mobs on fire - mulebot and vehicle code has been relocated to /mob/living/Crossed() -/mob/living/carbon/human/Crossed(var/atom/movable/AM) - if(AM.is_incorporeal()) - return - - spread_fire(AM) - - ..() // call parent because we moved behavior to parent - -// Get rank from ID, ID inside PDA, PDA, ID in wallet, etc. -/mob/living/carbon/human/proc/get_authentification_rank(var/if_no_id = "No id", var/if_no_job = "No job") - var/obj/item/device/pda/pda = wear_id - if (istype(pda)) - if (pda.id) - return pda.id.rank ? pda.id.rank : if_no_job - else - return pda.ownrank ? pda.ownrank : if_no_job - else - var/obj/item/weapon/card/id/id = get_idcard() - if(id) - return id.rank ? id.rank : if_no_job - else - return if_no_id - -//gets assignment from ID or ID inside PDA or PDA itself -//Useful when player do something with computers -/mob/living/carbon/human/proc/get_assignment(var/if_no_id = "No id", var/if_no_job = "No job") - var/obj/item/device/pda/pda = wear_id - if (istype(pda)) - if (pda.id) - return pda.id.assignment - else - return pda.ownjob ? pda.ownjob : if_no_job - else - var/obj/item/weapon/card/id/id = get_idcard() - if(id) - return id.assignment ? id.assignment : if_no_job - else - return if_no_id - -//gets name from ID or ID inside PDA or PDA itself -//Useful when player do something with computers -/mob/living/carbon/human/proc/get_authentification_name(var/if_no_id = "Unknown") - var/obj/item/device/pda/pda = wear_id - if (istype(pda)) - if (pda.id) - return pda.id.registered_name - else - return pda.owner ? pda.owner : if_no_id - else - var/obj/item/weapon/card/id/id = get_idcard() - if(id) - return id.registered_name - else - return if_no_id - -//repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a seperate proc as it'll be useful elsewhere -/mob/living/carbon/human/proc/get_visible_name() - if( wear_mask && (wear_mask.flags_inv&HIDEFACE) ) //Wearing a mask which hides our face, use id-name if possible - return get_id_name("Unknown") - if( head && (head.flags_inv&HIDEFACE) ) - return get_id_name("Unknown") //Likewise for hats - var/face_name = get_face_name() - var/id_name = get_id_name("") - if((face_name == "Unknown") && id_name && (id_name != face_name)) - return "[face_name] (as [id_name])" - return face_name - -//Returns "Unknown" if facially disfigured and real_name if not. Useful for setting name when polyacided or when updating a human's name variable -/mob/living/carbon/human/proc/get_face_name() - var/obj/item/organ/external/head = get_organ(BP_HEAD) - if(!head || head.disfigured || head.is_stump() || !real_name || (HUSK in mutations) ) //disfigured. use id-name if possible - return "Unknown" - return real_name - -//gets name from ID or PDA itself, ID inside PDA doesn't matter -//Useful when player is being seen by other mobs -/mob/living/carbon/human/proc/get_id_name(var/if_no_id = "Unknown") - . = if_no_id - if(istype(wear_id,/obj/item/device/pda)) - var/obj/item/device/pda/P = wear_id - return P.owner ? P.owner : if_no_id - if(wear_id) - var/obj/item/weapon/card/id/I = wear_id.GetID() - if(I) - return I.registered_name - return - -//gets ID card object from special clothes slot or null. -/mob/living/carbon/human/proc/get_idcard() - if(wear_id) - return wear_id.GetID() - -//Removed the horrible safety parameter. It was only being used by ninja code anyways. -//Now checks siemens_coefficient of the affected area by default -/mob/living/carbon/human/electrocute_act(var/shock_damage, var/obj/source, var/base_siemens_coeff = 1.0, var/def_zone = null) - - if(status_flags & GODMODE) return 0 //godmode - - if (!def_zone) - def_zone = pick("l_hand", "r_hand") - - if(species.siemens_coefficient == -1) - if(stored_shock_by_ref["\ref[src]"]) - stored_shock_by_ref["\ref[src]"] += shock_damage - else - stored_shock_by_ref["\ref[src]"] = shock_damage - return - - var/obj/item/organ/external/affected_organ = get_organ(check_zone(def_zone)) - var/siemens_coeff = base_siemens_coeff * get_siemens_coefficient_organ(affected_organ) - if(fire_stacks < 0) // Water makes you more conductive. - siemens_coeff *= 1.5 - - return ..(shock_damage, source, siemens_coeff, def_zone) - - -/mob/living/carbon/human/Topic(href, href_list) - if (href_list["mach_close"]) // This is horrible. - var/t1 = text("window=[]", href_list["mach_close"]) - unset_machine() - src << browse(null, t1) - - if(href_list["item"]) - log_runtime(EXCEPTION("Warning: human/Topic was called with item [href_list["item"]], but the item Topic is deprecated!")) - // handle_strip(href_list["item"],usr) - - if (href_list["criminal"]) - if(hasHUD(usr,"security")) - - var/modified = 0 - var/perpname = "wot" - var/obj/item/weapon/card/id/I = GetIdCard() - if(I) - perpname = I.registered_name - else - perpname = name - - if(perpname) - for (var/datum/data/record/E in data_core.general) - if (E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.security) - if (R.fields["id"] == E.fields["id"]) - - var/setcriminal = tgui_input_list(usr, "Specify a new criminal status for this person.", "Security HUD", list("None", "*Arrest*", "Incarcerated", "Parolled", "Released", "Cancel")) - - if(hasHUD(usr, "security")) - if(setcriminal != "Cancel") - R.fields["criminal"] = setcriminal - modified = 1 - - spawn() - BITSET(hud_updateflag, WANTED_HUD) - if(istype(usr,/mob/living/carbon/human)) - var/mob/living/carbon/human/U = usr - U.handle_hud_list() - if(istype(usr,/mob/living/silicon/robot)) - var/mob/living/silicon/robot/U = usr - U.handle_regular_hud_updates() - - if(!modified) - to_chat(usr, "Unable to locate a data core entry for this person.") - - if (href_list["secrecord"]) - if(hasHUD(usr,"security")) - var/perpname = "wot" - var/read = 0 - - var/obj/item/weapon/card/id/I = GetIdCard() - if(I) - perpname = I.registered_name - else - perpname = name - for (var/datum/data/record/E in data_core.general) - if (E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.security) - if (R.fields["id"] == E.fields["id"]) - if(hasHUD(usr,"security")) - to_chat(usr, "Name: [R.fields["name"]] Criminal Status: [R.fields["criminal"]]") - to_chat(usr, "Minor Crimes: [R.fields["mi_crim"]]") - to_chat(usr, "Details: [R.fields["mi_crim_d"]]") - to_chat(usr, "Major Crimes: [R.fields["ma_crim"]]") - to_chat(usr, "Details: [R.fields["ma_crim_d"]]") - to_chat(usr, "Notes: [R.fields["notes"]]") - to_chat(usr, "\[View Comment Log\]") - read = 1 - - if(!read) - to_chat(usr, "Unable to locate a data core entry for this person.") - - if (href_list["secrecordComment"]) - if(hasHUD(usr,"security")) - var/perpname = "wot" - var/read = 0 - - var/obj/item/weapon/card/id/I = GetIdCard() - if(I) - perpname = I.registered_name - else - perpname = name - for (var/datum/data/record/E in data_core.general) - if (E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.security) - if (R.fields["id"] == E.fields["id"]) - if(hasHUD(usr,"security")) - read = 1 - var/counter = 1 - while(R.fields[text("com_[]", counter)]) - to_chat(usr, "[R.fields[text("com_[]", counter)]]") - counter++ - if (counter == 1) - to_chat(usr, "No comment found") - to_chat(usr, "\[Add comment\]") - - if(!read) - to_chat(usr, "Unable to locate a data core entry for this person.") - - if (href_list["secrecordadd"]) - if(hasHUD(usr,"security")) - var/perpname = "wot" - var/obj/item/weapon/card/id/I = GetIdCard() - if(I) - perpname = I.registered_name - else - perpname = name - for (var/datum/data/record/E in data_core.general) - if (E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.security) - if (R.fields["id"] == E.fields["id"]) - if(hasHUD(usr,"security")) - var/t1 = sanitize(input(usr, "Add Comment:", "Sec. records", null, null) as message) - if ( !(t1) || usr.stat || usr.restrained() || !(hasHUD(usr,"security")) ) - return - var/counter = 1 - while(R.fields[text("com_[]", counter)]) - counter++ - if(istype(usr,/mob/living/carbon/human)) - var/mob/living/carbon/human/U = usr - R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") - if(istype(usr,/mob/living/silicon/robot)) - var/mob/living/silicon/robot/U = usr - R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") - - if (href_list["medical"]) - if(hasHUD(usr,"medical")) - var/perpname = "wot" - var/modified = 0 - - var/obj/item/weapon/card/id/I = GetIdCard() - if(I) - perpname = I.registered_name - else - perpname = name - - for (var/datum/data/record/E in data_core.general) - if (E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.general) - if (R.fields["id"] == E.fields["id"]) - - var/setmedical = tgui_input_list(usr, "Specify a new medical status for this person.", "Medical HUD", list("*SSD*", "*Deceased*", "Physically Unfit", "Active", "Disabled", "Cancel")) - - if(hasHUD(usr,"medical")) - if(setmedical != "Cancel") - R.fields["p_stat"] = setmedical - modified = 1 - if(PDA_Manifest.len) - PDA_Manifest.Cut() - - spawn() - if(istype(usr,/mob/living/carbon/human)) - var/mob/living/carbon/human/U = usr - U.handle_regular_hud_updates() - if(istype(usr,/mob/living/silicon/robot)) - var/mob/living/silicon/robot/U = usr - U.handle_regular_hud_updates() - - if(!modified) - to_chat(usr, "Unable to locate a data core entry for this person.") - - if (href_list["medrecord"]) - if(hasHUD(usr,"medical")) - var/perpname = "wot" - var/read = 0 - - var/obj/item/weapon/card/id/I = GetIdCard() - if(I) - perpname = I.registered_name - else - perpname = name - for (var/datum/data/record/E in data_core.general) - if (E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.medical) - if (R.fields["id"] == E.fields["id"]) - if(hasHUD(usr,"medical")) - to_chat(usr, "Name: [R.fields["name"]] Blood Type: [R.fields["b_type"]]") - to_chat(usr, "DNA: [R.fields["b_dna"]]") - to_chat(usr, "Minor Disabilities: [R.fields["mi_dis"]]") - to_chat(usr, "Details: [R.fields["mi_dis_d"]]") - to_chat(usr, "Major Disabilities: [R.fields["ma_dis"]]") - to_chat(usr, "Details: [R.fields["ma_dis_d"]]") - to_chat(usr, "Notes: [R.fields["notes"]]") - to_chat(usr, "\[View Comment Log\]") - read = 1 - - if(!read) - to_chat(usr, "Unable to locate a data core entry for this person.") - - if (href_list["medrecordComment"]) - if(hasHUD(usr,"medical")) - var/perpname = "wot" - var/read = 0 - - var/obj/item/weapon/card/id/I = GetIdCard() - if(I) - perpname = I.registered_name - else - perpname = name - for (var/datum/data/record/E in data_core.general) - if (E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.medical) - if (R.fields["id"] == E.fields["id"]) - if(hasHUD(usr,"medical")) - read = 1 - var/counter = 1 - while(R.fields[text("com_[]", counter)]) - to_chat(usr, "[R.fields[text("com_[]", counter)]]") - counter++ - if (counter == 1) - to_chat(usr, "No comment found") - to_chat(usr, "\[Add comment\]") - - if(!read) - to_chat(usr, "Unable to locate a data core entry for this person.") - - if (href_list["medrecordadd"]) - if(hasHUD(usr,"medical")) - var/perpname = "wot" - var/obj/item/weapon/card/id/I = GetIdCard() - if(I) - perpname = I.registered_name - else - perpname = name - for (var/datum/data/record/E in data_core.general) - if (E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.medical) - if (R.fields["id"] == E.fields["id"]) - if(hasHUD(usr,"medical")) - var/t1 = sanitize(input(usr, "Add Comment:", "Med. records", null, null) as message) - if ( !(t1) || usr.stat || usr.restrained() || !(hasHUD(usr,"medical")) ) - return - var/counter = 1 - while(R.fields[text("com_[]", counter)]) - counter++ - if(istype(usr,/mob/living/carbon/human)) - var/mob/living/carbon/human/U = usr - R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") - if(istype(usr,/mob/living/silicon/robot)) - var/mob/living/silicon/robot/U = usr - R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") - - if (href_list["lookitem"]) - var/obj/item/I = locate(href_list["lookitem"]) - src.examinate(I) - - if (href_list["lookmob"]) - var/mob/M = locate(href_list["lookmob"]) - src.examinate(M) - - if (href_list["clickitem"]) - var/obj/item/I = locate(href_list["clickitem"]) - if(src.client) - src.ClickOn(I) - - if (href_list["flavor_change"]) - switch(href_list["flavor_change"]) - if("done") - src << browse(null, "window=flavor_changes") - return - if("general") - var/msg = sanitize(input(usr,"Update the general description of your character. This will be shown regardless of clothing.","Flavor Text",html_decode(flavor_texts[href_list["flavor_change"]])) as message, extra = 0) //VOREStation Edit: separating out OOC notes - flavor_texts[href_list["flavor_change"]] = msg - return - else - var/msg = sanitize(input(usr,"Update the flavor text for your [href_list["flavor_change"]].","Flavor Text",html_decode(flavor_texts[href_list["flavor_change"]])) as message, extra = 0) - flavor_texts[href_list["flavor_change"]] = msg - set_flavor() - return - ..() - return - -///eyecheck() -///Returns a number between -1 to 2 -/mob/living/carbon/human/eyecheck() - - var/obj/item/organ/internal/eyes/I - - if(internal_organs_by_name[O_EYES]) // Eyes are fucked, not a 'weak point'. - I = internal_organs_by_name[O_EYES] - if(I.is_broken()) - return FLASH_PROTECTION_MAJOR - else if(!species.dispersed_eyes) // They can't be flashed if they don't have eyes, or widespread sensing surfaces. - return FLASH_PROTECTION_MAJOR - - var/number = get_equipment_flash_protection() - if(I) - number = I.get_total_protection(number) - I.additional_flash_effects(number) - return number - -/mob/living/carbon/human/flash_eyes(var/intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, visual = FALSE, type = /obj/screen/fullscreen/flash) - if(internal_organs_by_name[O_EYES]) // Eyes are fucked, not a 'weak point'. - var/obj/item/organ/internal/eyes/I = internal_organs_by_name[O_EYES] - I.additional_flash_effects(intensity) - return ..() - -#define add_clothing_protection(A) \ - var/obj/item/clothing/C = A; \ - flash_protection += C.flash_protection; \ - -/mob/living/carbon/human/proc/get_equipment_flash_protection() - var/flash_protection = 0 - - if(istype(src.head, /obj/item/clothing/head)) - add_clothing_protection(head) - if(istype(src.glasses, /obj/item/clothing/glasses)) - add_clothing_protection(glasses) - if(istype(src.wear_mask, /obj/item/clothing/mask)) - add_clothing_protection(wear_mask) - - return flash_protection - -#undef add_clothing_protection - -//Used by various things that knock people out by applying blunt trauma to the head. -//Checks that the species has a "head" (brain containing organ) and that hit_zone refers to it. -/mob/living/carbon/human/proc/headcheck(var/target_zone, var/brain_tag = "brain") - - var/obj/item/organ/affecting = internal_organs_by_name[brain_tag] - - target_zone = check_zone(target_zone) - if(!affecting || affecting.parent_organ != target_zone) - return 0 - - //if the parent organ is significantly larger than the brain organ, then hitting it is not guaranteed - var/obj/item/organ/parent = get_organ(target_zone) - if(!parent) - return 0 - - if(parent.w_class > affecting.w_class + 1) - return prob(100 / 2**(parent.w_class - affecting.w_class - 1)) - - return 1 - -/mob/living/carbon/human/IsAdvancedToolUser(var/silent) - // VOREstation start - if(feral) - to_chat(src, "Your primitive mind can't grasp the concept of that thing.") - return 0 - // VOREstation end - if(species.has_fine_manipulation) - return 1 - if(!silent) - to_chat(src, "You don't have the dexterity to use that!") - return 0 - -/mob/living/carbon/human/abiotic(var/full_body = 0) - if(full_body && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.l_ear || src.r_ear || src.gloves))) - return 1 - - if( (src.l_hand && !src.l_hand.abstract) || (src.r_hand && !src.r_hand.abstract) ) - return 1 - - return 0 - - -/mob/living/carbon/human/proc/check_dna() - dna.check_integrity(src) - return - -/mob/living/carbon/human/get_species() - if(!species) - set_species() - return species.name - -/mob/living/carbon/human/proc/play_xylophone() - if(!src.xylophone) - var/datum/gender/T = gender_datums[get_visible_gender()] - visible_message("\The [src] begins playing [T.his] ribcage like a xylophone. It's quite spooky.","You begin to play a spooky refrain on your ribcage.","You hear a spooky xylophone melody.") - var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg') - playsound(src, song, 50, 1, -1) - xylophone = 1 - spawn(1200) - xylophone=0 - return - -/mob/living/proc/check_has_mouth() - return 1 - -/mob/living/carbon/human/check_has_mouth() - // Todo, check stomach organ when implemented. - var/obj/item/organ/external/head/H = get_organ(BP_HEAD) - if(!H || !H.can_intake_reagents) - return 0 - return 1 - -/mob/living/carbon/human/proc/morph() - set name = "Morph" - set category = "Superpower" - - if(stat!=CONSCIOUS) - reset_view(0) - remoteview_target = null - return - - if(!(mMorph in mutations)) - src.verbs -= /mob/living/carbon/human/proc/morph - return - - var/new_facial = input(usr, "Please select facial hair color.", "Character Generation",rgb(r_facial,g_facial,b_facial)) as color - if(new_facial) - r_facial = hex2num(copytext(new_facial, 2, 4)) - g_facial = hex2num(copytext(new_facial, 4, 6)) - b_facial = hex2num(copytext(new_facial, 6, 8)) - - var/new_hair = input(usr, "Please select hair color.", "Character Generation",rgb(r_hair,g_hair,b_hair)) as color - if(new_facial) - r_hair = hex2num(copytext(new_hair, 2, 4)) - g_hair = hex2num(copytext(new_hair, 4, 6)) - b_hair = hex2num(copytext(new_hair, 6, 8)) - - var/new_eyes = input(usr, "Please select eye color.", "Character Generation",rgb(r_eyes,g_eyes,b_eyes)) as color - if(new_eyes) - r_eyes = hex2num(copytext(new_eyes, 2, 4)) - g_eyes = hex2num(copytext(new_eyes, 4, 6)) - b_eyes = hex2num(copytext(new_eyes, 6, 8)) - update_eyes() - - // hair - var/list/all_hairs = subtypesof(/datum/sprite_accessory/hair) - var/list/hairs = list() - - // loop through potential hairs - for(var/x in all_hairs) - var/datum/sprite_accessory/hair/H = new x // create new hair datum based on type x - hairs.Add(H.name) // add hair name to hairs - qdel(H) // delete the hair after it's all done - - var/new_style = tgui_input_list(usr, "Please select hair style", "Character Generation", hairs) - - // if new style selected (not cancel) - if (new_style) - h_style = new_style - - // facial hair - var/list/all_fhairs = subtypesof(/datum/sprite_accessory/facial_hair) - var/list/fhairs = list() - - for(var/x in all_fhairs) - var/datum/sprite_accessory/facial_hair/H = new x - fhairs.Add(H.name) - qdel(H) - - new_style = tgui_input_list(usr, "Please select facial style", "Character Generation", fhairs) - - if(new_style) - f_style = new_style - - var/new_gender = tgui_alert(usr, "Please select gender.", "Character Generation", list("Male", "Female", "Neutral")) - if (new_gender) - if(new_gender == "Male") - gender = MALE - else if(new_gender == "Female") - gender = FEMALE - else - gender = NEUTER - regenerate_icons() - check_dna() - var/datum/gender/T = gender_datums[get_visible_gender()] - visible_message("\The [src] morphs and changes [T.his] appearance!", "You change your appearance!", "Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!") - -/mob/living/carbon/human/proc/remotesay() - set name = "Project mind" - set category = "Superpower" - - if(stat!=CONSCIOUS) - reset_view(0) - remoteview_target = null - return - - if(!(mRemotetalk in src.mutations)) - src.verbs -= /mob/living/carbon/human/proc/remotesay - return - var/list/creatures = list() - for(var/mob/living/carbon/h in mob_list) - creatures += h - var/mob/target = tgui_input_list(usr, "Who do you want to project your mind to?", "Project Mind", creatures) - if (isnull(target)) - return - - var/say = sanitize(input(usr, "What do you wish to say")) - if(mRemotetalk in target.mutations) - target.show_message(" You hear [src.real_name]'s voice: [say]") - else - target.show_message(" You hear a voice that seems to echo around the room: [say]") - usr.show_message(" You project your mind into [target.real_name]: [say]") - log_say("(TPATH to [key_name(target)]) [say]",src) - for(var/mob/observer/dead/G in mob_list) - G.show_message("Telepathic message from [src] to [target]: [say]") - -/mob/living/carbon/human/proc/remoteobserve() - set name = "Remote View" - set category = "Superpower" - - if(stat!=CONSCIOUS) - remoteview_target = null - reset_view(0) - return - - if(!(mRemote in src.mutations)) - remoteview_target = null - reset_view(0) - src.verbs -= /mob/living/carbon/human/proc/remoteobserve - return - - if(client.eye != client.mob) - remoteview_target = null - reset_view(0) - return - - var/list/mob/creatures = list() - - for(var/mob/living/carbon/h in mob_list) - var/turf/temp_turf = get_turf(h) - if((temp_turf.z != 1 && temp_turf.z != 5) || h.stat!=CONSCIOUS) //Not on mining or the station. Or dead - continue - creatures += h - - var/mob/target = input ("Who do you want to project your mind to ?") as mob in creatures - - if (target) - remoteview_target = target - reset_view(target) - else - remoteview_target = null - reset_view(0) - -/mob/living/carbon/human/get_visible_gender() - if(wear_suit && wear_suit.flags_inv & HIDEJUMPSUIT && ((head && head.flags_inv & HIDEMASK) || wear_mask)) - return PLURAL //plural is the gender-neutral default - if(species) - if(species.ambiguous_genders) - return PLURAL // regardless of what you're wearing, your gender can't be figured out - return get_gender() - -/mob/living/carbon/human/proc/increase_germ_level(n) - if(gloves) - gloves.germ_level += n - else - germ_level += n - -/mob/living/carbon/human/revive() - - if(should_have_organ(O_HEART)) - vessel.add_reagent("blood",species.blood_volume-vessel.total_volume) - fixblood() - - species.create_organs(src) // Reset our organs/limbs. - restore_all_organs() // Reapply robotics/amputated status from preferences. - - if(!client || !key) //Don't boot out anyone already in the mob. - for (var/obj/item/organ/internal/brain/H in GLOB.all_brain_organs) - if(H.brainmob) - if(H.brainmob.real_name == src.real_name) - if(H.brainmob.mind) - H.brainmob.mind.transfer_to(src) - qdel(H) - - // Vorestation Addition - reapply markings/appearance from prefs for player mobs - if(client) //just to be sure - client.prefs.copy_to(src) - if(dna) - dna.ResetUIFrom(src) - sync_organ_dna() - // end vorestation addition - - for (var/ID in virus2) - var/datum/disease2/disease/V = virus2[ID] - V.cure(src) - - losebreath = 0 - - ..() - -/mob/living/carbon/human/proc/is_lung_ruptured() - var/obj/item/organ/internal/lungs/L = internal_organs_by_name[O_LUNGS] - return L && L.is_bruised() - -/mob/living/carbon/human/proc/rupture_lung() - var/obj/item/organ/internal/lungs/L = internal_organs_by_name[O_LUNGS] - - if(L) - L.rupture() - -/* -/mob/living/carbon/human/verb/simulate() - set name = "sim" - set background = 1 - - var/damage = input(usr, "Wound damage","Wound damage") as num - - var/germs = 0 - var/tdamage = 0 - var/ticks = 0 - while (germs < 2501 && ticks < 100000 && round(damage/10)*20) - log_misc("VIRUS TESTING: [ticks] : germs [germs] tdamage [tdamage] prob [round(damage/10)*20]") - ticks++ - if (prob(round(damage/10)*20)) - germs++ - if (germs == 100) - to_world("Reached stage 1 in [ticks] ticks") - if (germs > 100) - if (prob(10)) - damage++ - germs++ - if (germs == 1000) - to_world("Reached stage 2 in [ticks] ticks") - if (germs > 1000) - damage++ - germs++ - if (germs == 2500) - to_world("Reached stage 3 in [ticks] ticks") - to_world("Mob took [tdamage] tox damage") -*/ -//returns 1 if made bloody, returns 0 otherwise - -/mob/living/carbon/human/add_blood(mob/living/carbon/human/M as mob) - if (!..()) - return 0 - //if this blood isn't already in the list, add it - if(istype(M)) - if(!blood_DNA[M.dna.unique_enzymes]) - blood_DNA[M.dna.unique_enzymes] = M.dna.b_type - hand_blood_color = blood_color - update_bloodied() - verbs += /mob/living/carbon/human/proc/bloody_doodle - return 1 //we applied blood to the item - -/mob/living/carbon/human/proc/get_full_print() - if(!dna ||!dna.uni_identity) - return - return md5(dna.uni_identity) - -/mob/living/carbon/human/clean_blood(var/washshoes) - . = ..() - - gunshot_residue = null - - //Always do hands (or whatever's on our hands) - if(gloves) - gloves.clean_blood() - update_inv_gloves() - gloves.germ_level = 0 - else - bloody_hands = 0 - germ_level = 0 - - //Sometimes do shoes if asked (or feet if no shoes) - if(washshoes && shoes) - shoes.clean_blood() - update_inv_shoes() - shoes.germ_level = 0 - else if(washshoes && (feet_blood_color || LAZYLEN(feet_blood_DNA))) - LAZYCLEARLIST(feet_blood_DNA) - feet_blood_DNA = null - feet_blood_color = null - - update_bloodied() - -/mob/living/carbon/human/get_visible_implants(var/class = 0) - - var/list/visible_implants = list() - for(var/obj/item/organ/external/organ in src.organs) - for(var/obj/item/weapon/O in organ.implants) - if(!istype(O,/obj/item/weapon/implant) && (O.w_class > class) && !istype(O,/obj/item/weapon/material/shard/shrapnel)) - visible_implants += O - - return(visible_implants) - -/mob/living/carbon/human/embedded_needs_process() - for(var/obj/item/organ/external/organ in src.organs) - for(var/obj/item/O in organ.implants) - if(!istype(O, /obj/item/weapon/implant)) //implant type items do not cause embedding effects, see handle_embedded_objects() - return 1 - return 0 - -/mob/living/carbon/human/proc/handle_embedded_objects() - - for(var/obj/item/organ/external/organ in src.organs) - if(organ.splinted) //Splints prevent movement. - continue - for(var/obj/item/O in organ.implants) - if(!istype(O,/obj/item/weapon/implant) && prob(5)) //Moving with things stuck in you could be bad. - // All kinds of embedded objects cause bleeding. - if(!can_feel_pain(organ.organ_tag)) - to_chat(src, "You feel [O] moving inside your [organ.name].") - else - var/msg = pick( \ - "A spike of pain jolts your [organ.name] as you bump [O] inside.", \ - "Your movement jostles [O] in your [organ.name] painfully.", \ - "Your movement jostles [O] in your [organ.name] painfully.") - custom_pain(msg, 40) - - organ.take_damage(rand(1,3), 0, 0) - if(!(organ.robotic >= ORGAN_ROBOT) && (should_have_organ(O_HEART))) //There is no blood in protheses. - organ.status |= ORGAN_BLEEDING - -/mob/living/carbon/human/verb/check_pulse() - set category = "Object" - set name = "Check pulse" - set desc = "Approximately count somebody's pulse. Requires you to stand still at least 6 seconds." - set src in view(1) - var/self = 0 - - if(usr.stat || usr.restrained() || !isliving(usr)) return - - var/datum/gender/TU = gender_datums[usr.get_visible_gender()] - var/datum/gender/T = gender_datums[get_visible_gender()] - - if(usr == src) - self = 1 - if(!self) - usr.visible_message("[usr] kneels down, puts [TU.his] hand on [src]'s wrist and begins counting [T.his] pulse.",\ - "You begin counting [src]'s pulse") - else - usr.visible_message("[usr] begins counting [T.his] pulse.",\ - "You begin counting your pulse.") - - if(src.pulse) - to_chat(usr, "[self ? "You have a" : "[src] has a"] pulse! Counting...") - else - to_chat(usr, "[src] has no pulse!") //it is REALLY UNLIKELY that a dead person would check his own pulse - return - - to_chat(usr, "You must[self ? "" : " both"] remain still until counting is finished.") - if(do_mob(usr, src, 60)) - var/message = "[self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)]." - to_chat(usr,message) - else - to_chat(usr, "You failed to check the pulse. Try again.") - -/mob/living/carbon/human/proc/set_species(var/new_species, var/default_colour, var/regen_icons = TRUE, var/mob/living/carbon/human/example = null) //VOREStation Edit - send an example - - if(!dna) - if(!new_species) - new_species = SPECIES_HUMAN - else - if(!new_species) - new_species = dna.species - else - dna.species = new_species - - // No more invisible screaming wheelchairs because of set_species() typos. - if(!GLOB.all_species[new_species]) - new_species = SPECIES_HUMAN - - if(species) - - if(species.name && species.name == new_species && species.name != "Custom Species") //VOREStation Edit - return - if(species.language) - remove_language(species.language) - if(species.default_language) - remove_language(species.default_language) - for(var/datum/language/L in species.assisted_langs) - remove_language(L) - // Clear out their species abilities. - species.remove_inherent_verbs(src) - holder_type = null - hunger_rate = initial(hunger_rate) //VOREStation Add - - species = GLOB.all_species[new_species] - - if(species.language) - add_language(species.language) - - if(species.default_language) - add_language(species.default_language) - - if(species.icon_scale_x != 1 || species.icon_scale_y != 1) - update_transform() - - if(example) //VOREStation Edit begin - if(!(example == src)) - r_skin = example.r_skin - g_skin = example.g_skin - b_skin = example.b_skin - else if(species.base_color) //VOREStation Edit end - //Apply colour. - r_skin = hex2num(copytext(species.base_color,2,4)) - g_skin = hex2num(copytext(species.base_color,4,6)) - b_skin = hex2num(copytext(species.base_color,6,8)) - else - r_skin = 0 - g_skin = 0 - b_skin = 0 - - if(species.holder_type) - holder_type = species.holder_type - - if(!(gender in species.genders)) - gender = species.genders[1] - - //icon_state = lowertext(species.name) //Necessary? - - //VOREStation Edit start: swap places of those two procs - species.handle_post_spawn(src) - - species.create_organs(src) - //VOREStation Edit end: swap places of those two procs - - - maxHealth = species.total_health - hunger_rate = species.hunger_factor //VOREStation Add - - if(LAZYLEN(descriptors)) - descriptors = null - - if(LAZYLEN(species.descriptors)) - descriptors = list() - for(var/desctype in species.descriptors) - var/datum/mob_descriptor/descriptor = species.descriptors[desctype] - descriptors[desctype] = descriptor.default_value - - spawn(0) - if(regen_icons) regenerate_icons() - make_blood() - if(vessel.total_volume < species.blood_volume) - vessel.maximum_volume = species.blood_volume - vessel.add_reagent("blood", species.blood_volume - vessel.total_volume) - else if(vessel.total_volume > species.blood_volume) - vessel.remove_reagent("blood", vessel.total_volume - species.blood_volume) - vessel.maximum_volume = species.blood_volume - fixblood() - species.update_attack_types() //VOREStation Edit - Required for any trait that updates unarmed_types in setup. - - // Rebuild the HUD. If they aren't logged in then login() should reinstantiate it for them. - update_hud() - - //A slew of bits that may be affected by our species change - regenerate_icons() - - if(species) - //if(mind) //VOREStation Removal - //apply_traits() //VOREStation Removal - return 1 - else - return 0 - -/mob/living/carbon/human/proc/bloody_doodle() - set category = "IC" - set name = "Write in blood" - set desc = "Use blood on your hands to write a short message on the floor or a wall, murder mystery style." - - if (src.stat) - return - - if (usr != src) - return 0 //something is terribly wrong - - if (!bloody_hands) - verbs -= /mob/living/carbon/human/proc/bloody_doodle - - if (src.gloves) - to_chat(src, "Your [src.gloves] are getting in the way.") - return - - var/turf/simulated/T = src.loc - if (!istype(T)) //to prevent doodling out of mechs and lockers - to_chat(src, "You cannot reach the floor.") - return - - var/direction = tgui_input_list(src,"Which way?","Tile selection", list("Here","North","South","East","West")) - if (direction != "Here") - T = get_step(T,text2dir(direction)) - if (!istype(T)) - to_chat(src, "You cannot doodle there.") - return - - var/num_doodles = 0 - for (var/obj/effect/decal/cleanable/blood/writing/W in T) - num_doodles++ - if (num_doodles > 4) - to_chat(src, "There is no space to write on!") - return - - var/max_length = bloody_hands * 30 //tweeter style - - var/message = sanitize(input(usr, "Write a message. It cannot be longer than [max_length] characters.","Blood writing", "")) - - if (message) - var/used_blood_amount = round(length(message) / 30, 1) - bloody_hands = max(0, bloody_hands - used_blood_amount) //use up some blood - - if (length(message) > max_length) - message += "-" - to_chat(src, "You ran out of blood to write with!") - - var/obj/effect/decal/cleanable/blood/writing/W = new(T) - W.basecolor = (hand_blood_color) ? hand_blood_color : "#A10808" - W.update_icon() - W.message = message - W.add_fingerprint(src) - -/mob/living/carbon/human/can_inject(var/mob/user, var/error_msg, var/target_zone, var/ignore_thickness = FALSE) - . = 1 - - if(!target_zone) - if(!user) - target_zone = pick(BP_TORSO,BP_TORSO,BP_TORSO,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_HEAD) - else - target_zone = user.zone_sel.selecting - - var/obj/item/organ/external/affecting = get_organ(target_zone) - var/fail_msg - if(!affecting) - . = 0 - fail_msg = "They are missing that limb." - else if (affecting.robotic == ORGAN_ROBOT) - . = 0 - fail_msg = "That limb is robotic." - else if (affecting.robotic >= ORGAN_LIFELIKE) - . = 0 - fail_msg = "Your needle refuses to penetrate more than a short distance..." - else if (affecting.thick_skin && prob(70 - round(affecting.brute_dam + affecting.burn_dam / 2))) // Allows transplanted limbs with thick skin to maintain their resistance. - . = 0 - fail_msg = "Your needle fails to penetrate \the [affecting]'s thick hide..." - else - switch(target_zone) - if(BP_HEAD) - if(head && (head.item_flags & THICKMATERIAL) && !ignore_thickness) - . = 0 - else - if(wear_suit && (wear_suit.item_flags & THICKMATERIAL) && !ignore_thickness) - . = 0 - if(!. && error_msg && user) - if(!fail_msg) - fail_msg = "There is no exposed flesh or thin material [target_zone == BP_HEAD ? "on their head" : "on their body"] to inject into." - to_chat(user, "[fail_msg]") - -/mob/living/carbon/human/print_flavor_text(var/shrink = 1) - var/list/equipment = list(src.head,src.wear_mask,src.glasses,src.w_uniform,src.wear_suit,src.gloves,src.shoes) - var/head_exposed = 1 - var/face_exposed = 1 - var/eyes_exposed = 1 - var/torso_exposed = 1 - var/arms_exposed = 1 - var/legs_exposed = 1 - var/hands_exposed = 1 - var/feet_exposed = 1 - - for(var/obj/item/clothing/C in equipment) - if(C.body_parts_covered & HEAD) - head_exposed = 0 - if(C.body_parts_covered & FACE) - face_exposed = 0 - if(C.body_parts_covered & EYES) - eyes_exposed = 0 - if(C.body_parts_covered & UPPER_TORSO) - torso_exposed = 0 - if(C.body_parts_covered & ARMS) - arms_exposed = 0 - if(C.body_parts_covered & HANDS) - hands_exposed = 0 - if(C.body_parts_covered & LEGS) - legs_exposed = 0 - if(C.body_parts_covered & FEET) - feet_exposed = 0 - - flavor_text = "" - for (var/T in flavor_texts) - if(flavor_texts[T] && flavor_texts[T] != "") - if((T == "general") || (T == "head" && head_exposed) || (T == "face" && face_exposed) || (T == "eyes" && eyes_exposed) || (T == "torso" && torso_exposed) || (T == "arms" && arms_exposed) || (T == "hands" && hands_exposed) || (T == "legs" && legs_exposed) || (T == "feet" && feet_exposed)) - flavor_text += flavor_texts[T] - flavor_text += "\n\n" - if(!shrink) - return flavor_text - else - return ..() - -/mob/living/carbon/human/getDNA() - if(species.flags & NO_SCAN) - return null - if(isSynthetic()) - return - ..() - -/mob/living/carbon/human/setDNA() - if(species.flags & NO_SCAN) - return - if(isSynthetic()) - return - ..() - -/mob/living/carbon/human/has_brain() - if(internal_organs_by_name[O_BRAIN]) - var/obj/item/organ/brain = internal_organs_by_name[O_BRAIN] - if(brain && istype(brain)) - return 1 - return 0 - -/mob/living/carbon/human/has_eyes() - if(internal_organs_by_name[O_EYES]) - var/obj/item/organ/eyes = internal_organs_by_name[O_EYES] - if(eyes && istype(eyes) && !(eyes.status & ORGAN_CUT_AWAY)) - return 1 - return 0 - -/mob/living/carbon/human/slip(var/slipped_on, stun_duration=8) - var/list/equipment = list(src.w_uniform,src.wear_suit,src.shoes) - var/footcoverage_check = FALSE - for(var/obj/item/clothing/C in equipment) - if(C.body_parts_covered & FEET) - footcoverage_check = TRUE - break - if((species.flags & NO_SLIP && !footcoverage_check) || (shoes && (shoes.item_flags & NOSLIP))) //Footwear negates a species' natural traction. - return 0 - if(..(slipped_on,stun_duration)) - return 1 - -/mob/living/carbon/human/proc/relocate() - set category = "Object" - set name = "Relocate Joint" - set desc = "Pop a joint back into place. Extremely painful." - set src in view(1) - - if(!isliving(usr) || !usr.checkClickCooldown()) - return - - usr.setClickCooldown(20) - - if(usr.stat > 0) - to_chat(usr, "You are unconcious and cannot do that!") - return - - if(usr.restrained()) - to_chat(usr, "You are restrained and cannot do that!") - return - - var/mob/S = src - var/mob/U = usr - var/self = null - if(S == U) - self = 1 // Removing object from yourself. - - var/list/limbs = list() - for(var/limb in organs_by_name) - var/obj/item/organ/external/current_limb = organs_by_name[limb] - if(current_limb && current_limb.dislocated > 0 && !current_limb.is_parent_dislocated()) //if the parent is also dislocated you will have to relocate that first - limbs |= current_limb - var/obj/item/organ/external/current_limb = tgui_input_list(usr, "Which joint do you wish to relocate?", "Joint Choice", limbs) - - if(!current_limb) - return - - if(self) - to_chat(src, "You brace yourself to relocate your [current_limb.joint]...") - else - to_chat(U, "You begin to relocate [S]'s [current_limb.joint]...") - - if(!do_after(U, 30)) - return - if(!current_limb || !S || !U) - return - - if(self) - to_chat(src, "You pop your [current_limb.joint] back in!") - else - to_chat(U, "You pop [S]'s [current_limb.joint] back in!") - to_chat(S, "[U] pops your [current_limb.joint] back in!") - current_limb.relocate() - -/mob/living/carbon/human/drop_from_inventory(var/obj/item/W, var/atom/Target = null) - if(W in organs) - return 0 - return ..() - -/mob/living/carbon/human/reset_view(atom/A, update_hud = 1) - ..() - if(update_hud) - handle_regular_hud_updates() - -/mob/living/carbon/human/Check_Shoegrip() - if(shoes && (shoes.item_flags & NOSLIP) && istype(shoes, /obj/item/clothing/shoes/magboots)) //magboots + dense_object = no floating - return 1 - if(flying) //VOREStation Edit. Checks to see if they have wings and are flying. - return 1 //VOREStation Edit. - return 0 - -//Puts the item into our active hand if possible. returns 1 on success. -/mob/living/carbon/human/put_in_active_hand(var/obj/item/W) - return (hand ? put_in_l_hand(W) : put_in_r_hand(W)) - -//Puts the item into our inactive hand if possible. returns 1 on success. -/mob/living/carbon/human/put_in_inactive_hand(var/obj/item/W) - return (hand ? put_in_r_hand(W) : put_in_l_hand(W)) - -/mob/living/carbon/human/put_in_hands(var/obj/item/W) - if(!W) - return 0 - if(put_in_active_hand(W)) - update_inv_l_hand() - update_inv_r_hand() - return 1 - else if(put_in_inactive_hand(W)) - update_inv_l_hand() - update_inv_r_hand() - return 1 - else - return ..() - -/mob/living/carbon/human/put_in_l_hand(var/obj/item/W) - if(!..() || l_hand) - return 0 - W.forceMove(src) - l_hand = W - W.equipped(src,slot_l_hand) - W.add_fingerprint(src) - update_inv_l_hand() - return 1 - -/mob/living/carbon/human/put_in_r_hand(var/obj/item/W) - if(!..() || r_hand) - return 0 - W.forceMove(src) - r_hand = W - W.equipped(src,slot_r_hand) - W.add_fingerprint(src) - update_inv_r_hand() - return 1 - -/mob/living/carbon/human/can_stand_overridden() - if(wearing_rig && wearing_rig.ai_can_move_suit(check_for_ai = 1)) - // Actually missing a leg will screw you up. Everything else can be compensated for. - for(var/limbcheck in list("l_leg","r_leg")) - var/obj/item/organ/affecting = get_organ(limbcheck) - if(!affecting) - return 0 - return 1 - return 0 - -/mob/living/carbon/human/verb/toggle_underwear() - set name = "Toggle Underwear" - set desc = "Shows/hides selected parts of your underwear." - set category = "Object" - - if(stat) return - var/datum/category_group/underwear/UWC = tgui_input_list(usr, "Choose underwear:", "Show/hide underwear", global_underwear.categories) - if(!UWC) return - var/datum/category_item/underwear/UWI = all_underwear[UWC.name] - if(!UWI || UWI.name == "None") - to_chat(src, "You do not have [UWC.gender==PLURAL ? "[UWC.display_name]" : "a [UWC.display_name]"].") - return - hide_underwear[UWC.name] = !hide_underwear[UWC.name] - update_underwear(1) - to_chat(src, "You [hide_underwear[UWC.name] ? "take off" : "put on"] your [UWC.display_name].") - return - -/mob/living/carbon/human/verb/pull_punches() - set name = "Pull Punches" - set desc = "Try not to hurt them." - set category = "IC" - - if(stat) return - pulling_punches = !pulling_punches - to_chat(src, "You are now [pulling_punches ? "pulling your punches" : "not pulling your punches"].") - return - -/mob/living/carbon/human/should_have_organ(var/organ_check) - - var/obj/item/organ/external/affecting - if(organ_check in list(O_HEART, O_LUNGS)) - affecting = organs_by_name[BP_TORSO] - else if(organ_check in list(O_LIVER, O_KIDNEYS)) - affecting = organs_by_name[BP_GROIN] - - if(affecting && (affecting.robotic >= ORGAN_ROBOT)) - return 0 - return (species && species.has_organ[organ_check]) - -/mob/living/carbon/human/can_feel_pain(var/obj/item/organ/check_organ) - if(isSynthetic()) - return 0 - for(var/datum/modifier/M in modifiers) - if(M.pain_immunity == TRUE) - return 0 - if(check_organ) - if(!istype(check_organ)) - return 0 - return check_organ.organ_can_feel_pain() - return !(species.flags & NO_PAIN) - -/mob/living/carbon/human/is_sentient() - if(get_FBP_type() == FBP_DRONE) - return FALSE - return ..() - -/mob/living/carbon/human/is_muzzled() - return (wear_mask && (istype(wear_mask, /obj/item/clothing/mask/muzzle) || istype(src.wear_mask, /obj/item/weapon/grenade))) - -/mob/living/carbon/human/get_fire_icon_state() - return species.fire_icon_state - -// Called by job_controller. Makes drones start with a permit, might be useful for other people later too. -/mob/living/carbon/human/equip_post_job() - var/braintype = get_FBP_type() - if(braintype == FBP_DRONE) - var/turf/T = get_turf(src) - var/obj/item/clothing/accessory/permit/drone/permit = new(T) - permit.set_name(real_name) - equip_to_appropriate_slot(permit) // If for some reason it can't find room, it'll still be on the floor. - -/mob/living/carbon/human/proc/update_icon_special() //For things such as teshari hiding and whatnot. - if(status_flags & HIDING) // Hiding? Carry on. - if(stat == DEAD || paralysis || weakened || stunned || restrained() || buckled || LAZYLEN(grabbed_by) || has_buckled_mobs()) //stunned/knocked down by something that isn't the rest verb? Note: This was tried with INCAPACITATION_STUNNED, but that refused to work. //VORE EDIT: Check for has_buckled_mobs() (taur riding) - reveal(null) - else - layer = HIDING_LAYER - -/mob/living/carbon/human/examine_icon() - var/icon/I = get_cached_examine_icon(src) - if(!I) - I = getFlatIcon(src, defdir = SOUTH, no_anim = TRUE) - set_cached_examine_icon(src, I, 50 SECONDS) - return I - -/mob/living/carbon/human/proc/get_display_species() - //Shows species in tooltip - if(src.custom_species) //VOREStation Add - return custom_species //VOREStation Add - //Beepboops get special text if obviously beepboop - if(looksSynthetic()) - if(gender == MALE) - return "Android" - else if(gender == FEMALE) - return "Gynoid" - else - return "Synthetic" - //Else species name - if(species) - return species.get_examine_name() - //Else CRITICAL FAILURE! - return "" - -/mob/living/carbon/human/get_nametag_name(mob/user) - return name //Could do fancy stuff here? - -/mob/living/carbon/human/get_nametag_desc(mob/user) - var/msg = "" - if(hasHUD(user,"security")) - //Try to find their name - var/perpname - var/obj/item/weapon/card/id/I = GetIdCard() - if(I) - perpname = I.registered_name - else - perpname = name - //Try to find their record - var/criminal = "None" - if(perpname) - var/datum/data/record/G = find_general_record("name", perpname) - if(G) - var/datum/data/record/S = find_security_record("id", G.fields["id"]) - if(S) - criminal = S.fields["criminal"] - //If it's interesting, append - if(criminal != "None") - msg += "([criminal]) " - - if(hasHUD(user,"medical")) - msg += "(Health: [round((health/getMaxHealth())*100)]%) " - - msg += get_display_species() - return msg - -/mob/living/carbon/human/reduce_cuff_time() - if(istype(gloves, /obj/item/clothing/gloves/gauntlets/rig)) - return 2 - return ..() - -/mob/living/carbon/human/pull_damage() - if(((health - halloss) <= config.health_threshold_softcrit)) - for(var/name in organs_by_name) - var/obj/item/organ/external/e = organs_by_name[name] - if(!e) - continue - if((e.status & ORGAN_BROKEN && (!e.splinted || (e.splinted in e.contents && prob(30))) || e.status & ORGAN_BLEEDING) && (getBruteLoss() + getFireLoss() >= 100)) - return 1 - else - return ..() - -// Drag damage is handled in a parent -/mob/living/carbon/human/dragged(var/mob/living/dragger, var/oldloc) - var/area/A = get_area(src) - if(lying && !buckled && A.has_gravity() && prob(getBruteLoss() * 200 / maxHealth)) - var/bloodtrail = 1 - if(species?.flags & NO_BLOOD) - bloodtrail = 0 - else - var/blood_volume = vessel.get_reagent_amount("blood") - if(blood_volume < species?.blood_volume*species?.blood_level_fatal) - bloodtrail = 0 //Most of it's gone already, just leave it be - else - vessel.remove_reagent("blood", 1) - if(bloodtrail) - if(istype(loc, /turf/simulated)) - var/turf/T = loc - T.add_blood(src) - . = ..() - -// Tries to turn off item-based things that let you see through walls, like mesons. -// Certain stuff like genetic xray vision is allowed to be kept on. -/mob/living/carbon/human/disable_spoiler_vision() - // Glasses. - if(istype(glasses, /obj/item/clothing/glasses)) - var/obj/item/clothing/glasses/goggles = glasses - if(goggles.active && (goggles.vision_flags & (SEE_TURFS|SEE_OBJS))) - goggles.toggle_active(src) - to_chat(src, span("warning", "Your [goggles.name] have suddenly turned off!")) - - // RIGs. - var/obj/item/weapon/rig/rig = get_rig() - if(istype(rig) && rig.visor?.active && rig.visor.vision?.glasses) - var/obj/item/clothing/glasses/rig_goggles = rig.visor.vision.glasses - if(rig_goggles.vision_flags & (SEE_TURFS|SEE_OBJS)) - rig.visor.deactivate() - to_chat(src, span("warning", "\The [rig]'s visor has shuddenly deactivated!")) - - ..() - -/mob/living/carbon/human/get_mob_riding_slots() - return list(back, head, wear_suit) +/mob/living/carbon/human + name = "unknown" + real_name = "unknown" + voice_name = "unknown" + icon = 'icons/effects/effects.dmi' //We have an ultra-complex update icons that overlays everything, don't load some stupid random male human + icon_state = "nothing" + + has_huds = TRUE //We do have HUDs (like health, wanted, status, not inventory slots) + + var/embedded_flag //To check if we've need to roll for damage on movement while an item is imbedded in us. + var/obj/item/weapon/rig/wearing_rig // This is very not good, but it's much much better than calling get_rig() every update_canmove() call. + var/last_push_time //For human_attackhand.dm, keeps track of the last use of disarm + + var/spitting = 0 //Spitting and spitting related things. Any human based ranged attacks, be it innate or added abilities. + var/spit_projectile = null //Projectile type. + var/spit_name = null //String + var/last_spit = 0 //Timestamp. + + var/can_defib = 1 //Horrible damage (like beheadings) will prevent defibbing organics. + var/active_regen = FALSE //Used for the regenerate proc in human_powers.dm + var/active_regen_delay = 300 + +/mob/living/carbon/human/Initialize(mapload, var/new_species = null) + if(!dna) + dna = new /datum/dna(null) + // Species name is handled by set_species() + + if(!species) + if(new_species) + set_species(new_species,1) + else + set_species() + + if(species) + real_name = species.get_random_name(gender) + name = real_name + if(mind) + mind.name = real_name + + nutrition = rand(200,400) + + human_mob_list |= src + + . = ..() + + hide_underwear.Cut() + for(var/category in global_underwear.categories_by_name) + hide_underwear[category] = FALSE + + if(dna) + dna.ready_dna(src) + dna.real_name = real_name + sync_organ_dna() + + //verbs |= /mob/living/proc/toggle_selfsurgery //VOREStation Removal + AddComponent(/datum/component/personal_crafting) + +/mob/living/carbon/human/Destroy() + human_mob_list -= src + for(var/organ in organs) + qdel(organ) + QDEL_NULL(nif) //VOREStation Add + worn_clothing.Cut() + return ..() + +/mob/living/carbon/human/Stat() + ..() + if(statpanel("Status")) + stat("Intent:", "[a_intent]") + stat("Move Mode:", "[m_intent]") + if(emergency_shuttle) + var/eta_status = emergency_shuttle.get_status_panel_eta() + if(eta_status) + stat(null, eta_status) + + if (internal) + if (!internal.air_contents) + qdel(internal) + else + stat("Internal Atmosphere Info", internal.name) + stat("Tank Pressure", internal.air_contents.return_pressure()) + stat("Distribution Pressure", internal.distribute_pressure) + + var/obj/item/organ/internal/xenos/plasmavessel/P = internal_organs_by_name[O_PLASMA] //Xenomorphs. Mech. + if(P) + stat(null, "Phoron Stored: [P.stored_plasma]/[P.max_plasma]") + + + if(back && istype(back,/obj/item/weapon/rig)) + var/obj/item/weapon/rig/suit = back + var/cell_status = "ERROR" + if(suit.cell) cell_status = "[suit.cell.charge]/[suit.cell.maxcharge]" + stat(null, "Suit charge: [cell_status]") + + if(mind) + if(mind.changeling) + stat("Chemical Storage", mind.changeling.chem_charges) + stat("Genetic Damage Time", mind.changeling.geneticdamage) + stat("Re-Adaptations", "[mind.changeling.readapts]/[mind.changeling.max_readapts]") + if(species) + species.Stat(src) + +/mob/living/carbon/human/ex_act(severity) + if(!blinded) + flash_eyes() + + for(var/datum/modifier/M in modifiers) + if(!isnull(M.explosion_modifier)) + severity = CLAMP(severity + M.explosion_modifier, 1, 4) + + severity = round(severity) + + if(severity > 3) + return + + var/shielded = 0 + var/b_loss = null + var/f_loss = null + switch (severity) + if (1.0) + b_loss += 500 + if (!prob(getarmor(null, "bomb"))) + gib() + return + else + var/atom/target = get_edge_target_turf(src, get_dir(src, get_step_away(src, src))) + throw_at(target, 200, 4) + //return +// var/atom/target = get_edge_target_turf(user, get_dir(src, get_step_away(user, src))) + //user.throw_at(target, 200, 4) + + if (2.0) + if (!shielded) + b_loss += 60 + + f_loss += 60 + + if (prob(getarmor(null, "bomb"))) + b_loss = b_loss/1.5 + f_loss = f_loss/1.5 + + if (!get_ear_protection() >= 2) + ear_damage += 30 + ear_deaf += 120 + if (prob(70) && !shielded) + Paralyse(10) + + if(3.0) + b_loss += 30 + if (prob(getarmor(null, "bomb"))) + b_loss = b_loss/2 + if (!get_ear_protection() >= 2) + ear_damage += 15 + ear_deaf += 60 + if (prob(50) && !shielded) + Paralyse(10) + + var/blastsoak = getsoak(null, "bomb") + + b_loss = max(1, b_loss - blastsoak) + f_loss = max(1, f_loss - blastsoak) + + var/update = 0 + + // focus most of the blast on one organ + var/obj/item/organ/external/take_blast = pick(organs) + update |= take_blast.take_damage(b_loss * 0.9, f_loss * 0.9, used_weapon = "Explosive blast") + + // distribute the remaining 10% on all limbs equally + b_loss *= 0.1 + f_loss *= 0.1 + + var/weapon_message = "Explosive Blast" + + for(var/obj/item/organ/external/temp in organs) + switch(temp.organ_tag) + if(BP_HEAD) + update |= temp.take_damage(b_loss * 0.2, f_loss * 0.2, used_weapon = weapon_message) + if(BP_TORSO) + update |= temp.take_damage(b_loss * 0.4, f_loss * 0.4, used_weapon = weapon_message) + else + update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message) + if(update) UpdateDamageIcon() + +/mob/living/carbon/human/proc/implant_loyalty(override = FALSE) // Won't override by default. + if(!config.use_loyalty_implants && !override) return // Nuh-uh. + + var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(src) + if(L.handle_implant(src, BP_HEAD)) + L.post_implant(src) + +/mob/living/carbon/human/proc/is_loyalty_implanted() + for(var/L in src.contents) + if(istype(L, /obj/item/weapon/implant/loyalty)) + for(var/obj/item/organ/external/O in src.organs) + if(L in O.implants) + return 1 + return 0 + +/mob/living/carbon/human/restrained() + if (handcuffed) + return 1 + if (istype(wear_suit, /obj/item/clothing/suit/straight_jacket)) + return 1 + return 0 + +/mob/living/carbon/human/var/co2overloadtime = null +/mob/living/carbon/human/var/temperature_resistance = T0C+75 + +// called when something steps onto a human +// this handles mobs on fire - mulebot and vehicle code has been relocated to /mob/living/Crossed() +/mob/living/carbon/human/Crossed(var/atom/movable/AM) + if(AM.is_incorporeal()) + return + + spread_fire(AM) + + ..() // call parent because we moved behavior to parent + +// Get rank from ID, ID inside PDA, PDA, ID in wallet, etc. +/mob/living/carbon/human/proc/get_authentification_rank(var/if_no_id = "No id", var/if_no_job = "No job") + var/obj/item/device/pda/pda = wear_id + if (istype(pda)) + if (pda.id) + return pda.id.rank ? pda.id.rank : if_no_job + else + return pda.ownrank ? pda.ownrank : if_no_job + else + var/obj/item/weapon/card/id/id = get_idcard() + if(id) + return id.rank ? id.rank : if_no_job + else + return if_no_id + +//gets assignment from ID or ID inside PDA or PDA itself +//Useful when player do something with computers +/mob/living/carbon/human/proc/get_assignment(var/if_no_id = "No id", var/if_no_job = "No job") + var/obj/item/device/pda/pda = wear_id + if (istype(pda)) + if (pda.id) + return pda.id.assignment + else + return pda.ownjob ? pda.ownjob : if_no_job + else + var/obj/item/weapon/card/id/id = get_idcard() + if(id) + return id.assignment ? id.assignment : if_no_job + else + return if_no_id + +//gets name from ID or ID inside PDA or PDA itself +//Useful when player do something with computers +/mob/living/carbon/human/proc/get_authentification_name(var/if_no_id = "Unknown") + var/obj/item/device/pda/pda = wear_id + if (istype(pda)) + if (pda.id) + return pda.id.registered_name + else + return pda.owner ? pda.owner : if_no_id + else + var/obj/item/weapon/card/id/id = get_idcard() + if(id) + return id.registered_name + else + return if_no_id + +//repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a seperate proc as it'll be useful elsewhere +/mob/living/carbon/human/proc/get_visible_name() + if( wear_mask && (wear_mask.flags_inv&HIDEFACE) ) //Wearing a mask which hides our face, use id-name if possible + return get_id_name("Unknown") + if( head && (head.flags_inv&HIDEFACE) ) + return get_id_name("Unknown") //Likewise for hats + var/face_name = get_face_name() + var/id_name = get_id_name("") + if((face_name == "Unknown") && id_name && (id_name != face_name)) + return "[face_name] (as [id_name])" + return face_name + +//Returns "Unknown" if facially disfigured and real_name if not. Useful for setting name when polyacided or when updating a human's name variable +/mob/living/carbon/human/proc/get_face_name() + var/obj/item/organ/external/head = get_organ(BP_HEAD) + if(!head || head.disfigured || head.is_stump() || !real_name || (HUSK in mutations) ) //disfigured. use id-name if possible + return "Unknown" + return real_name + +//gets name from ID or PDA itself, ID inside PDA doesn't matter +//Useful when player is being seen by other mobs +/mob/living/carbon/human/proc/get_id_name(var/if_no_id = "Unknown") + . = if_no_id + if(istype(wear_id,/obj/item/device/pda)) + var/obj/item/device/pda/P = wear_id + return P.owner ? P.owner : if_no_id + if(wear_id) + var/obj/item/weapon/card/id/I = wear_id.GetID() + if(I) + return I.registered_name + return + +//gets ID card object from special clothes slot or null. +/mob/living/carbon/human/proc/get_idcard() + if(wear_id) + return wear_id.GetID() + +//Removed the horrible safety parameter. It was only being used by ninja code anyways. +//Now checks siemens_coefficient of the affected area by default +/mob/living/carbon/human/electrocute_act(var/shock_damage, var/obj/source, var/base_siemens_coeff = 1.0, var/def_zone = null) + + if(status_flags & GODMODE) return 0 //godmode + + if (!def_zone) + def_zone = pick("l_hand", "r_hand") + + if(species.siemens_coefficient == -1) + if(stored_shock_by_ref["\ref[src]"]) + stored_shock_by_ref["\ref[src]"] += shock_damage + else + stored_shock_by_ref["\ref[src]"] = shock_damage + return + + var/obj/item/organ/external/affected_organ = get_organ(check_zone(def_zone)) + var/siemens_coeff = base_siemens_coeff * get_siemens_coefficient_organ(affected_organ) + if(fire_stacks < 0) // Water makes you more conductive. + siemens_coeff *= 1.5 + + return ..(shock_damage, source, siemens_coeff, def_zone) + + +/mob/living/carbon/human/Topic(href, href_list) + if (href_list["mach_close"]) // This is horrible. + var/t1 = text("window=[]", href_list["mach_close"]) + unset_machine() + src << browse(null, t1) + + if(href_list["item"]) + log_runtime(EXCEPTION("Warning: human/Topic was called with item [href_list["item"]], but the item Topic is deprecated!")) + // handle_strip(href_list["item"],usr) + + if (href_list["criminal"]) + if(hasHUD(usr,"security")) + + var/modified = 0 + var/perpname = "wot" + var/obj/item/weapon/card/id/I = GetIdCard() + if(I) + perpname = I.registered_name + else + perpname = name + + if(perpname) + for (var/datum/data/record/E in data_core.general) + if (E.fields["name"] == perpname) + for (var/datum/data/record/R in data_core.security) + if (R.fields["id"] == E.fields["id"]) + + var/setcriminal = tgui_input_list(usr, "Specify a new criminal status for this person.", "Security HUD", list("None", "*Arrest*", "Incarcerated", "Parolled", "Released", "Cancel")) + + if(hasHUD(usr, "security")) + if(setcriminal != "Cancel") + R.fields["criminal"] = setcriminal + modified = 1 + + spawn() + BITSET(hud_updateflag, WANTED_HUD) + if(istype(usr,/mob/living/carbon/human)) + var/mob/living/carbon/human/U = usr + U.handle_hud_list() + if(istype(usr,/mob/living/silicon/robot)) + var/mob/living/silicon/robot/U = usr + U.handle_regular_hud_updates() + + if(!modified) + to_chat(usr, "Unable to locate a data core entry for this person.") + + if (href_list["secrecord"]) + if(hasHUD(usr,"security")) + var/perpname = "wot" + var/read = 0 + + var/obj/item/weapon/card/id/I = GetIdCard() + if(I) + perpname = I.registered_name + else + perpname = name + for (var/datum/data/record/E in data_core.general) + if (E.fields["name"] == perpname) + for (var/datum/data/record/R in data_core.security) + if (R.fields["id"] == E.fields["id"]) + if(hasHUD(usr,"security")) + to_chat(usr, "Name: [R.fields["name"]] Criminal Status: [R.fields["criminal"]]") + to_chat(usr, "Minor Crimes: [R.fields["mi_crim"]]") + to_chat(usr, "Details: [R.fields["mi_crim_d"]]") + to_chat(usr, "Major Crimes: [R.fields["ma_crim"]]") + to_chat(usr, "Details: [R.fields["ma_crim_d"]]") + to_chat(usr, "Notes: [R.fields["notes"]]") + to_chat(usr, "\[View Comment Log\]") + read = 1 + + if(!read) + to_chat(usr, "Unable to locate a data core entry for this person.") + + if (href_list["secrecordComment"]) + if(hasHUD(usr,"security")) + var/perpname = "wot" + var/read = 0 + + var/obj/item/weapon/card/id/I = GetIdCard() + if(I) + perpname = I.registered_name + else + perpname = name + for (var/datum/data/record/E in data_core.general) + if (E.fields["name"] == perpname) + for (var/datum/data/record/R in data_core.security) + if (R.fields["id"] == E.fields["id"]) + if(hasHUD(usr,"security")) + read = 1 + var/counter = 1 + while(R.fields[text("com_[]", counter)]) + to_chat(usr, "[R.fields[text("com_[]", counter)]]") + counter++ + if (counter == 1) + to_chat(usr, "No comment found") + to_chat(usr, "\[Add comment\]") + + if(!read) + to_chat(usr, "Unable to locate a data core entry for this person.") + + if (href_list["secrecordadd"]) + if(hasHUD(usr,"security")) + var/perpname = "wot" + var/obj/item/weapon/card/id/I = GetIdCard() + if(I) + perpname = I.registered_name + else + perpname = name + for (var/datum/data/record/E in data_core.general) + if (E.fields["name"] == perpname) + for (var/datum/data/record/R in data_core.security) + if (R.fields["id"] == E.fields["id"]) + if(hasHUD(usr,"security")) + var/t1 = sanitize(tgui_input_text(usr, "Add Comment:", "Sec. records", null, null, multiline = TRUE, prevent_enter = TRUE)) + if ( !(t1) || usr.stat || usr.restrained() || !(hasHUD(usr,"security")) ) + return + var/counter = 1 + while(R.fields[text("com_[]", counter)]) + counter++ + if(istype(usr,/mob/living/carbon/human)) + var/mob/living/carbon/human/U = usr + R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") + if(istype(usr,/mob/living/silicon/robot)) + var/mob/living/silicon/robot/U = usr + R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") + + if (href_list["medical"]) + if(hasHUD(usr,"medical")) + var/perpname = "wot" + var/modified = 0 + + var/obj/item/weapon/card/id/I = GetIdCard() + if(I) + perpname = I.registered_name + else + perpname = name + + for (var/datum/data/record/E in data_core.general) + if (E.fields["name"] == perpname) + for (var/datum/data/record/R in data_core.general) + if (R.fields["id"] == E.fields["id"]) + + var/setmedical = tgui_input_list(usr, "Specify a new medical status for this person.", "Medical HUD", list("*SSD*", "*Deceased*", "Physically Unfit", "Active", "Disabled", "Cancel")) + + if(hasHUD(usr,"medical")) + if(setmedical != "Cancel") + R.fields["p_stat"] = setmedical + modified = 1 + if(PDA_Manifest.len) + PDA_Manifest.Cut() + + spawn() + if(istype(usr,/mob/living/carbon/human)) + var/mob/living/carbon/human/U = usr + U.handle_regular_hud_updates() + if(istype(usr,/mob/living/silicon/robot)) + var/mob/living/silicon/robot/U = usr + U.handle_regular_hud_updates() + + if(!modified) + to_chat(usr, "Unable to locate a data core entry for this person.") + + if (href_list["medrecord"]) + if(hasHUD(usr,"medical")) + var/perpname = "wot" + var/read = 0 + + var/obj/item/weapon/card/id/I = GetIdCard() + if(I) + perpname = I.registered_name + else + perpname = name + for (var/datum/data/record/E in data_core.general) + if (E.fields["name"] == perpname) + for (var/datum/data/record/R in data_core.medical) + if (R.fields["id"] == E.fields["id"]) + if(hasHUD(usr,"medical")) + to_chat(usr, "Name: [R.fields["name"]] Blood Type: [R.fields["b_type"]]") + to_chat(usr, "DNA: [R.fields["b_dna"]]") + to_chat(usr, "Minor Disabilities: [R.fields["mi_dis"]]") + to_chat(usr, "Details: [R.fields["mi_dis_d"]]") + to_chat(usr, "Major Disabilities: [R.fields["ma_dis"]]") + to_chat(usr, "Details: [R.fields["ma_dis_d"]]") + to_chat(usr, "Notes: [R.fields["notes"]]") + to_chat(usr, "\[View Comment Log\]") + read = 1 + + if(!read) + to_chat(usr, "Unable to locate a data core entry for this person.") + + if (href_list["medrecordComment"]) + if(hasHUD(usr,"medical")) + var/perpname = "wot" + var/read = 0 + + var/obj/item/weapon/card/id/I = GetIdCard() + if(I) + perpname = I.registered_name + else + perpname = name + for (var/datum/data/record/E in data_core.general) + if (E.fields["name"] == perpname) + for (var/datum/data/record/R in data_core.medical) + if (R.fields["id"] == E.fields["id"]) + if(hasHUD(usr,"medical")) + read = 1 + var/counter = 1 + while(R.fields[text("com_[]", counter)]) + to_chat(usr, "[R.fields[text("com_[]", counter)]]") + counter++ + if (counter == 1) + to_chat(usr, "No comment found") + to_chat(usr, "\[Add comment\]") + + if(!read) + to_chat(usr, "Unable to locate a data core entry for this person.") + + if (href_list["medrecordadd"]) + if(hasHUD(usr,"medical")) + var/perpname = "wot" + var/obj/item/weapon/card/id/I = GetIdCard() + if(I) + perpname = I.registered_name + else + perpname = name + for (var/datum/data/record/E in data_core.general) + if (E.fields["name"] == perpname) + for (var/datum/data/record/R in data_core.medical) + if (R.fields["id"] == E.fields["id"]) + if(hasHUD(usr,"medical")) + var/t1 = sanitize(tgui_input_text(usr, "Add Comment:", "Med. records", null, null, multiline = TRUE, prevent_enter = TRUE)) + if ( !(t1) || usr.stat || usr.restrained() || !(hasHUD(usr,"medical")) ) + return + var/counter = 1 + while(R.fields[text("com_[]", counter)]) + counter++ + if(istype(usr,/mob/living/carbon/human)) + var/mob/living/carbon/human/U = usr + R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") + if(istype(usr,/mob/living/silicon/robot)) + var/mob/living/silicon/robot/U = usr + R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") + + if (href_list["lookitem"]) + var/obj/item/I = locate(href_list["lookitem"]) + src.examinate(I) + + if (href_list["lookmob"]) + var/mob/M = locate(href_list["lookmob"]) + src.examinate(M) + + if (href_list["clickitem"]) + var/obj/item/I = locate(href_list["clickitem"]) + if(src.client) + src.ClickOn(I) + + if (href_list["flavor_change"]) + switch(href_list["flavor_change"]) + if("done") + src << browse(null, "window=flavor_changes") + return + if("general") + var/msg = sanitize(tgui_input_text(usr,"Update the general description of your character. This will be shown regardless of clothing.","Flavor Text",html_decode(flavor_texts[href_list["flavor_change"]]), multiline = TRUE, prevent_enter = TRUE), extra = 0) //VOREStation Edit: separating out OOC notes + flavor_texts[href_list["flavor_change"]] = msg + return + else + var/msg = sanitize(tgui_input_text(usr,"Update the flavor text for your [href_list["flavor_change"]].","Flavor Text",html_decode(flavor_texts[href_list["flavor_change"]]), multiline = TRUE, prevent_enter = TRUE), extra = 0) + flavor_texts[href_list["flavor_change"]] = msg + set_flavor() + return + ..() + return + +///eyecheck() +///Returns a number between -1 to 2 +/mob/living/carbon/human/eyecheck() + + var/obj/item/organ/internal/eyes/I + + if(internal_organs_by_name[O_EYES]) // Eyes are fucked, not a 'weak point'. + I = internal_organs_by_name[O_EYES] + if(I.is_broken()) + return FLASH_PROTECTION_MAJOR + else if(!species.dispersed_eyes) // They can't be flashed if they don't have eyes, or widespread sensing surfaces. + return FLASH_PROTECTION_MAJOR + + var/number = get_equipment_flash_protection() + if(I) + number = I.get_total_protection(number) + I.additional_flash_effects(number) + return number + +/mob/living/carbon/human/flash_eyes(var/intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, visual = FALSE, type = /obj/screen/fullscreen/flash) + if(internal_organs_by_name[O_EYES]) // Eyes are fucked, not a 'weak point'. + var/obj/item/organ/internal/eyes/I = internal_organs_by_name[O_EYES] + I.additional_flash_effects(intensity) + return ..() + +#define add_clothing_protection(A) \ + var/obj/item/clothing/C = A; \ + flash_protection += C.flash_protection; \ + +/mob/living/carbon/human/proc/get_equipment_flash_protection() + var/flash_protection = 0 + + if(istype(src.head, /obj/item/clothing/head)) + add_clothing_protection(head) + if(istype(src.glasses, /obj/item/clothing/glasses)) + add_clothing_protection(glasses) + if(istype(src.wear_mask, /obj/item/clothing/mask)) + add_clothing_protection(wear_mask) + + return flash_protection + +#undef add_clothing_protection + +//Used by various things that knock people out by applying blunt trauma to the head. +//Checks that the species has a "head" (brain containing organ) and that hit_zone refers to it. +/mob/living/carbon/human/proc/headcheck(var/target_zone, var/brain_tag = "brain") + + var/obj/item/organ/affecting = internal_organs_by_name[brain_tag] + + target_zone = check_zone(target_zone) + if(!affecting || affecting.parent_organ != target_zone) + return 0 + + //if the parent organ is significantly larger than the brain organ, then hitting it is not guaranteed + var/obj/item/organ/parent = get_organ(target_zone) + if(!parent) + return 0 + + if(parent.w_class > affecting.w_class + 1) + return prob(100 / 2**(parent.w_class - affecting.w_class - 1)) + + return 1 + +/mob/living/carbon/human/IsAdvancedToolUser(var/silent) + // VOREstation start + if(feral) + to_chat(src, "Your primitive mind can't grasp the concept of that thing.") + return 0 + // VOREstation end + if(species.has_fine_manipulation) + return 1 + if(!silent) + to_chat(src, "You don't have the dexterity to use that!") + return 0 + +/mob/living/carbon/human/abiotic(var/full_body = 0) + if(full_body && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.l_ear || src.r_ear || src.gloves))) + return 1 + + if( (src.l_hand && !src.l_hand.abstract) || (src.r_hand && !src.r_hand.abstract) ) + return 1 + + return 0 + + +/mob/living/carbon/human/proc/check_dna() + dna.check_integrity(src) + return + +/mob/living/carbon/human/get_species() + if(!species) + set_species() + return species.name + +/mob/living/carbon/human/proc/play_xylophone() + if(!src.xylophone) + var/datum/gender/T = gender_datums[get_visible_gender()] + visible_message("\The [src] begins playing [T.his] ribcage like a xylophone. It's quite spooky.","You begin to play a spooky refrain on your ribcage.","You hear a spooky xylophone melody.") + var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg') + playsound(src, song, 50, 1, -1) + xylophone = 1 + spawn(1200) + xylophone=0 + return + +/mob/living/proc/check_has_mouth() + return 1 + +/mob/living/carbon/human/check_has_mouth() + // Todo, check stomach organ when implemented. + var/obj/item/organ/external/head/H = get_organ(BP_HEAD) + if(!H || !H.can_intake_reagents) + return 0 + return 1 + +/mob/living/carbon/human/proc/morph() + set name = "Morph" + set category = "Superpower" + + if(stat!=CONSCIOUS) + reset_view(0) + remoteview_target = null + return + + if(!(mMorph in mutations)) + src.verbs -= /mob/living/carbon/human/proc/morph + return + + var/new_facial = input(usr, "Please select facial hair color.", "Character Generation",rgb(r_facial,g_facial,b_facial)) as color + if(new_facial) + r_facial = hex2num(copytext(new_facial, 2, 4)) + g_facial = hex2num(copytext(new_facial, 4, 6)) + b_facial = hex2num(copytext(new_facial, 6, 8)) + + var/new_hair = input(usr, "Please select hair color.", "Character Generation",rgb(r_hair,g_hair,b_hair)) as color + if(new_facial) + r_hair = hex2num(copytext(new_hair, 2, 4)) + g_hair = hex2num(copytext(new_hair, 4, 6)) + b_hair = hex2num(copytext(new_hair, 6, 8)) + + var/new_eyes = input(usr, "Please select eye color.", "Character Generation",rgb(r_eyes,g_eyes,b_eyes)) as color + if(new_eyes) + r_eyes = hex2num(copytext(new_eyes, 2, 4)) + g_eyes = hex2num(copytext(new_eyes, 4, 6)) + b_eyes = hex2num(copytext(new_eyes, 6, 8)) + update_eyes() + + // hair + var/list/all_hairs = subtypesof(/datum/sprite_accessory/hair) + var/list/hairs = list() + + // loop through potential hairs + for(var/x in all_hairs) + var/datum/sprite_accessory/hair/H = new x // create new hair datum based on type x + hairs.Add(H.name) // add hair name to hairs + qdel(H) // delete the hair after it's all done + + var/new_style = tgui_input_list(usr, "Please select hair style", "Character Generation", hairs) + + // if new style selected (not cancel) + if (new_style) + h_style = new_style + + // facial hair + var/list/all_fhairs = subtypesof(/datum/sprite_accessory/facial_hair) + var/list/fhairs = list() + + for(var/x in all_fhairs) + var/datum/sprite_accessory/facial_hair/H = new x + fhairs.Add(H.name) + qdel(H) + + new_style = tgui_input_list(usr, "Please select facial style", "Character Generation", fhairs) + + if(new_style) + f_style = new_style + + var/new_gender = tgui_alert(usr, "Please select gender.", "Character Generation", list("Male", "Female", "Neutral")) + if (new_gender) + if(new_gender == "Male") + gender = MALE + else if(new_gender == "Female") + gender = FEMALE + else + gender = NEUTER + regenerate_icons() + check_dna() + var/datum/gender/T = gender_datums[get_visible_gender()] + visible_message("\The [src] morphs and changes [T.his] appearance!", "You change your appearance!", "Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!") + +/mob/living/carbon/human/proc/remotesay() + set name = "Project mind" + set category = "Superpower" + + if(stat!=CONSCIOUS) + reset_view(0) + remoteview_target = null + return + + if(!(mRemotetalk in src.mutations)) + src.verbs -= /mob/living/carbon/human/proc/remotesay + return + var/list/creatures = list() + for(var/mob/living/carbon/h in mob_list) + creatures += h + var/mob/target = tgui_input_list(usr, "Who do you want to project your mind to?", "Project Mind", creatures) + if (isnull(target)) + return + + var/say = sanitize(tgui_input_text(usr, "What do you wish to say")) + if(mRemotetalk in target.mutations) + target.show_message(" You hear [src.real_name]'s voice: [say]") + else + target.show_message(" You hear a voice that seems to echo around the room: [say]") + usr.show_message(" You project your mind into [target.real_name]: [say]") + log_say("(TPATH to [key_name(target)]) [say]",src) + for(var/mob/observer/dead/G in mob_list) + G.show_message("Telepathic message from [src] to [target]: [say]") + +/mob/living/carbon/human/proc/remoteobserve() + set name = "Remote View" + set category = "Superpower" + + if(stat!=CONSCIOUS) + remoteview_target = null + reset_view(0) + return + + if(!(mRemote in src.mutations)) + remoteview_target = null + reset_view(0) + src.verbs -= /mob/living/carbon/human/proc/remoteobserve + return + + if(client.eye != client.mob) + remoteview_target = null + reset_view(0) + return + + var/list/mob/creatures = list() + + for(var/mob/living/carbon/h in mob_list) + var/turf/temp_turf = get_turf(h) + if((temp_turf.z != 1 && temp_turf.z != 5) || h.stat!=CONSCIOUS) //Not on mining or the station. Or dead + continue + creatures += h + + var/mob/target = input ("Who do you want to project your mind to ?") as mob in creatures + + if (target) + remoteview_target = target + reset_view(target) + else + remoteview_target = null + reset_view(0) + +/mob/living/carbon/human/get_visible_gender(mob/user, force) + switch(force) + if(VISIBLE_GENDER_FORCE_PLURAL) + return PLURAL + if(VISIBLE_GENDER_FORCE_IDENTIFYING) + return get_gender() + if(VISIBLE_GENDER_FORCE_BIOLOGICAL) + return gender + else + if((wear_mask || (head?.flags_inv & HIDEMASK)) && (wear_suit?.flags_inv & HIDEJUMPSUIT)) + return PLURAL + if(species?.ambiguous_genders && user) + if(ishuman(user)) + var/mob/living/carbon/human/human = user + if(!istype(human.species, species)) + return PLURAL + else if(!isobserver(user) && !issilicon(user)) + return PLURAL + return get_gender() + +/mob/living/carbon/human/proc/increase_germ_level(n) + if(gloves) + gloves.germ_level += n + else + germ_level += n + +/mob/living/carbon/human/revive() + + if(should_have_organ(O_HEART)) + vessel.add_reagent("blood",species.blood_volume-vessel.total_volume) + fixblood() + + species.create_organs(src) // Reset our organs/limbs. + restore_all_organs() // Reapply robotics/amputated status from preferences. + + if(!client || !key) //Don't boot out anyone already in the mob. + for (var/obj/item/organ/internal/brain/H in GLOB.all_brain_organs) + if(H.brainmob) + if(H.brainmob.real_name == src.real_name) + if(H.brainmob.mind) + H.brainmob.mind.transfer_to(src) + qdel(H) + + // Vorestation Addition - reapply markings/appearance from prefs for player mobs + if(client) //just to be sure + client.prefs.copy_to(src) + if(dna) + dna.ResetUIFrom(src) + sync_organ_dna() + // end vorestation addition + + for (var/ID in virus2) + var/datum/disease2/disease/V = virus2[ID] + V.cure(src) + + losebreath = 0 + + ..() + +/mob/living/carbon/human/proc/is_lung_ruptured() + var/obj/item/organ/internal/lungs/L = internal_organs_by_name[O_LUNGS] + return L && L.is_bruised() + +/mob/living/carbon/human/proc/rupture_lung() + var/obj/item/organ/internal/lungs/L = internal_organs_by_name[O_LUNGS] + + if(L) + L.rupture() + +/* +/mob/living/carbon/human/verb/simulate() + set name = "sim" + set background = 1 + + var/damage = input(usr, "Wound damage","Wound damage") as num + + var/germs = 0 + var/tdamage = 0 + var/ticks = 0 + while (germs < 2501 && ticks < 100000 && round(damage/10)*20) + log_misc("VIRUS TESTING: [ticks] : germs [germs] tdamage [tdamage] prob [round(damage/10)*20]") + ticks++ + if (prob(round(damage/10)*20)) + germs++ + if (germs == 100) + to_world("Reached stage 1 in [ticks] ticks") + if (germs > 100) + if (prob(10)) + damage++ + germs++ + if (germs == 1000) + to_world("Reached stage 2 in [ticks] ticks") + if (germs > 1000) + damage++ + germs++ + if (germs == 2500) + to_world("Reached stage 3 in [ticks] ticks") + to_world("Mob took [tdamage] tox damage") +*/ +//returns 1 if made bloody, returns 0 otherwise + +/mob/living/carbon/human/add_blood(mob/living/carbon/human/M as mob) + if (!..()) + return 0 + //if this blood isn't already in the list, add it + if(istype(M)) + if(!blood_DNA[M.dna.unique_enzymes]) + blood_DNA[M.dna.unique_enzymes] = M.dna.b_type + hand_blood_color = blood_color + update_bloodied() + verbs += /mob/living/carbon/human/proc/bloody_doodle + return 1 //we applied blood to the item + +/mob/living/carbon/human/proc/get_full_print() + if(!dna ||!dna.uni_identity) + return + return md5(dna.uni_identity) + +/mob/living/carbon/human/clean_blood(var/washshoes) + . = ..() + + gunshot_residue = null + + //Always do hands (or whatever's on our hands) + if(gloves) + gloves.clean_blood() + update_inv_gloves() + gloves.germ_level = 0 + else + bloody_hands = 0 + germ_level = 0 + + //Sometimes do shoes if asked (or feet if no shoes) + if(washshoes && shoes) + shoes.clean_blood() + update_inv_shoes() + shoes.germ_level = 0 + else if(washshoes && (feet_blood_color || LAZYLEN(feet_blood_DNA))) + LAZYCLEARLIST(feet_blood_DNA) + feet_blood_DNA = null + feet_blood_color = null + + update_bloodied() + +/mob/living/carbon/human/get_visible_implants(var/class = 0) + + var/list/visible_implants = list() + for(var/obj/item/organ/external/organ in src.organs) + for(var/obj/item/weapon/O in organ.implants) + if(!istype(O,/obj/item/weapon/implant) && (O.w_class > class) && !istype(O,/obj/item/weapon/material/shard/shrapnel)) + visible_implants += O + + return(visible_implants) + +/mob/living/carbon/human/embedded_needs_process() + for(var/obj/item/organ/external/organ in src.organs) + for(var/obj/item/O in organ.implants) + if(!istype(O, /obj/item/weapon/implant)) //implant type items do not cause embedding effects, see handle_embedded_objects() + return 1 + return 0 + +/mob/living/carbon/human/proc/handle_embedded_objects() + + for(var/obj/item/organ/external/organ in src.organs) + if(organ.splinted) //Splints prevent movement. + continue + for(var/obj/item/O in organ.implants) + if(!istype(O,/obj/item/weapon/implant) && prob(5)) //Moving with things stuck in you could be bad. + // All kinds of embedded objects cause bleeding. + if(!can_feel_pain(organ.organ_tag)) + to_chat(src, "You feel [O] moving inside your [organ.name].") + else + var/msg = pick( \ + "A spike of pain jolts your [organ.name] as you bump [O] inside.", \ + "Your movement jostles [O] in your [organ.name] painfully.", \ + "Your movement jostles [O] in your [organ.name] painfully.") + custom_pain(msg, 40) + + organ.take_damage(rand(1,3), 0, 0) + if(!(organ.robotic >= ORGAN_ROBOT) && (should_have_organ(O_HEART))) //There is no blood in protheses. + organ.status |= ORGAN_BLEEDING + +/mob/living/carbon/human/verb/check_pulse() + set category = "Object" + set name = "Check pulse" + set desc = "Approximately count somebody's pulse. Requires you to stand still at least 6 seconds." + set src in view(1) + var/self = 0 + + if(usr.stat || usr.restrained() || !isliving(usr)) return + + var/datum/gender/TU = gender_datums[usr.get_visible_gender()] + var/datum/gender/T = gender_datums[get_visible_gender()] + + if(usr == src) + self = 1 + if(!self) + usr.visible_message("[usr] kneels down, puts [TU.his] hand on [src]'s wrist and begins counting [T.his] pulse.",\ + "You begin counting [src]'s pulse") + else + usr.visible_message("[usr] begins counting [T.his] pulse.",\ + "You begin counting your pulse.") + + if(src.pulse) + to_chat(usr, "[self ? "You have a" : "[src] has a"] pulse! Counting...") + else + to_chat(usr, "[src] has no pulse!") //it is REALLY UNLIKELY that a dead person would check his own pulse + return + + to_chat(usr, "You must[self ? "" : " both"] remain still until counting is finished.") + if(do_mob(usr, src, 60)) + var/message = "[self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)]." + to_chat(usr,message) + else + to_chat(usr, "You failed to check the pulse. Try again.") + +/mob/living/carbon/human/proc/set_species(var/new_species, var/default_colour, var/regen_icons = TRUE, var/mob/living/carbon/human/example = null) //VOREStation Edit - send an example + + if(!dna) + if(!new_species) + new_species = SPECIES_HUMAN + else + if(!new_species) + new_species = dna.species + else + dna.species = new_species + + // No more invisible screaming wheelchairs because of set_species() typos. + if(!GLOB.all_species[new_species]) + new_species = SPECIES_HUMAN + + if(species) + + if(species.name && species.name == new_species && species.name != "Custom Species") //VOREStation Edit + return + if(species.language) + remove_language(species.language) + if(species.default_language) + remove_language(species.default_language) + for(var/datum/language/L in species.assisted_langs) + remove_language(L) + // Clear out their species abilities. + species.remove_inherent_verbs(src) + holder_type = null + hunger_rate = initial(hunger_rate) //VOREStation Add + + species = GLOB.all_species[new_species] + + if(species.language) + add_language(species.language) + + if(species.default_language) + add_language(species.default_language) + + if(species.icon_scale_x != 1 || species.icon_scale_y != 1) + update_transform() + + if(example) //VOREStation Edit begin + if(!(example == src)) + r_skin = example.r_skin + g_skin = example.g_skin + b_skin = example.b_skin + else if(species.base_color) //VOREStation Edit end + //Apply colour. + r_skin = hex2num(copytext(species.base_color,2,4)) + g_skin = hex2num(copytext(species.base_color,4,6)) + b_skin = hex2num(copytext(species.base_color,6,8)) + else + r_skin = 0 + g_skin = 0 + b_skin = 0 + + if(species.holder_type) + holder_type = species.holder_type + + if(!(gender in species.genders)) + gender = species.genders[1] + + //icon_state = lowertext(species.name) //Necessary? + + //VOREStation Edit start: swap places of those two procs + species.handle_post_spawn(src) + + species.create_organs(src) + //VOREStation Edit end: swap places of those two procs + + + maxHealth = species.total_health + hunger_rate = species.hunger_factor //VOREStation Add + + if(LAZYLEN(descriptors)) + descriptors = null + + if(LAZYLEN(species.descriptors)) + descriptors = list() + for(var/desctype in species.descriptors) + var/datum/mob_descriptor/descriptor = species.descriptors[desctype] + descriptors[desctype] = descriptor.default_value + + spawn(0) + if(regen_icons) regenerate_icons() + make_blood() + if(vessel.total_volume < species.blood_volume) + vessel.maximum_volume = species.blood_volume + vessel.add_reagent("blood", species.blood_volume - vessel.total_volume) + else if(vessel.total_volume > species.blood_volume) + vessel.remove_reagent("blood", vessel.total_volume - species.blood_volume) + vessel.maximum_volume = species.blood_volume + fixblood() + species.update_attack_types() //VOREStation Edit - Required for any trait that updates unarmed_types in setup. + + // Rebuild the HUD. If they aren't logged in then login() should reinstantiate it for them. + update_hud() + + //A slew of bits that may be affected by our species change + regenerate_icons() + + if(species) + //if(mind) //VOREStation Removal + //apply_traits() //VOREStation Removal + return 1 + else + return 0 + +/mob/living/carbon/human/proc/bloody_doodle() + set category = "IC" + set name = "Write in blood" + set desc = "Use blood on your hands to write a short message on the floor or a wall, murder mystery style." + + if (src.stat) + return + + if (usr != src) + return 0 //something is terribly wrong + + if (!bloody_hands) + verbs -= /mob/living/carbon/human/proc/bloody_doodle + + if (src.gloves) + to_chat(src, "Your [src.gloves] are getting in the way.") + return + + var/turf/simulated/T = src.loc + if (!istype(T)) //to prevent doodling out of mechs and lockers + to_chat(src, "You cannot reach the floor.") + return + + var/direction = tgui_input_list(src,"Which way?","Tile selection", list("Here","North","South","East","West")) + if (direction != "Here") + T = get_step(T,text2dir(direction)) + if (!istype(T)) + to_chat(src, "You cannot doodle there.") + return + + var/num_doodles = 0 + for (var/obj/effect/decal/cleanable/blood/writing/W in T) + num_doodles++ + if (num_doodles > 4) + to_chat(src, "There is no space to write on!") + return + + var/max_length = bloody_hands * 30 //tweeter style + + var/message = sanitize(tgui_input_text(usr, "Write a message. It cannot be longer than [max_length] characters.","Blood writing", "")) + + if (message) + var/used_blood_amount = round(length(message) / 30, 1) + bloody_hands = max(0, bloody_hands - used_blood_amount) //use up some blood + + if (length(message) > max_length) + message += "-" + to_chat(src, "You ran out of blood to write with!") + + var/obj/effect/decal/cleanable/blood/writing/W = new(T) + W.basecolor = (hand_blood_color) ? hand_blood_color : "#A10808" + W.update_icon() + W.message = message + W.add_fingerprint(src) + +/mob/living/carbon/human/can_inject(var/mob/user, var/error_msg, var/target_zone, var/ignore_thickness = FALSE) + . = 1 + + if(!target_zone) + if(!user) + target_zone = pick(BP_TORSO,BP_TORSO,BP_TORSO,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_HEAD) + else + target_zone = user.zone_sel.selecting + + var/obj/item/organ/external/affecting = get_organ(target_zone) + var/fail_msg + if(!affecting) + . = 0 + fail_msg = "They are missing that limb." + else if (affecting.robotic == ORGAN_ROBOT) + . = 0 + fail_msg = "That limb is robotic." + else if (affecting.robotic >= ORGAN_LIFELIKE) + . = 0 + fail_msg = "Your needle refuses to penetrate more than a short distance..." + else if (affecting.thick_skin && prob(70 - round(affecting.brute_dam + affecting.burn_dam / 2))) // Allows transplanted limbs with thick skin to maintain their resistance. + . = 0 + fail_msg = "Your needle fails to penetrate \the [affecting]'s thick hide..." + else + switch(target_zone) + if(BP_HEAD) + if(head && (head.item_flags & THICKMATERIAL) && !ignore_thickness) + . = 0 + else + if(wear_suit && (wear_suit.item_flags & THICKMATERIAL) && !ignore_thickness) + . = 0 + if(!. && error_msg && user) + if(!fail_msg) + fail_msg = "There is no exposed flesh or thin material [target_zone == BP_HEAD ? "on their head" : "on their body"] to inject into." + to_chat(user, "[fail_msg]") + +/mob/living/carbon/human/print_flavor_text(var/shrink = 1) + var/list/equipment = list(src.head,src.wear_mask,src.glasses,src.w_uniform,src.wear_suit,src.gloves,src.shoes) + var/head_exposed = 1 + var/face_exposed = 1 + var/eyes_exposed = 1 + var/torso_exposed = 1 + var/arms_exposed = 1 + var/legs_exposed = 1 + var/hands_exposed = 1 + var/feet_exposed = 1 + + for(var/obj/item/clothing/C in equipment) + if(C.body_parts_covered & HEAD) + head_exposed = 0 + if(C.body_parts_covered & FACE) + face_exposed = 0 + if(C.body_parts_covered & EYES) + eyes_exposed = 0 + if(C.body_parts_covered & UPPER_TORSO) + torso_exposed = 0 + if(C.body_parts_covered & ARMS) + arms_exposed = 0 + if(C.body_parts_covered & HANDS) + hands_exposed = 0 + if(C.body_parts_covered & LEGS) + legs_exposed = 0 + if(C.body_parts_covered & FEET) + feet_exposed = 0 + + flavor_text = "" + for (var/T in flavor_texts) + if(flavor_texts[T] && flavor_texts[T] != "") + if((T == "general") || (T == "head" && head_exposed) || (T == "face" && face_exposed) || (T == "eyes" && eyes_exposed) || (T == "torso" && torso_exposed) || (T == "arms" && arms_exposed) || (T == "hands" && hands_exposed) || (T == "legs" && legs_exposed) || (T == "feet" && feet_exposed)) + flavor_text += flavor_texts[T] + flavor_text += "\n\n" + if(!shrink) + return flavor_text + else + return ..() + +/mob/living/carbon/human/getDNA() + if(species.flags & NO_SCAN) + return null + if(isSynthetic()) + return + ..() + +/mob/living/carbon/human/setDNA() + if(species.flags & NO_SCAN) + return + if(isSynthetic()) + return + ..() + +/mob/living/carbon/human/has_brain() + if(internal_organs_by_name[O_BRAIN]) + var/obj/item/organ/brain = internal_organs_by_name[O_BRAIN] + if(brain && istype(brain)) + return 1 + return 0 + +/mob/living/carbon/human/has_eyes() + if(internal_organs_by_name[O_EYES]) + var/obj/item/organ/eyes = internal_organs_by_name[O_EYES] + if(eyes && istype(eyes) && !(eyes.status & ORGAN_CUT_AWAY)) + return 1 + return 0 + +/mob/living/carbon/human/slip(var/slipped_on, stun_duration=8) + var/list/equipment = list(src.w_uniform,src.wear_suit,src.shoes) + var/footcoverage_check = FALSE + for(var/obj/item/clothing/C in equipment) + if(C.body_parts_covered & FEET) + footcoverage_check = TRUE + break + if((species.flags & NO_SLIP && !footcoverage_check) || (shoes && (shoes.item_flags & NOSLIP))) //Footwear negates a species' natural traction. + return 0 + if(..(slipped_on,stun_duration)) + return 1 + +/mob/living/carbon/human/proc/relocate() + set category = "Object" + set name = "Relocate Joint" + set desc = "Pop a joint back into place. Extremely painful." + set src in view(1) + + if(!isliving(usr) || !usr.checkClickCooldown()) + return + + usr.setClickCooldown(20) + + if(usr.stat > 0) + to_chat(usr, "You are unconcious and cannot do that!") + return + + if(usr.restrained()) + to_chat(usr, "You are restrained and cannot do that!") + return + + var/mob/S = src + var/mob/U = usr + var/self = null + if(S == U) + self = 1 // Removing object from yourself. + + var/list/limbs = list() + for(var/limb in organs_by_name) + var/obj/item/organ/external/current_limb = organs_by_name[limb] + if(current_limb && current_limb.dislocated > 0 && !current_limb.is_parent_dislocated()) //if the parent is also dislocated you will have to relocate that first + limbs |= current_limb + var/obj/item/organ/external/current_limb = tgui_input_list(usr, "Which joint do you wish to relocate?", "Joint Choice", limbs) + + if(!current_limb) + return + + if(self) + to_chat(src, "You brace yourself to relocate your [current_limb.joint]...") + else + to_chat(U, "You begin to relocate [S]'s [current_limb.joint]...") + + if(!do_after(U, 30)) + return + if(!current_limb || !S || !U) + return + + if(self) + to_chat(src, "You pop your [current_limb.joint] back in!") + else + to_chat(U, "You pop [S]'s [current_limb.joint] back in!") + to_chat(S, "[U] pops your [current_limb.joint] back in!") + current_limb.relocate() + +/mob/living/carbon/human/drop_from_inventory(var/obj/item/W, var/atom/Target = null) + if(W in organs) + return 0 + return ..() + +/mob/living/carbon/human/reset_view(atom/A, update_hud = 1) + ..() + if(update_hud) + handle_regular_hud_updates() + +/mob/living/carbon/human/Check_Shoegrip() + if(shoes && (shoes.item_flags & NOSLIP) && istype(shoes, /obj/item/clothing/shoes/magboots)) //magboots + dense_object = no floating + return 1 + if(flying) //VOREStation Edit. Checks to see if they have wings and are flying. + return 1 //VOREStation Edit. + return 0 + +//Puts the item into our active hand if possible. returns 1 on success. +/mob/living/carbon/human/put_in_active_hand(var/obj/item/W) + return (hand ? put_in_l_hand(W) : put_in_r_hand(W)) + +//Puts the item into our inactive hand if possible. returns 1 on success. +/mob/living/carbon/human/put_in_inactive_hand(var/obj/item/W) + return (hand ? put_in_r_hand(W) : put_in_l_hand(W)) + +/mob/living/carbon/human/put_in_hands(var/obj/item/W) + if(!W) + return 0 + if(put_in_active_hand(W)) + update_inv_l_hand() + update_inv_r_hand() + return 1 + else if(put_in_inactive_hand(W)) + update_inv_l_hand() + update_inv_r_hand() + return 1 + else + return ..() + +/mob/living/carbon/human/put_in_l_hand(var/obj/item/W) + if(!..() || l_hand) + return 0 + W.forceMove(src) + l_hand = W + W.equipped(src,slot_l_hand) + W.add_fingerprint(src) + update_inv_l_hand() + return 1 + +/mob/living/carbon/human/put_in_r_hand(var/obj/item/W) + if(!..() || r_hand) + return 0 + W.forceMove(src) + r_hand = W + W.equipped(src,slot_r_hand) + W.add_fingerprint(src) + update_inv_r_hand() + return 1 + +/mob/living/carbon/human/can_stand_overridden() + if(wearing_rig && wearing_rig.ai_can_move_suit(check_for_ai = 1)) + // Actually missing a leg will screw you up. Everything else can be compensated for. + for(var/limbcheck in list("l_leg","r_leg")) + var/obj/item/organ/affecting = get_organ(limbcheck) + if(!affecting) + return 0 + return 1 + return 0 + +/mob/living/carbon/human/verb/toggle_underwear() + set name = "Toggle Underwear" + set desc = "Shows/hides selected parts of your underwear." + set category = "Object" + + if(stat) return + var/datum/category_group/underwear/UWC = tgui_input_list(usr, "Choose underwear:", "Show/hide underwear", global_underwear.categories) + if(!UWC) return + var/datum/category_item/underwear/UWI = all_underwear[UWC.name] + if(!UWI || UWI.name == "None") + to_chat(src, "You do not have [UWC.gender==PLURAL ? "[UWC.display_name]" : "a [UWC.display_name]"].") + return + hide_underwear[UWC.name] = !hide_underwear[UWC.name] + update_underwear(1) + to_chat(src, "You [hide_underwear[UWC.name] ? "take off" : "put on"] your [UWC.display_name].") + return + +/mob/living/carbon/human/verb/pull_punches() + set name = "Pull Punches" + set desc = "Try not to hurt them." + set category = "IC" + + if(stat) return + pulling_punches = !pulling_punches + to_chat(src, "You are now [pulling_punches ? "pulling your punches" : "not pulling your punches"].") + return + +/mob/living/carbon/human/should_have_organ(var/organ_check) + + var/obj/item/organ/external/affecting + if(organ_check in list(O_HEART, O_LUNGS)) + affecting = organs_by_name[BP_TORSO] + else if(organ_check in list(O_LIVER, O_KIDNEYS)) + affecting = organs_by_name[BP_GROIN] + + if(affecting && (affecting.robotic >= ORGAN_ROBOT)) + return 0 + return (species && species.has_organ[organ_check]) + +/mob/living/carbon/human/can_feel_pain(var/obj/item/organ/check_organ) + if(isSynthetic()) + return 0 + for(var/datum/modifier/M in modifiers) + if(M.pain_immunity == TRUE) + return 0 + if(check_organ) + if(!istype(check_organ)) + return 0 + return check_organ.organ_can_feel_pain() + return !(species.flags & NO_PAIN) + +/mob/living/carbon/human/is_sentient() + if(get_FBP_type() == FBP_DRONE) + return FALSE + return ..() + +/mob/living/carbon/human/is_muzzled() + return (wear_mask && (istype(wear_mask, /obj/item/clothing/mask/muzzle) || istype(src.wear_mask, /obj/item/weapon/grenade))) + +/mob/living/carbon/human/get_fire_icon_state() + return species.fire_icon_state + +// Called by job_controller. Makes drones start with a permit, might be useful for other people later too. +/mob/living/carbon/human/equip_post_job() + var/braintype = get_FBP_type() + if(braintype == FBP_DRONE) + var/turf/T = get_turf(src) + var/obj/item/clothing/accessory/permit/drone/permit = new(T) + permit.set_name(real_name) + equip_to_appropriate_slot(permit) // If for some reason it can't find room, it'll still be on the floor. + +/mob/living/carbon/human/proc/update_icon_special() //For things such as teshari hiding and whatnot. + if(status_flags & HIDING) // Hiding? Carry on. + if(stat == DEAD || paralysis || weakened || stunned || restrained() || buckled || LAZYLEN(grabbed_by) || has_buckled_mobs()) //stunned/knocked down by something that isn't the rest verb? Note: This was tried with INCAPACITATION_STUNNED, but that refused to work. //VORE EDIT: Check for has_buckled_mobs() (taur riding) + reveal(null) + else + layer = HIDING_LAYER + +/mob/living/carbon/human/examine_icon() + var/icon/I = get_cached_examine_icon(src) + if(!I) + I = getFlatIcon(src, defdir = SOUTH, no_anim = TRUE) + set_cached_examine_icon(src, I, 50 SECONDS) + return I + +/mob/living/carbon/human/proc/get_display_species() + //Shows species in tooltip + if(src.custom_species) //VOREStation Add + return custom_species //VOREStation Add + //Beepboops get special text if obviously beepboop + if(looksSynthetic()) + if(gender == MALE) + return "Android" + else if(gender == FEMALE) + return "Gynoid" + else + return "Synthetic" + //Else species name + if(species) + return species.get_examine_name() + //Else CRITICAL FAILURE! + return "" + +/mob/living/carbon/human/get_nametag_name(mob/user) + return name //Could do fancy stuff here? + +/mob/living/carbon/human/get_nametag_desc(mob/user) + var/msg = "" + if(hasHUD(user,"security")) + //Try to find their name + var/perpname + var/obj/item/weapon/card/id/I = GetIdCard() + if(I) + perpname = I.registered_name + else + perpname = name + //Try to find their record + var/criminal = "None" + if(perpname) + var/datum/data/record/G = find_general_record("name", perpname) + if(G) + var/datum/data/record/S = find_security_record("id", G.fields["id"]) + if(S) + criminal = S.fields["criminal"] + //If it's interesting, append + if(criminal != "None") + msg += "([criminal]) " + + if(hasHUD(user,"medical")) + msg += "(Health: [round((health/getMaxHealth())*100)]%) " + + msg += get_display_species() + return msg + +/mob/living/carbon/human/reduce_cuff_time() + if(istype(gloves, /obj/item/clothing/gloves/gauntlets/rig)) + return 2 + return ..() + +/mob/living/carbon/human/pull_damage() + if(((health - halloss) <= config.health_threshold_softcrit)) + for(var/name in organs_by_name) + var/obj/item/organ/external/e = organs_by_name[name] + if(!e) + continue + if((e.status & ORGAN_BROKEN && (!e.splinted || (e.splinted in e.contents && prob(30))) || e.status & ORGAN_BLEEDING) && (getBruteLoss() + getFireLoss() >= 100)) + return 1 + else + return ..() + +// Drag damage is handled in a parent +/mob/living/carbon/human/dragged(var/mob/living/dragger, var/oldloc) + var/area/A = get_area(src) + if(lying && !buckled && A.has_gravity() && prob(getBruteLoss() * 200 / maxHealth)) + var/bloodtrail = 1 + if(species?.flags & NO_BLOOD) + bloodtrail = 0 + else + var/blood_volume = vessel.get_reagent_amount("blood") + if(blood_volume < species?.blood_volume*species?.blood_level_fatal) + bloodtrail = 0 //Most of it's gone already, just leave it be + else + vessel.remove_reagent("blood", 1) + if(bloodtrail) + if(istype(loc, /turf/simulated)) + var/turf/T = loc + T.add_blood(src) + . = ..() + +// Tries to turn off item-based things that let you see through walls, like mesons. +// Certain stuff like genetic xray vision is allowed to be kept on. +/mob/living/carbon/human/disable_spoiler_vision() + // Glasses. + if(istype(glasses, /obj/item/clothing/glasses)) + var/obj/item/clothing/glasses/goggles = glasses + if(goggles.active && (goggles.vision_flags & (SEE_TURFS|SEE_OBJS))) + goggles.toggle_active(src) + to_chat(src, span("warning", "Your [goggles.name] have suddenly turned off!")) + + // RIGs. + var/obj/item/weapon/rig/rig = get_rig() + if(istype(rig) && rig.visor?.active && rig.visor.vision?.glasses) + var/obj/item/clothing/glasses/rig_goggles = rig.visor.vision.glasses + if(rig_goggles.vision_flags & (SEE_TURFS|SEE_OBJS)) + rig.visor.deactivate() + to_chat(src, span("warning", "\The [rig]'s visor has shuddenly deactivated!")) + + ..() + +/mob/living/carbon/human/get_mob_riding_slots() + return list(back, head, wear_suit) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index f13051be24..c3eedab5ec 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -170,7 +170,7 @@ // Wind makes it easier or harder to move, depending on if you're with or against the wind. // I don't like that so I'm commenting it out :) - // VOREstation Edit Start + // VOREstation Edit Start /* if((T.is_outdoors()) && (T.z <= SSplanets.z_to_planet.len)) var/datum/planet/P = SSplanets.z_to_planet[z] @@ -289,3 +289,8 @@ playsound(T, S, volume, FALSE) return + +/mob/living/carbon/human/set_dir(var/new_dir) + . = ..() + if(. && (species.tail || tail_style)) + update_tail_showing() \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 74dfba1b36..f8d49b046a 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -94,7 +94,7 @@ if(!target) return - text = input(usr, "What would you like to say?", "Speak to creature", null, null) + text = tgui_input_text(usr, "What would you like to say?", "Speak to creature", null, null) text = sanitize(text) @@ -134,7 +134,7 @@ set desc = "Whisper silently to someone over a distance." set category = "Abilities" - var/msg = sanitize(input(usr, "Message:", "Psychic Whisper") as text|null) + var/msg = sanitize(tgui_input_text(usr, "Message:", "Psychic Whisper")) if(msg) log_say("(PWHISPER to [key_name(M)]) [msg]", src) to_chat(M, "You hear a strange, alien voice in your head... [msg]") diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 56c54d1fdb..07098750b8 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -777,6 +777,8 @@ if(adjusted_pressure >= species.hazard_high_pressure) var/pressure_damage = min( ( (adjusted_pressure / species.hazard_high_pressure) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) + if(stat==DEAD) + pressure_damage = pressure_damage/2 take_overall_damage(brute=pressure_damage, used_weapon = "High Pressure") throw_alert("pressure", /obj/screen/alert/highpressure, 2) else if(adjusted_pressure >= species.warning_high_pressure) @@ -788,7 +790,10 @@ else if( !(COLD_RESISTANCE in mutations)) if(!isSynthetic() || !nif || !nif.flag_check(NIF_O_PRESSURESEAL,NIF_FLAGS_OTHER)) //VOREStation Edit - NIF pressure seals - take_overall_damage(brute=LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure") + var/pressure_damage = LOW_PRESSURE_DAMAGE + if(stat==DEAD) + pressure_damage = pressure_damage/2 + take_overall_damage(brute=pressure_damage, used_weapon = "Low Pressure") if(getOxyLoss() < 55) // 12 OxyLoss per 4 ticks when wearing internals; unconsciousness in 16 ticks, roughly half a minute var/pressure_dam = 3 // 16 OxyLoss per 4 ticks when no internals present; unconsciousness in 13 ticks, roughly twenty seconds // (Extra 1 oxyloss from failed breath) diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm index 81b4baa194..7992d17ddc 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/vox.dm @@ -6,7 +6,7 @@ default_language = LANGUAGE_VOX language = LANGUAGE_GALCOM species_language = LANGUAGE_VOX - num_alternate_languages = 1 + num_alternate_languages = 3 assisted_langs = list(LANGUAGE_ROOTGLOBAL) unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/strong, /datum/unarmed_attack/bite/strong) rarity_value = 4 diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 91770ff1f4..ff775a5063 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -273,6 +273,8 @@ var/wikilink = null //link to wiki page for species var/icon_height = 32 var/agility = 20 //prob() to do agile things + var/gun_accuracy_mod = 0 // More is better + var/gun_accuracy_dispersion_mod = 0 // More is worse var/sort_hint = SPECIES_SORT_NORMAL diff --git a/code/modules/mob/living/carbon/human/species/species_vr.dm b/code/modules/mob/living/carbon/human/species/species_vr.dm index 9d8703d617..e8d9e4b059 100644 --- a/code/modules/mob/living/carbon/human/species/species_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_vr.dm @@ -25,6 +25,8 @@ var/list/traits = list() //Vars that need to be copied when producing a copy of species. var/list/copy_vars = list("base_species", "icobase", "deform", "tail", "tail_animation", "icobase_tail", "color_mult", "primitive_form", "appearance_flags", "flesh_color", "base_color", "blood_mask", "damage_mask", "damage_overlays", "move_trail", "has_floating_eyes") + var/trait_points = 0 + /datum/species/proc/give_numbing_bite() //Holy SHIT this is hacky, but it works. Updating a mob's attacks mid game is insane. unarmed_attacks = list() @@ -48,6 +50,7 @@ ASSERT(src) ASSERT(istype(H)) var/datum/species/new_copy = new src.type() + new_copy.race_key = race_key if(selects_bodytype && custom_base) //If race selects a bodytype, retrieve the custom_base species and copy needed variables. var/datum/species/S = GLOB.all_species[custom_base] diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index 12424f993c..999425d4e6 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -2,7 +2,7 @@ name = SPECIES_ALRAUNE name_plural = "Alraunes" unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite) - num_alternate_languages = 2 + num_alternate_languages = 3 slowdown = 1 //slow, they're plants. Not as slow as full diona. total_health = 100 //standard brute_mod = 1 //nothing special diff --git a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm index bba44edf36..8f27aa72c8 100644 --- a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm @@ -43,6 +43,8 @@ BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right, "descriptor" = "right foot") ) + trait_points = 2 + /datum/species/custom/update_sort_hint() sort_hint = SPECIES_SORT_CUSTOM diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm index c6b353281b..8f0a9e4306 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm @@ -215,7 +215,7 @@ to_chat(src,"You can't process [substance]!") return //Only a few things matter, the rest are best not cluttering the lists. - var/howmuch = input(src,"How much do you want to store? (0-[matstack.get_amount()])","Select amount") as null|num + var/howmuch = tgui_input_number(src,"How much do you want to store? (0-[matstack.get_amount()])","Select amount",null,matstack.get_amount(),0) if(!howmuch || matstack != get_active_hand() || howmuch > matstack.get_amount()) return //Quietly fail @@ -295,7 +295,7 @@ return var/nagmessage = "Adjust your mass to be a size between 25 to 200% (or between 1 to 600% in dorms area). Up-sizing consumes metal, downsizing returns metal." - var/new_size = input(user, nagmessage, "Pick a Size", user.size_multiplier*100) as num|null + var/new_size = tgui_input_number(user, nagmessage, "Pick a Size", user.size_multiplier*100, 600, 1) if(!new_size || !size_range_check(new_size)) return diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index cc146b56e4..fb8ffbc9dd 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -510,7 +510,7 @@ health_hud_intensity = 2.5 item_slowdown_mod = 0.1 - num_alternate_languages = 2 + num_alternate_languages = 3 name_language = LANGUAGE_ROOTLOCAL species_language = LANGUAGE_ROOTLOCAL secondary_langs = list(LANGUAGE_ROOTGLOBAL) diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index 13dcfdfc17..7c30b9df50 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -17,7 +17,7 @@ base_species = "Xenochimera" selects_bodytype = TRUE - num_alternate_languages = 2 + num_alternate_languages = 3 secondary_langs = list("Sol Common") //color_mult = 1 //It seemed to work fine in testing, but I've been informed it's unneeded. tail = "tail" //Scree's tail. Can be disabled in the vore tab by choosing "hide species specific tail sprite" @@ -333,7 +333,7 @@ brute_mod = 0.8 //20% brute damage reduction burn_mod = 1.15 //15% burn damage increase. They're spiders. Aerosol can+lighter = dead spiders. - num_alternate_languages = 2 + num_alternate_languages = 3 secondary_langs = list(LANGUAGE_VESPINAE) color_mult = 1 tail = "tail" //Spider tail. diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index bcad9b3da9..116fd369de 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -535,7 +535,7 @@ unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) darksight = 4 //Better hunters in the dark. hunger_factor = 0.1 //In exchange, they get hungry a tad faster. - num_alternate_languages = 2 + num_alternate_languages = 3 min_age = 18 max_age = 80 diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/_traits.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/_traits.dm new file mode 100644 index 0000000000..6abec0e517 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/_traits.dm @@ -0,0 +1,7 @@ +#define TRAIT_TYPE_NEGATIVE -1 +#define TRAIT_TYPE_NEUTRAL 0 +#define TRAIT_TYPE_POSITIVE 1 + +#define TRAIT_VARCHANGE_LESS_BETTER -1 +#define TRAIT_VARCHANGE_ALWAYS_OVERRIDE 0 +#define TRAIT_VARCHANGE_MORE_BETTER 1 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index b92b9c267e..7c44c25702 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -1,5 +1,5 @@ /datum/trait/negative - category = -1 + category = TRAIT_TYPE_NEGATIVE /datum/trait/negative/speed_slow name = "Slowdown" @@ -111,10 +111,10 @@ desc = "The only way you can hold a drink is if it's in your own two hands, and even then you'd best not inhale too deeply near it. Drinks hit thrice as hard. You may wish to note this down in your medical records, and perhaps your exploitable info as well." cost = -1 var_changes = list("alcohol_mod" = 3) - + /datum/trait/negative/pain_intolerance_basic name = "Pain Intolerant" - desc = "You are frail and sensitive to pain. You experience 25% more pain from all sources." + desc = "You are frail and sensitive to pain. You experience 25% more pain from all sources." cost = -1 var_changes = list("pain_mod" = 1.25) @@ -136,6 +136,8 @@ desc = "Increases your susceptibility to electric shocks by 50%" //YW EDIT cost = -3 //YW EDIT var_changes = list("siemens_coefficient" = 1.5) //This makes you significantly weaker to tasers. //YW EDIT + custom_only = FALSE + varchange_type = TRAIT_VARCHANGE_LESS_BETTER //YW ADDITIONS: START /datum/trait/negative/conductive_extreme @@ -151,6 +153,8 @@ cost = -3 //YW EDIT var_changes = list("bloodloss_rate" = 2) can_take = ORGANICS + custom_only = FALSE + varchange_type = TRAIT_VARCHANGE_LESS_BETTER /datum/trait/negative/hollow name = "Hollow Bones/Aluminum Alloy" @@ -168,6 +172,7 @@ desc = "Your light weight and poor balance make you very susceptible to unhelpful bumping. Think of it like a bowling ball versus a pin." cost = -2 var_changes = list("lightweight" = 1) + custom_only = FALSE /datum/trait/negative/neural_hypersensitivity name = "Neural Hypersensitivity" @@ -190,6 +195,38 @@ desc = "You breathe nitrogen instead of oxygen (which is poisonous to you). Incidentally, phoron isn't poisonous to breathe to you." var_changes = list("breath_type" = "nitrogen", "poison_type" = "oxygen") +/datum/trait/negative/monolingual + name = "Monolingual" + desc = "You are not good at learning languages." + cost = -3 + var_changes = list("num_alternate_languages" = 0) + varchange_type = TRAIT_VARCHANGE_MORE_BETTER + +/datum/trait/negative/monolingual + name = "Monolingual" + desc = "You are not good at learning languages." + cost = -1 + var_changes = list("num_alternate_languages" = 0) + var_changes_pref = list("extra_languages" = -3) + custom_only = FALSE + varchange_type = TRAIT_VARCHANGE_MORE_BETTER + +/datum/trait/negative/dark_blind + name = "Nyctalopia" + desc = "You cannot see in dark at all." + cost = -1 + var_changes = list("darksight" = 0) + custom_only = FALSE + varchange_type = TRAIT_VARCHANGE_MORE_BETTER + +/datum/trait/negative/bad_shooter + name = "Bad Shot" + desc = "You are terrible at aiming." + cost = -1 + var_changes = list("gun_accuracy_mod" = -35) + custom_only = FALSE + varchange_type = TRAIT_VARCHANGE_MORE_BETTER + //YW ADDITIONS: START /datum/trait/negative/light_sensitivity name = "Photosensitivity" @@ -202,4 +239,4 @@ desc = "You have trouble dealing with sudden flashes of light, taking quite a long time for you to be able to recover. The effects of flashes from cameras and security equipment leave you stunned for some time." cost = -2 var_changes = list("flash_mod" = 2.0) -//YW ADDITIONS: END \ No newline at end of file +//YW ADDITIONS: END diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index 9328604382..fd10b3140a 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -1,4 +1,5 @@ /datum/trait/neutral + category = TRAIT_TYPE_NEUTRAL /datum/trait/neutral/metabolism_up name = "Metabolism, Fast" @@ -227,7 +228,7 @@ YW change end */ cost = 0 custom_only = FALSE can_take = SYNTHETICS - var_changes = list("organic_food_coeff" = 0, "synthetic_food_coeff" = 0.25) + var_changes = list("organic_food_coeff" = 0, "synthetic_food_coeff" = 0.6) /datum/trait/neutral/glowing_eyes name = "Glowing Eyes" diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index 211d7eef1f..30622e3184 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -1,5 +1,5 @@ /datum/trait/positive - category = 1 + category = TRAIT_TYPE_POSITIVE /datum/trait/positive/speed_fast name = "Haste" @@ -208,6 +208,7 @@ desc = "You can fall from certain heights without suffering any injuries, be it via wings, lightness of frame or general dexterity." cost = 1 var_changes = list("soft_landing" = TRUE) + custom_only = FALSE /datum/trait/positive/hardfeet name = "Hard Feet" @@ -229,6 +230,8 @@ desc = "You're capable of parkour and can *flip over low objects (most of the time)." cost = 2 var_changes = list("agility" = 90) + custom_only = FALSE + varchange_type = TRAIT_VARCHANGE_MORE_BETTER //YW ADDITIONS: START /datum/trait/positive/bloodsucker_plus @@ -298,8 +301,24 @@ name = "Cocoon Spinner" desc = "Allows you to build a cocoon around yourself, using it to transform your body if you desire." cost = 1 - //custom_only = FALSE /datum/trait/positive/cocoon_tf/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) - H.verbs |= /mob/living/carbon/human/proc/enter_cocoon \ No newline at end of file + H.verbs |= /mob/living/carbon/human/proc/enter_cocoon + +/datum/trait/positive/linguist + name = "Linguist" + desc = "Allows you to have more languages." + cost = 1 + var_changes = list("num_alternate_languages" = 6) + var_changes_pref = list("extra_languages" = 3) + custom_only = FALSE + varchange_type = TRAIT_VARCHANGE_MORE_BETTER + +/datum/trait/positive/good_shooter + name = "Eagle Eye" + desc = "You are better at aiming than most." + cost = 2 + var_changes = list("gun_accuracy_mod" = 25) + custom_only = FALSE + varchange_type = TRAIT_VARCHANGE_MORE_BETTER \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm index 91bf5fafea..03e3966ff9 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm @@ -4,23 +4,43 @@ var/cost = 0 var/sort = TRAIT_SORT_NORMAL // Sort order, 1 before 2 before 3 etc. Alphabetical is used for same-group traits. - var/category = 0 // What category this trait is. -1 is Negative, 0 is Neutral, 1 is Positive + var/category = TRAIT_TYPE_NEUTRAL // What category this trait is. -1 is Negative, 0 is Neutral, 1 is Positive var/list/var_changes // A list to apply to the custom species vars. + var/list/var_changes_pref // A list to apply to the preference vars. var/list/excludes // Store a list of paths of traits to exclude, but done automatically if they change the same vars. var/can_take = ORGANICS|SYNTHETICS // Can freaking synths use those. var/list/banned_species // A list of species that can't take this trait var/list/allowed_species // VORESTATION EDIT:chomp port. A list of species that CAN take this trait, use this if only a few species can use it. -shark var/custom_only = TRUE // Trait only available for custom species + var/varchange_type = TRAIT_VARCHANGE_ALWAYS_OVERRIDE //Mostly used for non-custom species. //Proc can be overridden lower to include special changes, make sure to call up though for the vars changes /datum/trait/proc/apply(var/datum/species/S,var/mob/living/carbon/human/H) ASSERT(S) if(var_changes) for(var/V in var_changes) + if((category == TRAIT_TYPE_POSITIVE && ((varchange_type == TRAIT_VARCHANGE_LESS_BETTER && var_changes[V] > S.vars[V]) || (varchange_type == TRAIT_VARCHANGE_MORE_BETTER && var_changes[V] < S.vars[V]))) || (category == TRAIT_TYPE_NEGATIVE && ((varchange_type == TRAIT_VARCHANGE_LESS_BETTER && var_changes[V] < S.vars[V]) || (varchange_type == TRAIT_VARCHANGE_MORE_BETTER && var_changes[V] > S.vars[V])))) + continue S.vars[V] = var_changes[V] return +//Applying trait to preferences rather than just us. +/datum/trait/proc/apply_pref(var/datum/preferences/P) + ASSERT(P) + if(var_changes_pref) + for(var/V in var_changes_pref) + P.vars[V] = var_changes_pref[V] + return + //Similar to the above, but for removing. Probably won't be called often/ever. /datum/trait/proc/remove(var/datum/species/S) ASSERT(S) return + +//Similar to the above, but for removing. +/datum/trait/proc/remove_pref(var/datum/preferences/P) + ASSERT(P) + if(var_changes_pref) + for(var/V in var_changes_pref) + P.vars[V] = initial(P.vars[V]) + return diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm index acd1b8f540..f627a191fe 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm @@ -67,7 +67,7 @@ to_chat(src, "Their plasma vessel is missing.") return - var/amount = input(usr, "Amount:", "Transfer Plasma to [M]") as num + var/amount = tgui_input_number(usr, "Amount:", "Transfer Plasma to [M]") if (amount) amount = abs(round(amount)) if(check_alien_ability(amount,0,O_PLASMA)) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 889ed2fdfa..3c513052cf 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -66,37 +66,40 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() #define MOB_DAM_LAYER 4 //Injury overlay sprites like open wounds #define SURGERY_LAYER 5 //Overlays for open surgical sites #define UNDERWEAR_LAYER 6 //Underwear/bras/etc -#define SHOES_LAYER_ALT 7 //Shoe-slot item (when set to be under uniform via verb) -#define UNIFORM_LAYER 8 //Uniform-slot item -#define ID_LAYER 9 //ID-slot item -#define SHOES_LAYER 10 //Shoe-slot item -#define GLOVES_LAYER 11 //Glove-slot item -#define BELT_LAYER 12 //Belt-slot item -#define SUIT_LAYER 13 //Suit-slot item -#define TAIL_LAYER 14 //Some species have tails to render -#define GLASSES_LAYER 15 //Eye-slot item -#define BELT_LAYER_ALT 16 //Belt-slot item (when set to be above suit via verb) -#define SUIT_STORE_LAYER 17 //Suit storage-slot item -#define BACK_LAYER 18 //Back-slot item -#define HAIR_LAYER 19 //The human's hair -#define HAIR_ACCESSORY_LAYER 20 //VOREStation edit. Simply move this up a number if things are added. -#define EARS_LAYER 21 //Both ear-slot items (combined image) -#define EYES_LAYER 22 //Mob's eyes (used for glowing eyes) -#define FACEMASK_LAYER 23 //Mask-slot item -#define HEAD_LAYER 24 //Head-slot item -#define HANDCUFF_LAYER 25 //Handcuffs, if the human is handcuffed, in a secret inv slot -#define LEGCUFF_LAYER 26 //Same as handcuffs, for legcuffs -#define L_HAND_LAYER 27 //Left-hand item -#define R_HAND_LAYER 28 //Right-hand item -#define WING_LAYER 29 //Wings or protrusions over the suit. -#define TAIL_LAYER_ALT 30 //Modified tail-sprite layer. Tend to be larger. -#define MODIFIER_EFFECTS_LAYER 31 //Effects drawn by modifiers -#define FIRE_LAYER 32 //'Mob on fire' overlay layer -#define MOB_WATER_LAYER 33 //'Mob submerged' overlay layer -#define TARGETED_LAYER 34 //'Aimed at' overlay layer -#define TOTAL_LAYERS 34 //VOREStation edit. <---- KEEP THIS UPDATED, should always equal the highest number here, used to initialize a list. +#define TAIL_SOUTH_LAYER 7 //Tail as viewed from the south +#define SHOES_LAYER_ALT 8 //Shoe-slot item (when set to be under uniform via verb) +#define UNIFORM_LAYER 9 //Uniform-slot item +#define ID_LAYER 10 //ID-slot item +#define SHOES_LAYER 11 //Shoe-slot item +#define GLOVES_LAYER 12 //Glove-slot item +#define BELT_LAYER 13 //Belt-slot item +#define SUIT_LAYER 14 //Suit-slot item +#define TAIL_NORTH_LAYER 15 //Some species have tails to render (As viewed from the N, E, or W) +#define GLASSES_LAYER 16 //Eye-slot item +#define BELT_LAYER_ALT 17 //Belt-slot item (when set to be above suit via verb) +#define SUIT_STORE_LAYER 18 //Suit storage-slot item +#define BACK_LAYER 19 //Back-slot item +#define HAIR_LAYER 20 //The human's hair +#define HAIR_ACCESSORY_LAYER 21 //VOREStation edit. Simply move this up a number if things are added. +#define EARS_LAYER 22 //Both ear-slot items (combined image) +#define EYES_LAYER 23 //Mob's eyes (used for glowing eyes) +#define FACEMASK_LAYER 24 //Mask-slot item +#define HEAD_LAYER 25 //Head-slot item +#define HANDCUFF_LAYER 26 //Handcuffs, if the human is handcuffed, in a secret inv slot +#define LEGCUFF_LAYER 27 //Same as handcuffs, for legcuffs +#define L_HAND_LAYER 28 //Left-hand item +#define R_HAND_LAYER 29 //Right-hand item +#define WING_LAYER 30 //Wings or protrusions over the suit. +#define TAIL_NORTH_LAYER_ALT 31 //Modified tail-sprite layer. Tend to be larger. +#define MODIFIER_EFFECTS_LAYER 32 //Effects drawn by modifiers +#define FIRE_LAYER 33 //'Mob on fire' overlay layer +#define MOB_WATER_LAYER 34 //'Mob submerged' overlay layer +#define TARGETED_LAYER 35 //'Aimed at' overlay layer +#define TOTAL_LAYERS 35 //VOREStation edit. <---- KEEP THIS UPDATED, should always equal the highest number here, used to initialize a list. ////////////////////////////////// +#define GET_TAIL_LAYER (dir == SOUTH ? TAIL_SOUTH_LAYER : TAIL_NORTH_LAYER) + /mob/living/carbon/human var/list/overlays_standing[TOTAL_LAYERS] var/previous_damage_appearance // store what the body last looked like, so we only have to update it if something changed @@ -133,6 +136,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() var/desired_scale_y = size_multiplier * icon_scale_y desired_scale_x *= species.icon_scale_x desired_scale_y *= species.icon_scale_y + vis_height = species.icon_height appearance_flags |= PIXEL_SCALE if(fuzzy) appearance_flags &= ~PIXEL_SCALE @@ -271,7 +275,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() for(var/M in part.markings) icon_key += "[M][part.markings[M]["color"]]" - + // VOREStation Edit Start if(part.nail_polish) icon_key += "_[part.nail_polish.icon]_[part.nail_polish.icon_state]_[part.nail_polish.color]" @@ -369,6 +373,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() update_tail_showing() update_wing_showing() + /mob/living/carbon/human/proc/update_skin() if(QDESTROYING(src)) return @@ -488,7 +493,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() face_standing.Blend(ears_s, ICON_OVERLAY) if(ear_style?.em_block) em_block_ears = em_block_image_generic(image(ears_s)) - + var/image/semifinal = image(face_standing, layer = BODY_LAYER+HAIR_LAYER, "pixel_y" = head_organ.head_offset) if(em_block_ears) semifinal.overlays += em_block_ears // Leaving this as overlays += @@ -802,8 +807,11 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() if(ubelt.show_above_suit) belt_layer = BELT_LAYER_ALT + + var/icon/c_mask = tail_style?.clip_mask + //NB: this uses a var from above - overlays_standing[belt_layer] = belt.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_belt_str, default_icon = INV_BELT_DEF_ICON, default_layer = belt_layer) + overlays_standing[belt_layer] = belt.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_belt_str, default_icon = INV_BELT_DEF_ICON, default_layer = belt_layer, clip_mask = c_mask) apply_layer(belt_layer) @@ -831,7 +839,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() suit_sprite = INV_SUIT_DEF_ICON var/icon/c_mask = null - var/tail_is_rendered = (overlays_standing[TAIL_LAYER] || overlays_standing[TAIL_LAYER_ALT]) + var/tail_is_rendered = (overlays_standing[TAIL_NORTH_LAYER] || overlays_standing[TAIL_NORTH_LAYER_ALT] || overlays_standing[TAIL_SOUTH_LAYER]) var/valid_clip_mask = tail_style?.clip_mask if(tail_is_rendered && valid_clip_mask && !(istype(suit) && suit.taurized)) //Clip the lower half of the suit off using the tail's clip mask for taurs since taur bodies aren't hidden. @@ -948,16 +956,21 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() if(QDESTROYING(src)) return - remove_layer(TAIL_LAYER) - remove_layer(TAIL_LAYER_ALT) // Alt Tail Layer + remove_layer(TAIL_NORTH_LAYER) + remove_layer(TAIL_NORTH_LAYER_ALT) + remove_layer(TAIL_SOUTH_LAYER) - var/used_tail_layer = tail_alt ? TAIL_LAYER_ALT : TAIL_LAYER + var/tail_layer = GET_TAIL_LAYER + if(src.tail_style && src.tail_style.clip_mask_state) + tail_layer = TAIL_NORTH_LAYER // Use default, let clip mask handle everything + if(tail_alt && tail_layer == TAIL_NORTH_LAYER) + tail_layer = TAIL_NORTH_LAYER_ALT var/image/tail_image = get_tail_image() if(tail_image) - tail_image.layer = BODY_LAYER+used_tail_layer - overlays_standing[used_tail_layer] = tail_image - apply_layer(used_tail_layer) + tail_image.layer = BODY_LAYER+tail_layer + overlays_standing[tail_layer] = tail_image + apply_layer(tail_layer) return var/species_tail = species.get_tail(src) // Species tail icon_state prefix. @@ -965,7 +978,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() //This one is actually not that bad I guess. if(species_tail && !(wear_suit && wear_suit.flags_inv & HIDETAIL)) var/icon/tail_s = get_tail_icon() - overlays_standing[used_tail_layer] = image(icon = tail_s, icon_state = "[species_tail]_s", layer = BODY_LAYER+used_tail_layer) // Alt Tail Layer + overlays_standing[tail_layer] = image(icon = tail_s, icon_state = "[species_tail]_s", layer = BODY_LAYER+tail_layer) animate_tail_reset() //TODO: Is this the appropriate place for this, and not on species...? @@ -990,19 +1003,24 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() return tail_icon /mob/living/carbon/human/proc/set_tail_state(var/t_state) - var/used_tail_layer = tail_alt ? TAIL_LAYER_ALT : TAIL_LAYER // Alt Tail Layer - var/image/tail_overlay = overlays_standing[used_tail_layer] + var/tail_layer = GET_TAIL_LAYER + if(src.tail_style && src.tail_style.clip_mask_state) + tail_layer = TAIL_NORTH_LAYER // Use default, let clip mask handle everything + if(tail_alt && tail_layer == TAIL_NORTH_LAYER) + tail_layer = TAIL_NORTH_LAYER_ALT + var/image/tail_overlay = overlays_standing[tail_layer] - remove_layer(TAIL_LAYER) - remove_layer(TAIL_LAYER_ALT) + remove_layer(TAIL_NORTH_LAYER) + remove_layer(TAIL_NORTH_LAYER_ALT) + remove_layer(TAIL_SOUTH_LAYER) if(tail_overlay) - overlays_standing[used_tail_layer] = tail_overlay + overlays_standing[tail_layer] = tail_overlay if(species.get_tail_animation(src)) tail_overlay.icon_state = t_state . = tail_overlay - apply_layer(used_tail_layer) + apply_layer(tail_layer) //Not really once, since BYOND can't do that. //Update this if the ability to flick() images or make looping animation start at the first frame is ever added. @@ -1012,9 +1030,11 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() return var/t_state = "[species.get_tail(src)]_once" - var/used_tail_layer = tail_alt ? TAIL_LAYER_ALT : TAIL_LAYER // Alt Tail Layer + var/tail_layer = GET_TAIL_LAYER + if(src.tail_style && src.tail_style.clip_mask_state) + tail_layer = TAIL_NORTH_LAYER // Use default, let clip mask handle everything - var/image/tail_overlay = overlays_standing[used_tail_layer] // Alt Tail Layer + var/image/tail_overlay = overlays_standing[tail_layer] if(tail_overlay && tail_overlay.icon_state == t_state) return //let the existing animation finish @@ -1022,7 +1042,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() if(tail_overlay) spawn(20) //check that the animation hasn't changed in the meantime - if(overlays_standing[used_tail_layer] == tail_overlay && tail_overlay.icon_state == t_state) // Alt Tail Layer + if(overlays_standing[tail_layer] == tail_overlay && tail_overlay.icon_state == t_state) animate_tail_stop() /mob/living/carbon/human/proc/animate_tail_start() @@ -1176,7 +1196,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() var/icon/ears_s = new/icon("icon" = synthetic.icon, "icon_state" = "ears") ears_s.Blend(rgb(src.r_ears, src.g_ears, src.b_ears), species.color_mult ? ICON_MULTIPLY : ICON_ADD) return ears_s - + if(ear_style && !(head && (head.flags_inv & BLOCKHEADHAIR))) var/icon/ears_s = new/icon("icon" = ear_style.icon, "icon_state" = ear_style.icon_state) if(ear_style.do_colouration) @@ -1272,7 +1292,9 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() #undef GLOVES_LAYER #undef BELT_LAYER #undef SUIT_LAYER -#undef TAIL_LAYER +#undef TAIL_NORTH_LAYER +#undef TAIL_SOUTH_LAYER +#undef GET_TAIL_LAYER #undef GLASSES_LAYER #undef BELT_LAYER_ALT #undef SUIT_STORE_LAYER diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index 94776d570e..a5e5fece26 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -17,6 +17,10 @@ //VOREStation Edit End nest = null + if(isbelly(loc) && tf_mob_holder) + mind?.vore_death = TRUE + tf_mob_holder.mind?.vore_death = TRUE + for(var/datum/soul_link/S as anything in owned_soul_links) S.owner_died(gibbed) for(var/datum/soul_link/S as anything in shared_soul_links) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 1182dcf34b..6356bfb7b3 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -72,6 +72,8 @@ handle_vision() + handle_tf_holder() //VOREStation Addition + /mob/living/proc/handle_breathing() return diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 09147c527f..ce9a8fde5a 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -32,6 +32,28 @@ nest = null if(buckled) buckled.unbuckle_mob(src, TRUE) + //VOREStation Addition Start + if(tf_mob_holder && tf_mob_holder.loc == src) + tf_mob_holder.ckey = ckey + if(isbelly(loc)) + tf_mob_holder.loc = loc + tf_mob_holder.forceMove(loc) + else + var/turf/get_dat_turf = get_turf(src) + tf_mob_holder.loc = get_dat_turf + tf_mob_holder.forceMove(get_dat_turf) + QDEL_LIST_NULL(tf_mob_holder.vore_organs) + tf_mob_holder.vore_organs = list() + for(var/obj/belly/B as anything in vore_organs) + B.loc = tf_mob_holder + B.forceMove(tf_mob_holder) + B.owner = tf_mob_holder + tf_mob_holder.vore_organs |= B + vore_organs -= B + + if(tf_mob_holder) + tf_mob_holder = null + //VOREStation Addition End qdel(selected_image) QDEL_NULL(vorePanel) //VOREStation Add @@ -39,7 +61,6 @@ temp_language_sources = null //VOREStation Add temp_languages = null //VOREStation Add - if(LAZYLEN(organs)) organs_by_name.Cut() while(organs.len) @@ -179,6 +200,13 @@ if(!isnull(M.incoming_healing_percent)) amount *= M.incoming_healing_percent + //VOREStation Additon Start + if(tf_mob_holder && tf_mob_holder.loc == src) + var/dmgmultiplier = tf_mob_holder.maxHealth / maxHealth + dmgmultiplier *= amount + tf_mob_holder.adjustBruteLoss(dmgmultiplier) + //VOREStation Additon End + bruteloss = min(max(bruteloss + amount, 0),(getMaxHealth()*2)) updatehealth() @@ -252,7 +280,12 @@ for(var/datum/modifier/M in modifiers) if(!isnull(M.incoming_healing_percent)) amount *= M.incoming_healing_percent - + //VOREStation Additon Start + if(tf_mob_holder && tf_mob_holder.loc == src) + var/dmgmultiplier = tf_mob_holder.maxHealth / maxHealth + dmgmultiplier *= amount + tf_mob_holder.adjustFireLoss(dmgmultiplier) + //VOREStation Additon End fireloss = min(max(fireloss + amount, 0),(getMaxHealth()*2)) updatehealth() @@ -1206,9 +1239,13 @@ if(!screen_icon) screen_icon = new() RegisterSignal(screen_icon, COMSIG_CLICK, .proc/character_setup_click) - screen_icon.icon = HUD.ui_style - screen_icon.color = HUD.ui_color - screen_icon.alpha = HUD.ui_alpha + if(ispAI(user)) + screen_icon.icon = 'icons/mob/pai_hud.dmi' + screen_icon.screen_loc = ui_acti + else + screen_icon.icon = HUD.ui_style + screen_icon.color = HUD.ui_color + screen_icon.alpha = HUD.ui_alpha LAZYADD(HUD.other_important, screen_icon) user.client?.screen += screen_icon diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm index 8f9a5c0f31..7a9279eaa0 100644 --- a/code/modules/mob/living/living_movement.dm +++ b/code/modules/mob/living/living_movement.dm @@ -291,9 +291,10 @@ default behaviour is: var/mob/living/M = pulling M.dragged(src, oldloc) - pulling.Move(oldloc, 0, movetime) // the pullee tries to reach our previous position - if(pulling && get_dist(src, pulling) > 1) // the pullee couldn't keep up - stop_pulling() + if(pulling) // Check it AGAIN after previous steps just in case + pulling.Move(oldloc, 0, movetime) // the pullee tries to reach our previous position + if(get_dist(src, pulling) > 1) // the pullee couldn't keep up + stop_pulling() if(!isturf(loc)) return diff --git a/code/modules/mob/living/living_powers.dm b/code/modules/mob/living/living_powers.dm index 2125f2679e..a2515085ad 100644 --- a/code/modules/mob/living/living_powers.dm +++ b/code/modules/mob/living/living_powers.dm @@ -14,7 +14,7 @@ return if(status_flags & HIDING) - reveal("You have stopped hiding.") + reveal(FALSE, "You have stopped hiding.") else status_flags |= HIDING layer = HIDING_LAYER //Just above cables with their 2.44 diff --git a/code/modules/mob/living/living_vr.dm b/code/modules/mob/living/living_vr.dm index a570ed60db..9689953ebb 100644 --- a/code/modules/mob/living/living_vr.dm +++ b/code/modules/mob/living/living_vr.dm @@ -12,13 +12,13 @@ var/sayselect = tgui_alert(src, "Which say-verb do you wish to customize?", "Select Verb", list("Say","Whisper","Ask (?)","Exclaim/Shout/Yell (!)","Cancel")) if(sayselect == "Say") - custom_say = lowertext(sanitize(input(usr, "This word or phrase will appear instead of 'says': [src] says, \"Hi.\"", "Custom Say", null) as text)) + custom_say = lowertext(sanitize(tgui_input_text(usr, "This word or phrase will appear instead of 'says': [src] says, \"Hi.\"", "Custom Say", null))) else if(sayselect == "Whisper") - custom_whisper = lowertext(sanitize(input(usr, "This word or phrase will appear instead of 'whispers': [src] whispers, \"Hi...\"", "Custom Whisper", null) as text)) + custom_whisper = lowertext(sanitize(tgui_input_text(usr, "This word or phrase will appear instead of 'whispers': [src] whispers, \"Hi...\"", "Custom Whisper", null))) else if(sayselect == "Ask (?)") - custom_ask = lowertext(sanitize(input(usr, "This word or phrase will appear instead of 'asks': [src] asks, \"Hi?\"", "Custom Ask", null) as text)) + custom_ask = lowertext(sanitize(tgui_input_text(usr, "This word or phrase will appear instead of 'asks': [src] asks, \"Hi?\"", "Custom Ask", null))) else if(sayselect == "Exclaim/Shout/Yell (!)") - custom_exclaim = lowertext(sanitize(input(usr, "This word or phrase will appear instead of 'exclaims', 'shouts' or 'yells': [src] exclaims, \"Hi!\"", "Custom Exclaim", null) as text)) + custom_exclaim = lowertext(sanitize(tgui_input_text(usr, "This word or phrase will appear instead of 'exclaims', 'shouts' or 'yells': [src] exclaims, \"Hi!\"", "Custom Exclaim", null))) else return @@ -27,7 +27,7 @@ set desc = "Sets OOC notes about yourself or your RP preferences or status." set category = "OOC" - var/new_metadata = sanitize(input(usr, "Enter any information you'd like others to see, such as Roleplay-preferences. This will not be saved permanently, only for this round.", "Game Preference" , html_decode(ooc_notes)) as message, extra = 0) + var/new_metadata = sanitize(tgui_input_text(usr, "Enter any information you'd like others to see, such as Roleplay-preferences. This will not be saved permanently, only for this round.", "Game Preference" , html_decode(ooc_notes), multiline = TRUE, prevent_enter = TRUE), extra = 0) if(new_metadata && CanUseTopic(usr)) ooc_notes = new_metadata to_chat(usr, "OOC notes updated.") diff --git a/code/modules/mob/living/organs.dm b/code/modules/mob/living/organs.dm index 133961a631..2e03e66fb9 100644 --- a/code/modules/mob/living/organs.dm +++ b/code/modules/mob/living/organs.dm @@ -35,4 +35,10 @@ if(!ispath(E)) E.droplimb(0,DROPLIMB_EDGE,1) + //VOREStation Addition Start + if(tf_mob_holder && tf_mob_holder.loc == src) + tf_mob_holder.revert_mob_tf() + tf_mob_holder.gib() + //VOREStation Addition End + ..() diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 15bedb2016..7c5af248ff 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -146,7 +146,7 @@ var/list/channel_to_radio_key = new return "asks" return verb -/mob/living/say(var/message, var/whispering = 0) +/mob/living/say(var/message, var/datum/language/speaking = null, var/whispering = 0) //If you're muted for IC chat if(client) if(message) @@ -366,18 +366,18 @@ var/list/channel_to_radio_key = new var/runechat_enabled = M.client?.is_preference_enabled(/datum/client_preference/runechat_mob) if(dst <= message_range || (M.stat == DEAD && !forbid_seeing_deadchat)) //Inside normal message range, or dead with ears (handled in the view proc) - if(M.client && !runechat_enabled) - var/image/I1 = listening[M] || speech_bubble - images_to_clients[I1] |= M.client - M << I1 - M.hear_say(message_pieces, verb, italics, src, speech_sound, sound_vol) + if(M.hear_say(message_pieces, verb, italics, src, speech_sound, sound_vol)) + if(M.client && !runechat_enabled) + var/image/I1 = listening[M] || speech_bubble + images_to_clients[I1] |= M.client + M << I1 if(whispering && !isobserver(M)) //Don't even bother with these unless whispering if(dst > message_range && dst <= w_scramble_range) //Inside whisper scramble range - if(M.client && !runechat_enabled) - var/image/I2 = listening[M] || speech_bubble - images_to_clients[I2] |= M.client - M << I2 - M.hear_say(stars_all(message_pieces), verb, italics, src, speech_sound, sound_vol*0.2) + if(M.hear_say(stars_all(message_pieces), verb, italics, src, speech_sound, sound_vol*0.2)) + if(M.client && !runechat_enabled) + var/image/I2 = listening[M] || speech_bubble + images_to_clients[I2] |= M.client + M << I2 if(dst > w_scramble_range && dst <= world.view) //Inside whisper 'visible' range M.show_message("[name] [w_not_heard].", 2) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index dd3fc5f064..ca5319313f 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -51,7 +51,7 @@ var/list/ai_verbs_default = list( var/obj/machinery/camera/camera = null var/aiRestorePowerRoutine = 0 var/viewalerts = 0 - var/icon/holo_icon//Default is assigned when AI is created. + var/icon/holo_icon //Default is assigned when AI is created. var/list/connected_robots = list() var/obj/item/device/pda/ai/aiPDA = null var/obj/item/device/communicator/aiCommunicator = null @@ -363,7 +363,7 @@ var/list/ai_verbs_default = list( if(message_cooldown) to_chat(src, "Please allow one minute to pass between announcements.") return - var/input = input(usr, "Please write a message to announce to the station crew.", "A.I. Announcement") + var/input = tgui_input_text(usr, "Please write a message to announce to the station crew.", "A.I. Announcement") if(!input) return @@ -418,7 +418,7 @@ var/list/ai_verbs_default = list( if(emergency_message_cooldown) to_chat(usr, "Arrays recycling. Please stand by.") return - var/input = sanitize(input(usr, "Please choose a message to transmit to [using_map.boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) + var/input = sanitize(tgui_input_text(usr, "Please choose a message to transmit to [using_map.boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) if(!input) return CentCom_announce(input, usr) diff --git a/code/modules/mob/living/silicon/pai/death.dm b/code/modules/mob/living/silicon/pai/death.dm index 4989cecace..6290b72f51 100644 --- a/code/modules/mob/living/silicon/pai/death.dm +++ b/code/modules/mob/living/silicon/pai/death.dm @@ -1,15 +1,16 @@ -/mob/living/silicon/pai/death(gibbed) +//VOREStation Edit - Let's make it so that pAIs don't just always cease to be when they die! It would be cool if we could fix them. +/mob/living/silicon/pai/death(gibbed,deathmessage="fizzles out and clatters to the floor...") +// set_respawn_timer() release_vore_contents() + close_up(TRUE) if(card) - card.removePersonality() - //if(gibbed) //VOREStation Edit Start. This prevents pAIs from joining back into their card after the card's killed - src.loc = get_turf(card) - qdel(card) - /*else - close_up() - qdel(card)*/ //VOREStation Edit End. - if(mind) - qdel(mind) - ..(gibbed) - ghostize() - qdel(src) + card.cut_overlays() + card.setEmotion(16) + card.damage_random_component() + + if(gibbed) + qdel(card) + ..(gibbed) + else + card.add_overlay("pai-dead") + ..(gibbed,deathmessage) diff --git a/code/modules/mob/living/silicon/pai/examine.dm b/code/modules/mob/living/silicon/pai/examine.dm index b6890470c9..9c009dcf6f 100644 --- a/code/modules/mob/living/silicon/pai/examine.dm +++ b/code/modules/mob/living/silicon/pai/examine.dm @@ -9,16 +9,10 @@ // VOREStation Edit: Start . += attempt_vr(src,"examine_bellies",args) //VOREStation Edit - if(ooc_notes) - . += "OOC Notes: \[View\]" - // VOREStation Edit: End - - . += "*---------*" - if(print_flavor_text()) . += "\n[print_flavor_text()]\n" - + // VOREStation Edit: End + . += "*---------*" if (pose) if(!findtext(pose, regex("\[.?!]$"))) // Will be zero if the last character is not a member of [.?!] pose = addtext(pose,".") //Makes sure all emotes end with a period. . += "
It is [pose]" //Extra
intentional - \ No newline at end of file diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm index 4879b7460c..6e7e8a42a1 100644 --- a/code/modules/mob/living/silicon/pai/life.dm +++ b/code/modules/mob/living/silicon/pai/life.dm @@ -1,8 +1,5 @@ /mob/living/silicon/pai/Life() - if (src.stat == 2) - return - if(src.cable) if(get_dist(src, src.cable) > 1) var/turf/T = get_turf_or_move(src.loc) @@ -13,6 +10,21 @@ qdel(src.cable) src.cable = null + if (src.stat == DEAD) + return + + if(card.cell != PP_FUNCTIONAL|| card.processor != PP_FUNCTIONAL || card.board != PP_FUNCTIONAL || card.capacitor != PP_FUNCTIONAL) + death() + + if(card.projector != PP_FUNCTIONAL && card.emitter != PP_FUNCTIONAL) + if(loc != card) + close_up() + to_chat(src, "ERROR: System malfunction. Service required!") + else if(card.projector != PP_FUNCTIONAL|| card.emitter != PP_FUNCTIONAL) + if(prob(5)) + close_up() + to_chat(src, "ERROR: System malfunction. Service recommended!") + handle_regular_hud_updates() handle_vision() @@ -24,7 +36,8 @@ handle_statuses() if(health <= 0) - death(null,"gives one shrill beep before falling lifeless.") + card.death_damage() + death(null,"fizzles out and clatters to the floor...") else if(health < maxHealth && istype(src.loc , /obj/item/device/paicard)) adjustBruteLoss(-0.5) adjustFireLoss(-0.5) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 9c82783928..039c64e663 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -22,7 +22,7 @@ var/list/software = list() var/userDNA // The DNA string of our assigned user var/obj/item/device/paicard/card // The card we inhabit - var/obj/item/device/radio/radio // Our primary radio + var/obj/item/device/radio/borg/pai/radio // Our primary radio var/obj/item/device/communicator/integrated/communicator // Our integrated communicator. var/chassis = "pai-repairbot" // A record of your chosen chassis. @@ -50,7 +50,10 @@ "Panther" = "panther", "Cyber Elf" = "cyberelf", "Teppi" = "teppi", - "Catslug" = "catslug" + "Catslug" = "catslug", + "Car" = "car", + "Type One" = "typeone", + "Type Thirteen" = "13" //VOREStation Addition End ) @@ -82,8 +85,7 @@ var/obj/item/device/pda/ai/pai/pda = null - var/secHUD = 0 // Toggles whether the Security HUD is active or not - var/medHUD = 0 // Toggles whether the Medical HUD is active or not + var/paiHUD = 0 // Toggles whether the AR HUD is active or not var/medical_cannotfind = 0 var/datum/data/record/medicalActive1 // Datacore record declarations for record software @@ -103,6 +105,8 @@ var/current_pda_messaging = null + var/our_icon_rotation = 0 + /mob/living/silicon/pai/New(var/obj/item/device/paicard) src.loc = paicard card = paicard @@ -110,7 +114,7 @@ communicator = new(src) if(card) if(!card.radio) - card.radio = new /obj/item/device/radio(src.card) + card.radio = new /obj/item/device/radio/borg/pai(src.card) radio = card.radio //Default languages without universal translator software @@ -119,7 +123,7 @@ add_language(LANGUAGE_GUTTER, 1) add_language(LANGUAGE_EAL, 1) add_language(LANGUAGE_TERMINUS, 1) - add_language(LANGUAGE_SIGN, 0) + add_language(LANGUAGE_SIGN, 1) verbs += /mob/living/silicon/pai/proc/choose_chassis verbs += /mob/living/silicon/pai/proc/choose_verbs @@ -133,7 +137,7 @@ var/datum/data/pda/app/messenger/M = pda.find_program(/datum/data/pda/app/messenger) if(M) - M.toff = TRUE + M.toff = FALSE ..() /mob/living/silicon/pai/Login() @@ -142,7 +146,6 @@ if (client.prefs) ooc_notes = client.prefs.metadata - // this function shows the information about being silenced as a pAI in the Status panel /mob/living/silicon/pai/proc/show_silenced() if(src.silence_time) @@ -168,7 +171,8 @@ /mob/living/silicon/pai/emp_act(severity) // Silence for 2 minutes - // 20% chance to kill + // 20% chance to damage critical components + // 50% chance to damage a non critical component // 33% chance to unbind // 33% chance to change prime directive (based on severity) // 33% chance of no additional effect @@ -177,10 +181,12 @@ to_chat(src, "Communication circuit overload. Shutting down and reloading communication circuits - speech and messaging functionality will be unavailable until the reboot is complete.") if(prob(20)) var/turf/T = get_turf_or_move(src.loc) + card.death_damage() for (var/mob/M in viewers(T)) M.show_message("A shower of sparks spray from [src]'s inner workings.", 3, "You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2) - return src.death(0) - + return + if(prob(50)) + card.damage_random_component(TRUE) switch(pick(1,2,3)) if(1) src.master = null @@ -245,7 +251,11 @@ if(src.loc != card) return + if(card.projector != PP_FUNCTIONAL && card.emitter != PP_FUNCTIONAL) + to_chat(src, "ERROR: System malfunction. Service required!") + if(world.time <= last_special) + to_chat(src, "You can't unfold yet.") return last_special = world.time + 100 @@ -281,11 +291,13 @@ card.forceMove(src) card.screen_loc = null + canmove = TRUE var/turf/T = get_turf(src) if(istype(T)) T.visible_message("[src] folds outwards, expanding into a mobile form.") verbs |= /mob/living/silicon/pai/proc/pai_nom verbs |= /mob/living/proc/vertical_nom + update_icon() /mob/living/silicon/pai/verb/fold_up() set category = "pAI Commands" @@ -298,6 +310,7 @@ return if(world.time <= last_special) + to_chat(src, "You can't fold up yet.") return close_up() @@ -344,14 +357,54 @@ var/obj/item/weapon/rig/rig = src.get_rig() if(istype(rig)) rig.force_rest(src) + return + else if(chassis == "13") + resting = !resting + //update_transform() I want this to make you ROTATE like normal HUMANS do! But! There's lots of problems and I don't know how to fix them! else resting = !resting icon_state = resting ? "[chassis]_rest" : "[chassis]" update_icon() //VOREStation edit - to_chat(src, "You are now [resting ? "resting" : "getting up"]") + to_chat(src, "You are now [resting ? "resting" : "getting up"]") canmove = !resting +/* +/mob/living/silicon/pai/update_transform() + + var/desired_scale_x = size_multiplier * icon_scale_x + var/desired_scale_y = size_multiplier * icon_scale_y + + // Now for the regular stuff. + var/matrix/M = matrix() + M.Scale(desired_scale_x, desired_scale_y) + M.Translate(0, (vis_height/2)*(desired_scale_y-1)) + + if(chassis != "13") + appearance_flags |= PIXEL_SCALE + + var/anim_time = 3 + + if(resting) + M.Turn(90) + M.Scale(desired_scale_y, desired_scale_x) + if(holo_icon_dimension_X == 64 && holo_icon_dimension_Y == 64) + M.Translate(13,-22) + else if(holo_icon_dimension_X == 32 && holo_icon_dimension_Y == 64) + M.Translate(1,-22) + else if(holo_icon_dimension_X == 64 && holo_icon_dimension_Y == 32) + M.Translate(13,-6) + else + M.Translate(1,-6) + layer = MOB_LAYER -0.01 // Fix for a byond bug where turf entry order no longer matters + else + M.Scale(desired_scale_x, desired_scale_y) + M.Translate(0, (vis_height/2)*(desired_scale_y-1)) + layer = MOB_LAYER // Fix for a byond bug where turf entry order no longer matters + animate(src, transform = M, time = anim_time) + src.transform = M + handle_status_indicators() +*/ //Overriding this will stop a number of headaches down the track. /mob/living/silicon/pai/attackby(obj/item/weapon/W as obj, mob/user as mob) if(W.force) @@ -372,7 +425,7 @@ close_up() //I'm not sure how much of this is necessary, but I would rather avoid issues. -/mob/living/silicon/pai/proc/close_up() +/mob/living/silicon/pai/proc/close_up(silent= FALSE) last_special = world.time + 100 @@ -382,7 +435,7 @@ release_vore_contents(FALSE) //VOREStation Add var/turf/T = get_turf(src) - if(istype(T)) T.visible_message("[src] neatly folds inwards, compacting down to a rectangular card.") + if(istype(T) && !silent) T.visible_message("[src] neatly folds inwards, compacting down to a rectangular card.") if(client) src.stop_pulling() @@ -401,11 +454,15 @@ H.loc = get_turf(src) src.loc = get_turf(H) - // Move us into the card and move the card to the ground. - src.loc = card - card.loc = get_turf(card) - src.forceMove(card) - card.forceMove(card.loc) + if(isbelly(loc)) //If in tumby, when fold up, card go into tumby + var/obj/belly/B = loc + src.forceMove(card) + card.forceMove(B) + else //Otherwise go on floor + src.loc = card + card.loc = get_turf(card) + src.forceMove(card) + card.forceMove(card.loc) canmove = 1 resting = 0 icon_state = "[chassis]" @@ -438,11 +495,15 @@ idcard.access |= ID.access to_chat(user, "You add the access from the [W] to [src].") to_chat(src, "\The [user] swipes the [W] over you. You copy the access codes.") + if(radio) + radio.recalculateChannels() return if("Remove Access") idcard.access = list() to_chat(user, "You remove the access from [src].") to_chat(src, "\The [user] swipes the [W] over you, removing access codes from you.") + if(radio) + radio.recalculateChannels() return if("Cancel") return diff --git a/code/modules/mob/living/silicon/pai/pai_hud.dm b/code/modules/mob/living/silicon/pai/pai_hud.dm new file mode 100644 index 0000000000..c7109d8aff --- /dev/null +++ b/code/modules/mob/living/silicon/pai/pai_hud.dm @@ -0,0 +1,409 @@ +/mob/living/silicon/pai + var/obj/screen/pai/pai_fold_display = null + +/obj/screen/pai + icon = 'icons/mob/pai_hud.dmi' + var/base_state + +/obj/screen/pai/Click_vr(location, control, params) + if(!usr) return 1 + if(!ispAI(usr)) return 1 + var/mob/living/silicon/pai/p = usr + switch(name) + if("fold/unfold") + if(p.loc == p.card) + p.fold_out() + else + p.fold_up() + if("choose chassis") + p.choose_chassis() + + if("software interface") + p.paiInterface() + + if("radio configuration") + p.radio.tgui_interact(p) + + if("pda") + p.pda.cmd_pda_open_ui() + + if("communicator") + p.communicator.activate() + + if("known languages") + p.check_languages() + + if("software toggle") + p.refresh_software_status() + if(p.hud_used.inventory_shown) + p.hud_used.inventory_shown = 0 + p.client.screen -= p.hud_used.other + else + p.hud_used.inventory_shown = 1 + p.client.screen += p.hud_used.other + + if("directives") + p.directives() + + if("crew manifest") + p.crew_manifest() + + if("universal translator") + p.translator() + + if("medical records") + p.med_records() + + if("security records") + p.sec_records() + + if("remote signaler") + p.remote_signal() + + if("atmosphere sensor") + p.atmos_sensor() + + if("door jack") + p.door_jack() + + if("ar hud") + p.ar_hud() + +/obj/screen/pai/pai_fold_display + name = "fold/unfold" + icon = 'icons/mob/pai_hud.dmi' + +/datum/hud + var/list/hud_elements = list() + +/mob/living/silicon/pai/create_mob_hud(datum/hud/HUD) + ..() + + var/ui_style = 'icons/mob/pai_hud.dmi' + + var/ui_color = "#ffffff" + var/ui_alpha = 255 + + var/list/adding = list() + var/list/other = list() + var/list/hotkeybuttons = list() + var/list/hud_elements = list() + + HUD.adding = adding + HUD.other = other + HUD.hotkeybuttons = hotkeybuttons + HUD.hud_elements = hud_elements + + var/obj/screen/pai/using + + //Small intent quarters + + using = new /obj/screen() + using.name = I_HELP + using.icon = ui_style + using.icon_state = "intent_help-s" + using.screen_loc = ui_acti + using.alpha = ui_alpha + using.layer = LAYER_HUD_ITEM //These sit on the intent box + HUD.adding += using + HUD.help_intent = using + + using = new /obj/screen() + using.name = I_DISARM + using.icon = ui_style + using.icon_state = "intent_disarm-n" + using.screen_loc = ui_acti + using.alpha = ui_alpha + using.layer = LAYER_HUD_ITEM + HUD.adding += using + HUD.disarm_intent = using + + using = new /obj/screen() + using.name = I_GRAB + using.icon = ui_style + using.icon_state = "intent_grab-n" + using.screen_loc = ui_acti + using.alpha = ui_alpha + using.layer = LAYER_HUD_ITEM + HUD.adding += using + HUD.grab_intent = using + + using = new /obj/screen() + using.name = I_HURT + using.icon = ui_style + using.icon_state = "intent_harm-n" + using.screen_loc = ui_acti + using.alpha = ui_alpha + using.layer = LAYER_HUD_ITEM + HUD.adding += using + HUD.hurt_intent = using + + //Move intent (walk/run) + using = new /obj/screen() + using.name = "mov_intent" + using.icon = ui_style + using.icon_state = (m_intent == "run" ? "running" : "walking") + using.screen_loc = ui_movi + using.color = ui_color + using.alpha = ui_alpha + HUD.adding += using + HUD.move_intent = using + + //Resist button + using = new /obj/screen() + using.name = "resist" + using.icon = ui_style + using.icon_state = "act_resist" + using.screen_loc = ui_movi + using.color = ui_color + using.alpha = ui_alpha + HUD.hotkeybuttons += using + + //Pull button + pullin = new /obj/screen() + pullin.icon = ui_style + pullin.icon_state = "pull0" + pullin.name = "pull" + pullin.screen_loc = ui_movi + HUD.hotkeybuttons += pullin + HUD.hud_elements |= pullin + + //Health status + healths = new /obj/screen() + healths.icon = ui_style + healths.icon_state = "health0" + healths.name = "health" + healths.screen_loc = ui_health + HUD.hud_elements |= healths + + pain = new /obj/screen( null ) + + zone_sel = new /obj/screen/zone_sel( null ) + zone_sel.icon = ui_style + zone_sel.color = ui_color + zone_sel.alpha = ui_alpha + zone_sel.cut_overlays() + zone_sel.update_icon() + HUD.hud_elements |= zone_sel + + pai_fold_display = new /obj/screen/pai/pai_fold_display() + pai_fold_display.screen_loc = ui_health + pai_fold_display.icon_state = "folded" + HUD.hud_elements |= pai_fold_display + + //Choose chassis button + using = new /obj/screen/pai() + using.name = "choose chassis" + using.icon_state = "choose_chassis" + using.screen_loc = ui_movi + using.color = ui_color + using.alpha = ui_alpha + hud_elements |= using + + //Software interface button + using = new /obj/screen/pai() + using.name = "software interface" + using.icon_state = "software_interface" + using.screen_loc = ui_acti + using.color = ui_color + using.alpha = ui_alpha + hud_elements |= using + + //Radio configuration button + using = new /obj/screen/pai() + using.name = "radio configuration" + using.icon_state = "radio_configuration" + using.screen_loc = ui_acti + using.color = ui_color + using.alpha = ui_alpha + hud_elements |= using + + //PDA button + using = new /obj/screen/pai() + using.name = "pda" + using.icon_state = "pda" + using.screen_loc = ui_pai_comms + using.color = ui_color + using.alpha = ui_alpha + hud_elements |= using + + //Communicator button + using = new /obj/screen/pai() + using.name = "communicator" + using.icon_state = "communicator" + using.screen_loc = ui_pai_comms + using.color = ui_color + using.alpha = ui_alpha + hud_elements |= using + + //Language button + using = new /obj/screen/pai() + using.name = "known languages" + using.icon_state = "language" + using.screen_loc = ui_acti + using.color = ui_color + using.alpha = ui_alpha + hud_elements |= using + + using = new /obj/screen/pai() + using.name = "software toggle" + using.icon_state = "software" + using.screen_loc = ui_inventory + using.color = ui_color + using.alpha = ui_alpha + hud_elements |= using + + using = new /obj/screen/pai() + using.name = "directives" + using.icon_state = "directives" + using.screen_loc = "WEST:6,SOUTH:18" + using.color = ui_color + using.alpha = ui_alpha + other |= using + + using = new /obj/screen/pai() + using.name = "crew manifest" + using.icon_state = "manifest" + using.screen_loc = "WEST:6,SOUTH+1:2" + using.color = ui_color + using.alpha = ui_alpha + other |= using + + using = new /obj/screen/pai() + using.name = "medical records" + using.base_state = "med_records" + using.screen_loc = "WEST:6,SOUTH+1:18" + using.color = ui_color + using.alpha = ui_alpha + other |= using + + using = new /obj/screen/pai() + using.name = "security records" + using.base_state = "sec_records" + using.screen_loc = "WEST:6,SOUTH+2:2" + using.color = ui_color + using.alpha = ui_alpha + other |= using + + using = new /obj/screen/pai() + using.name = "atmosphere sensor" + using.base_state = "atmos_sensor" + using.screen_loc = "WEST:6,SOUTH+2:18" + using.color = ui_color + using.alpha = ui_alpha + other |= using + + using = new /obj/screen/pai() + using.name = "remote signaler" + using.base_state = "signaller" + using.screen_loc = "WEST:6,SOUTH+3:2" + using.color = ui_color + using.alpha = ui_alpha + other |= using + + using = new /obj/screen/pai() + using.name = "universal translator" + using.base_state = "translator" + using.screen_loc = "WEST:6,SOUTH+3:18" + using.color = ui_color + using.alpha = ui_alpha + other |= using + + using = new /obj/screen/pai() + using.name = "door jack" + using.base_state = "door_jack" + using.screen_loc = "WEST:6,SOUTH+4:2" + using.color = ui_color + using.alpha = ui_alpha + other |= using + + using = new /obj/screen/pai() + using.name = "ar hud" + using.base_state = "ar_hud" + using.screen_loc = "WEST:6,SOUTH+4:18" + using.color = ui_color + using.alpha = ui_alpha + other |= using + + if(client) + client.screen = list() + client.screen += hud_elements + client.screen += adding + hotkeybuttons + client.screen += client.void + + HUD.inventory_shown = 0 + + +/mob/living/silicon/pai/handle_regular_hud_updates() + . = ..() + if(healths) + if(stat != DEAD) + var/heal_per = (health / getMaxHealth()) * 100 + switch(heal_per) + if(100 to INFINITY) + healths.icon_state = "health0" + if(80 to 100) + healths.icon_state = "health1" + if(60 to 80) + healths.icon_state = "health2" + if(40 to 60) + healths.icon_state = "health3" + if(20 to 40) + healths.icon_state = "health4" + if(0 to 20) + healths.icon_state = "health5" + else + healths.icon_state = "health6" + else + healths.icon_state = "health7" + + if(pai_fold_display) + if(loc == card) + pai_fold_display.icon_state = "folded" + else + pai_fold_display.icon_state = "unfolded" + +/mob/living/silicon/pai/toggle_hud_vis(full) + if(!client) + return FALSE + + if(hud_used.hud_shown) + hud_used.hud_shown = 0 + if(hud_used.adding) + client.screen -= hud_used.adding + if(hud_used.other) + client.screen -= hud_used.other + if(hud_used.hotkeybuttons) + client.screen -= hud_used.hotkeybuttons + if(hud_used.other_important) + client.screen -= hud_used.other_important + if(hud_used.hud_elements) + client.screen -= hud_used.hud_elements + + else + hud_used.hud_shown = 1 + if(hud_used.adding) + client.screen += hud_used.adding + if(hud_used.other && hud_used.inventory_shown) + client.screen += hud_used.other + if(hud_used.other_important) + client.screen += hud_used.other_important + if(hud_used.hotkeybuttons && !hud_used.hotkey_ui_hidden) + client.screen += hud_used.hotkeybuttons + if(healths) + client.screen |= healths + if(internals) + client.screen |= internals + if(gun_setting_icon) + client.screen |= gun_setting_icon + if(hud_used.hud_elements) + client.screen |= hud_used.hud_elements + + hud_used?.action_intent.screen_loc = ui_acti //Restore intent selection to the original position + client.screen += zone_sel //This one is a special snowflake + + hud_used.hidden_inventory_update() + hud_used.persistant_inventory_update() + update_action_buttons() + hud_used.reorganize_alerts() + return TRUE diff --git a/code/modules/mob/living/silicon/pai/pai_vr.dm b/code/modules/mob/living/silicon/pai/pai_vr.dm index f8eef7b8fe..86ef6cca5a 100644 --- a/code/modules/mob/living/silicon/pai/pai_vr.dm +++ b/code/modules/mob/living/silicon/pai/pai_vr.dm @@ -3,8 +3,13 @@ icon = 'icons/mob/pai_vr.dmi' softfall = TRUE var/eye_glow = TRUE + var/hide_glow = FALSE var/image/eye_layer = null // Holds the eye overlay. var/eye_color = "#00ff0d" + var/icon/holo_icon + var/icon/holo_icon_north + var/holo_icon_dimension_X = 32 + var/holo_icon_dimension_Y = 32 var/global/list/wide_chassis = list( "rat", "panther", @@ -38,18 +43,51 @@ "pai-fen", "cyberelf", "teppi", - "catslug" + "catslug", + "car", + "typeone", + "13" ) + //These vars keep track of whether you have the related software, used for easily updating the UI + var/soft_ut = FALSE //universal translator + var/soft_mr = FALSE //medical records + var/soft_sr = FALSE //security records + var/soft_dj = FALSE //door jack + var/soft_as = FALSE //atmosphere sensor + var/soft_si = FALSE //signaler + var/soft_ar = FALSE //ar hud /mob/living/silicon/pai/Initialize() . = ..() - - verbs |= /mob/living/proc/hide + verbs |= /mob/proc/dominate_predator verbs |= /mob/living/proc/dominate_prey verbs |= /mob/living/proc/set_size verbs |= /mob/living/proc/shred_limb +/mob/living/silicon/pai/Login() + . = ..() + if(!holo_icon) + last_special = world.time + 100 //Let's give get_character_icon time to work + get_character_icon() + if(stat == DEAD) + healths.icon_state = "health7" + +/mob/living/silicon/pai/proc/full_restore() + adjustBruteLoss(- bruteloss) + adjustFireLoss(- fireloss) + do_after(src, 1 SECONDS) + card.setEmotion(16) + stat = CONSCIOUS + do_after(src, 5 SECONDS) + var/mob/observer/dead/ghost = src.get_ghost() + if(ghost) + ghost.notify_revive("Someone is trying to revive you. Re-enter your body if you want to be revived!", 'sound/effects/pai-restore.ogg', source = card) + canmove = TRUE + card.setEmotion(15) + playsound(card, 'sound/effects/pai-restore.ogg', 50, FALSE) + card.visible_message("\The [card] chimes.", runemessage = "chime") + /mob/living/silicon/pai/proc/pai_nom(var/mob/living/T in oview(1)) set name = "pAI Nom" set category = "pAI Commands" @@ -68,6 +106,11 @@ /mob/living/silicon/pai/update_icon() //Some functions cause this to occur, such as resting ..() + if(chassis == "13") + icon = holo_icon + add_eyes() + return + update_fullness_pai() if(!people_eaten && !resting) @@ -96,6 +139,10 @@ /mob/living/silicon/pai/update_icons() //And other functions cause this to occur, such as digesting someone. ..() + if(chassis == "13") + icon = holo_icon + add_eyes() + return update_fullness_pai() if(!people_eaten && !resting) icon_state = "[chassis]" @@ -122,9 +169,15 @@ choice = tgui_input_list(usr, "What would you like to use for your mobile chassis icon?", "Chassis Choice", possible_chassis) if(!choice) return var/oursize = size_multiplier - resize(1, FALSE, TRUE, TRUE, FALSE) //We resize ourselves to normal here for a moment to let the vis_height get reset + resize(1, FALSE, TRUE, TRUE, FALSE) //We resize ourselves to normal here for a moment to let the vis_height get reset chassis = possible_chassis[choice] - if(chassis in wide_chassis) + if(chassis == "13") + if(!holo_icon) + if(!get_character_icon()) + return + icon_state = null + icon = holo_icon + else if(chassis in wide_chassis) icon = 'icons/mob/pai_vr64x64.dmi' vis_height = 64 else @@ -144,11 +197,13 @@ /mob/living/silicon/pai/verb/toggle_eyeglow() set category = "pAI Commands" set name = "Toggle Eye Glow" + if(chassis in allows_eye_color) - if(eye_glow) + if(eye_glow && !hide_glow) eye_glow = FALSE else eye_glow = TRUE + hide_glow = FALSE update_icon() else to_chat(src, "Your selected chassis cannot modify its eye glow!") @@ -171,18 +226,41 @@ // Release belly contents before being gc'd! /mob/living/silicon/pai/Destroy() release_vore_contents() + if(ckey) + paikeys -= ckey + return ..() + +/mob/living/silicon/pai/clear_client() + if(ckey) + paikeys -= ckey return ..() /mob/living/silicon/pai/proc/add_eyes() remove_eyes() - if(chassis in allows_eye_color) - if(!eye_layer) - eye_layer = image(icon, "[icon_state]-eyes") - eye_layer.appearance_flags = appearance_flags - eye_layer.color = eye_color - if(eye_glow) - eye_layer.plane = PLANE_LIGHTING_ABOVE - add_overlay(eye_layer) + if(chassis == "13") + if(holo_icon.Width() > 32) + holo_icon_dimension_X = 64 + pixel_x = -16 + default_pixel_x = -16 + if(holo_icon.Height() > 32) + holo_icon_dimension_Y = 64 + if(holo_icon_dimension_X == 32 && holo_icon_dimension_Y == 32) + eye_layer = image('icons/mob/pai_vr.dmi', "type13-eyes") + else if(holo_icon_dimension_X == 32 && holo_icon_dimension_Y == 64) + eye_layer = image('icons/mob/pai_vr32x64.dmi', "type13-eyes") + else if(holo_icon_dimension_X == 64 && holo_icon_dimension_Y == 32) + eye_layer = image('icons/mob/pai_vr64x32.dmi', "type13-eyes") + else if(holo_icon_dimension_X == 64 && holo_icon_dimension_Y == 64) + eye_layer = image('icons/mob/pai_vr64x64.dmi', "type13-eyes") + else + else if(chassis in allows_eye_color) + eye_layer = image(icon, "[icon_state]-eyes") + else return + eye_layer.appearance_flags = appearance_flags + eye_layer.color = eye_color + if(eye_glow && !hide_glow) + eye_layer.plane = PLANE_LIGHTING_ABOVE + add_overlay(eye_layer) /mob/living/silicon/pai/proc/remove_eyes() cut_overlay(eye_layer) @@ -195,22 +273,387 @@ if(!ismob(A) || A == src) return + switch(a_intent) + if(I_HELP) + if(isliving(A)) + hug(src, A) + if(I_GRAB) + pai_nom(A) + +/mob/living/silicon/pai/proc/hug(var/mob/living/silicon/pai/H, var/mob/living/target) + var/t_him = "them" - if(ishuman(A)) - var/mob/living/carbon/human/T = A - if(!T.species.ambiguous_genders) - switch(T.identifying_gender) - if(MALE) - t_him = "him" - if(FEMALE) - t_him = "her" - else - t_him = "them" - else - switch(A.gender) + if(ishuman(target)) + var/mob/living/carbon/human/T = target + switch(T.identifying_gender) if(MALE) t_him = "him" if(FEMALE) t_him = "her" - visible_message("\The [src] hugs [A] to make [t_him] feel better!", \ - "You hug [A] to make [t_him] feel better!") \ No newline at end of file + if(NEUTER) + t_him = "it" + if(HERM) + t_him = "hir" + else + t_him = "them" + else + switch(target.gender) + if(MALE) + t_him = "him" + if(FEMALE) + t_him = "her" + if(NEUTER) + t_him = "it" + if(HERM) + t_him = "hir" + else + t_him = "them" + + if(H.zone_sel.selecting == "head") + H.visible_message( \ + "[H] pats [target] on the head.", \ + "You pat [target] on the head.", ) + else if(H.zone_sel.selecting == "r_hand" || H.zone_sel.selecting == "l_hand") + H.visible_message( \ + "[H] shakes [target]'s hand.", \ + "You shake [target]'s hand.", ) + else if(H.zone_sel.selecting == "mouth") + H.visible_message( \ + "[H] boops [target]'s nose.", \ + "You boop [target] on the nose.", ) + else + H.visible_message("[H] hugs [target] to make [t_him] feel better!", \ + "You hug [target] to make [t_him] feel better!") + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + +/mob/living/silicon/pai/proc/savefile_path(mob/user) + return "data/player_saves/[copytext(user.ckey, 1, 2)]/[user.ckey]/pai.sav" + +/mob/living/silicon/pai/proc/savefile_save(mob/user) + if(IsGuestKey(user.key)) + return 0 + + var/savefile/F = new /savefile(src.savefile_path(user)) + + + F["name"] << src.name + F["description"] << src.flavor_text + F["eyecolor"] << src.eye_color + F["chassis"] << src.chassis + F["emotion"] << src.card.current_emotion + F["gender"] << src.gender + F["version"] << 1 + + return 1 + +/mob/living/silicon/pai/proc/savefile_load(mob/user, var/silent = 1) + if (IsGuestKey(user.key)) + return 0 + + var/path = savefile_path(user) + + if (!fexists(path)) + return 0 + + var/savefile/F = new /savefile(path) + + if(!F) return //Not everyone has a pai savefile. + + var/version = null + F["version"] >> version + + if (isnull(version) || version != 1) + fdel(path) + if (!silent) + tgui_alert_async(user, "Your savefile was incompatible with this version and was deleted.") + return 0 + var/ourname + var/ouremotion + var/ourdesc + var/oureyes + var/ourchassis + var/ourgender + F["name"] >> ourname + F["description"] >> ourdesc + F["eyecolor"] >> oureyes + F["chassis"] >> ourchassis + F["emotion"] >> ouremotion + F["gender"] >> ourgender + if(ourname) + SetName(ourname) + if(ourdesc) + flavor_text = ourdesc + if(ourchassis) + chassis = ourchassis + if(ourgender) + gender = ourgender + if(oureyes) + card.screen_color = oureyes + eye_color = oureyes + if(ouremotion) + card.setEmotion(ouremotion) + + update_icon() + return 1 + +/mob/living/silicon/pai/verb/save_pai_to_slot() + set category = "pAI Commands" + set name = "Save Configuration" + savefile_save(src) + to_chat(src, "[name] configuration saved to global pAI settings.") + +/mob/living/silicon/pai/a_intent_change(input as text) + . = ..() + + switch(a_intent) + if(I_HELP) + hud_used.help_intent.icon_state = "intent_help-s" + hud_used.disarm_intent.icon_state = "intent_disarm-n" + hud_used.grab_intent.icon_state = "intent_grab-n" + hud_used.hurt_intent.icon_state = "intent_harm-n" + + if(I_DISARM) + hud_used.help_intent.icon_state = "intent_help-n" + hud_used.disarm_intent.icon_state = "intent_disarm-s" + hud_used.grab_intent.icon_state = "intent_grab-n" + hud_used.hurt_intent.icon_state = "intent_harm-n" + + if(I_GRAB) + hud_used.help_intent.icon_state = "intent_help-n" + hud_used.disarm_intent.icon_state = "intent_disarm-n" + hud_used.grab_intent.icon_state = "intent_grab-s" + hud_used.hurt_intent.icon_state = "intent_harm-n" + + if(I_HURT) + hud_used.help_intent.icon_state = "intent_help-n" + hud_used.disarm_intent.icon_state = "intent_disarm-n" + hud_used.grab_intent.icon_state = "intent_grab-n" + hud_used.hurt_intent.icon_state = "intent_harm-s" + +/mob/living/silicon/pai/verb/toggle_gender_identity_vr() + set name = "Set Gender Identity" + set desc = "Sets the pronouns when examined and performing an emote." + set category = "IC" + var/new_gender_identity = tgui_input_list(usr, "Please select a gender Identity:", "Set Gender Identity", list(FEMALE, MALE, NEUTER, PLURAL, HERM)) + if(!new_gender_identity) + return 0 + gender = new_gender_identity + return 1 + +/mob/living/silicon/pai/verb/pai_hide() + set name = "Hide" + set desc = "Allows to hide beneath tables or certain items. Toggled on or off." + set category = "Abilities" + + hide() + if(status_flags & HIDING) + hide_glow = TRUE + else + hide_glow = FALSE + update_icon() + +/mob/living/silicon/pai/verb/screen_message(message as text|null) + set category = "pAI Commands" + set name = "Screen Message" + set desc = "Allows you to display a message on your screen. This will show up in the chat of anyone who is holding your card." + + if (src.client) + if(client.prefs.muted & MUTE_IC) + to_chat(src, "You cannot speak in IC (muted).") + return + if(loc != card) + to_chat(src, "Your message won't be visible while unfolded!") + if (!message) + message = tgui_input_text(src, "Enter text you would like to show on your screen.","Screen Message") + message = sanitize_or_reflect(message,src) + if (!message) + return + message = capitalize(message) + if (stat == DEAD) + return + card.screen_msg = message + var/logmsg = "(CARD SCREEN)[message]" + log_say(logmsg,src) + to_chat(src, "You print a message to your screen, \"[message]\"") + if(isliving(card.loc)) + var/mob/living/L = card.loc + if(L.client) + to_chat(L, "[src.name]'s screen prints, \"[message]\"") + else return + else if(isbelly(card.loc)) + var/obj/belly/b = card.loc + if(b.owner.client) + to_chat(b.owner, "[src.name]'s screen prints, \"[message]\"") + else return + else if(istype(card.loc, /obj/item/device/pda)) + var/obj/item/device/pda/p = card.loc + if(isliving(p.loc)) + var/mob/living/L = p.loc + if(L.client) + to_chat(L, "[src.name]'s screen prints, \"[message]\"") + else return + else if(isbelly(p.loc)) + var/obj/belly/b = card.loc + if(b.owner.client) + to_chat(b.owner, "[src.name]'s screen prints, \"[message]\"") + else return + else return + else return + to_chat(src, "Your message was relayed.") + for (var/mob/G in player_list) + if (istype(G, /mob/new_player)) + continue + else if(isobserver(G) && G.is_preference_enabled(/datum/client_preference/ghost_ears)) + if(is_preference_enabled(/datum/client_preference/whisubtle_vis) || G.client.holder) + to_chat(G, "[src.name]'s screen prints, \"[message]\"") + +/mob/living/silicon/pai/proc/touch_window(soft_name) //This lets us touch TGUI procs and windows that may be nested behind other TGUI procs and windows + if(stat != CONSCIOUS) //so we can access our software without having to open up the software interface TGUI window + to_chat(src, "You can't do that right now.") + return + for(var/thing in software) + var/datum/pai_software/S = software[thing] + if(istype(S, /datum/pai_software) && S.name == soft_name) + if(S.toggle) + S.toggle(src) + to_chat(src, "You toggled [S.name].") + refresh_software_status() + else + S.tgui_interact(src) + refresh_software_status() + return + for(var/thing in pai_software_by_key) + var/datum/pai_software/our_soft = pai_software_by_key[thing] + if(our_soft.name == soft_name) + if(!(ram >= our_soft.ram_cost)) + to_chat(src, "Insufficient RAM for download. (Cost [our_soft.ram_cost] : [ram] Remaining)") + return + if(tgui_alert(src, "Do you want to download [our_soft.name]? It costs [our_soft.ram_cost], and you have [ram] remaining.", "Download [our_soft.name]", list("Yes", "No")) == "Yes") + ram -= our_soft.ram_cost + software[our_soft.id] = our_soft + to_chat(src, "You downloaded [our_soft.name]. ([ram] RAM remaining.)") + refresh_software_status() + +/mob/living/silicon/pai/proc/refresh_software_status() //This manages the pAI software status buttons icon states based on if you have them and if they are enabled + for(var/thing in software) //this only gets called when you click one of the relevent buttons, rather than all the time! + var/datum/pai_software/soft = software[thing] + if(istype(soft,/datum/pai_software/med_records)) + soft_mr = TRUE + if(istype(soft,/datum/pai_software/sec_records)) + soft_sr = TRUE + if(istype(soft,/datum/pai_software/door_jack)) + soft_dj = TRUE + if(istype(soft,/datum/pai_software/atmosphere_sensor)) + soft_as = TRUE + if(istype(soft,/datum/pai_software/pai_hud)) + soft_ar = TRUE + if(istype(soft,/datum/pai_software/translator)) + soft_ut = TRUE + if(istype(soft,/datum/pai_software/signaller)) + soft_si = TRUE + for(var/obj/screen/pai/button in hud_used.other) + if(button.name == "medical records") + if(soft_mr) + button.icon_state = "[button.base_state]" + else + button.icon_state = "[button.base_state]_o" + if(button.name == "security records") + if(soft_sr) + button.icon_state = "[button.base_state]" + else + button.icon_state = "[button.base_state]_o" + if(button.name == "door jack") + if(soft_dj) + button.icon_state = "[button.base_state]" + else + button.icon_state = "[button.base_state]_o" + if(button.name == "atmosphere sensor") + if(soft_as) + button.icon_state = "[button.base_state]" + else + button.icon_state = "[button.base_state]_o" + if(button.name == "remote signaler") + if(soft_si) + button.icon_state = "[button.base_state]" + else + button.icon_state = "[button.base_state]_o" + if(button.name == "universal translator") + if(soft_ut && translator_on) + button.icon_state = "[button.base_state]" + else + button.icon_state = "[button.base_state]_o" + if(button.name == "ar hud") + if(soft_ar && paiHUD) + button.icon_state = "[button.base_state]" + else + button.icon_state = "[button.base_state]_o" + +//Procs for using the various UI buttons for your softwares +/mob/living/silicon/pai/proc/directives() + touch_window("Directives") + +/mob/living/silicon/pai/proc/crew_manifest() + touch_window("Crew Manifest") + +/mob/living/silicon/pai/proc/med_records() + touch_window("Medical Records") + +/mob/living/silicon/pai/proc/sec_records() + touch_window("Security Records") + +/mob/living/silicon/pai/proc/remote_signal() + touch_window("Remote Signaler") + +/mob/living/silicon/pai/proc/atmos_sensor() + touch_window("Atmosphere Sensor") + +/mob/living/silicon/pai/proc/translator() + touch_window("Universal Translator") + +/mob/living/silicon/pai/proc/door_jack() + touch_window("Door Jack") + +/mob/living/silicon/pai/proc/ar_hud() + touch_window("AR HUD") + +/mob/living/silicon/pai/proc/get_character_icon() + if(!client || !client.prefs) return FALSE + var/mob/living/carbon/human/dummy/dummy = new () + //This doesn't include custom_items because that's ... hard. + client.prefs.dress_preview_mob(dummy) + sleep(1 SECOND) //Strange bug in preview code? Without this, certain things won't show up. Yay race conditions? + dummy.regenerate_icons() + + var/icon/new_holo = getCompoundIcon(dummy) + + dummy.tail_alt = TRUE + dummy.set_dir(NORTH) + var/icon/new_holo_north = getCompoundIcon(dummy) + + qdel(holo_icon) + qdel(holo_icon_north) + qdel(dummy) + holo_icon = new_holo + holo_icon_north = new_holo_north + return TRUE + +/mob/living/silicon/pai/set_dir(var/new_dir) + . = ..() + if(. && (chassis == "13")) + switch(dir) + if(SOUTH) + icon = holo_icon + else + icon = holo_icon_north + +/mob/living/silicon/pai/adjustBruteLoss(amount, include_robo) + . = ..() + if(amount > 0 && health <= 90) //Something's probably attacking us! + if(prob(amount)) //The more damage it is doing, the more likely it is to damage something important! + card.damage_random_component() + +/mob/living/silicon/pai/adjustFireLoss(amount, include_robo) + . = ..() + if(amount > 0 && health <= 90) + if(prob(amount)) + card.damage_random_component() diff --git a/code/modules/mob/living/silicon/pai/personality.dm b/code/modules/mob/living/silicon/pai/personality.dm index 73ae49dcb7..96f9f5ab46 100644 --- a/code/modules/mob/living/silicon/pai/personality.dm +++ b/code/modules/mob/living/silicon/pai/personality.dm @@ -57,4 +57,9 @@ F["description"] >> src.description F["role"] >> src.role F["comments"] >> src.comments + F["eyecolor"] >> src.eye_color + F["chassis"] >> src.chassis + F["emotion"] >> src.ouremotion + F["gender"] >> src.gender + return 1 diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index 6c50e6efec..588d0cf00d 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -1,373 +1,398 @@ -//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33 - -// Recruiting observers to play as pAIs - -var/datum/paiController/paiController // Global handler for pAI candidates - -/datum/paiCandidate - var/name - var/key - var/description - var/role - var/comments - var/ready = 0 - - -/hook/startup/proc/paiControllerSetup() - paiController = new /datum/paiController() - return 1 - - -/datum/paiController - var/inquirer = null - var/list/pai_candidates = list() - var/list/asked = list() - - var/askDelay = 10 * 60 * 1 // One minute [ms * sec * min] - -/datum/paiController/Topic(href, href_list[]) - if(href_list["download"]) - var/datum/paiCandidate/candidate = locate(href_list["candidate"]) - var/obj/item/device/paicard/card = locate(href_list["device"]) - if(card.pai) - return - if(istype(card,/obj/item/device/paicard) && istype(candidate,/datum/paiCandidate)) - var/mob/living/silicon/pai/pai = new(card) - if(!candidate.name) - pai.name = pick(ninja_names) - else - pai.name = candidate.name - pai.real_name = pai.name - pai.key = candidate.key - - card.setPersonality(pai) - card.looking_for_personality = 0 - - if(pai.mind) update_antag_icons(pai.mind) - - pai_candidates -= candidate - usr << browse(null, "window=findPai") - - if(href_list["new"]) - var/datum/paiCandidate/candidate = locate(href_list["candidate"]) - var/option = href_list["option"] - var/t = "" - - switch(option) - if("name") - t = sanitizeSafe(input(usr, "Enter a name for your pAI", "pAI Name", candidate.name) as text, MAX_NAME_LEN) - if(t) - candidate.name = t - if("desc") - t = input(usr, "Enter a description for your pAI", "pAI Description", candidate.description) as message - if(t) - candidate.description = sanitize(t) - if("role") - t = input(usr, "Enter a role for your pAI", "pAI Role", candidate.role) as text - if(t) - candidate.role = sanitize(t) - if("ooc") - t = input(usr, "Enter any OOC comments", "pAI OOC Comments", candidate.comments) as message - if(t) - candidate.comments = sanitize(t) - if("save") - candidate.savefile_save(usr) - if("load") - candidate.savefile_load(usr) - //In case people have saved unsanitized stuff. - if(candidate.name) - candidate.name = sanitizeSafe(candidate.name, MAX_NAME_LEN) - if(candidate.description) - candidate.description = sanitize(candidate.description) - if(candidate.role) - candidate.role = sanitize(candidate.role) - if(candidate.comments) - candidate.comments = sanitize(candidate.comments) - - if("submit") - if(candidate) - candidate.ready = 1 - for(var/obj/item/device/paicard/p in GLOB.all_pai_cards) - if(p.looking_for_personality == 1) - p.alertUpdate() - usr << browse(null, "window=paiRecruit") - return - - recruitWindow(usr, href_list["allow_submit"] != "0") - -/datum/paiController/proc/recruitWindow(var/mob/M as mob, allowSubmit = 1) - var/datum/paiCandidate/candidate - for(var/datum/paiCandidate/c in pai_candidates) - if(!istype(c) || !istype(M)) - break - if(c.key == M.key) - candidate = c - if(!candidate) - candidate = new /datum/paiCandidate() - candidate.key = M.key - pai_candidates.Add(candidate) - - var/dat = "" - dat += {" - - "} - - dat += {" - - pAI Personality Configuration -
Please configure your pAI personality's options. Remember, what you enter here could determine whether or not the user requesting a personality chooses you!
- -| Name: | -[candidate.name] | -
|---|---|
| What you plan to call yourself. Suggestions: Any character name you would choose for a station character OR an AI. | -|
| Description: | -[candidate.description] | -
| What sort of pAI you typically play; your mannerisms, your quirks, etc. This can be as sparse or as detailed as you like. | -|
| Preferred Role: | -[candidate.role] | -
| Do you like to partner with sneaky social ninjas? Like to help security hunt down thugs? Enjoy watching an engineer's back while he saves the station yet again? This doesn't have to be limited to just station jobs. Pretty much any general descriptor for what you'd like to be doing works here. | -|
| OOC Comments: | -[candidate.comments] | -
| Anything you'd like to address specifically to the player reading this in an OOC manner. \"I prefer more serious RP.\", \"I'm still learning the interface!\", etc. Feel free to leave this blank if you want. | -
-
| - Save Personality - | -
| - Load Personality - | -
- "} - if(allowSubmit) - dat += {" -
| Submit Personality | -
- "} - dat += {" - - "} - - M << browse(dat, "window=paiRecruit;size=580x580;") - -/datum/paiController/proc/findPAI(var/obj/item/device/paicard/p, var/mob/user) - requestRecruits(user) - var/list/available = list() - for(var/datum/paiCandidate/c in paiController.pai_candidates) - if(c.ready) - var/found = 0 - for(var/mob/observer/dead/o in player_list) - if(o.key == c.key && o.MayRespawn()) - found = 1 - if(found) - available.Add(c) - var/dat = "" - - dat += {" - - - - - - - pAI Availability List
- "} - dat += "
Displaying available AI personalities from central database... If there are no entries, or if a suitable entry is not listed, check again later as more personalities may be added.
" - - for(var/datum/paiCandidate/c in available) - dat += {" -| Name: | -[c.name] | -
|---|---|
| Description: | -[c.description] | -
| Preferred Role: | -[c.role] | -
| OOC Comments: | -[c.comments] | -
| Download [c.name] - | -
- "} - - dat += {" - - - "} - - user << browse(dat, "window=findPai") - - -/datum/paiController/proc/requestRecruits(var/mob/user) - inquirer = user - for(var/mob/observer/dead/O in player_list) - if(!O.MayRespawn()) - continue - if(jobban_isbanned(O, "pAI")) - continue - if(asked.Find(O.key)) - if(world.time < asked[O.key] + askDelay) - continue - else - asked.Remove(O.key) - if(O.client) - if(O.client.prefs.be_special & BE_PAI) - question(O.client) - -/datum/paiController/proc/question(var/client/C) - spawn(0) - if(!C) return - asked.Add(C.key) - asked[C.key] = world.time - var/response = tgui_alert(C, "[inquirer] is requesting a pAI personality. Would you like to play as a personal AI?", "pAI Request", list("Yes", "No", "Never for this round")) - if(!C) return //handle logouts that happen whilst the alert is waiting for a response. - if(response == "Yes") - recruitWindow(C.mob) - else if (response == "Never for this round") - C.prefs.be_special ^= BE_PAI +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33 + +// Recruiting observers to play as pAIs + +var/datum/paiController/paiController // Global handler for pAI candidates + +/datum/paiCandidate + var/name + var/key + var/description + var/role + var/comments + var/ready = 0 + var/chassis + var/ouremotion + var/eye_color + var/gender + +/hook/startup/proc/paiControllerSetup() + paiController = new /datum/paiController() + return 1 + + +/datum/paiController + var/inquirer = null + var/list/pai_candidates = list() + var/list/asked = list() + + var/askDelay = 10 * 60 * 1 // One minute [ms * sec * min] + +/datum/paiController/Topic(href, href_list[]) + if(href_list["download"]) + var/datum/paiCandidate/candidate = locate(href_list["candidate"]) + var/obj/item/device/paicard/card = locate(href_list["device"]) + if(card.pai) + return + if(istype(card,/obj/item/device/paicard) && istype(candidate,/datum/paiCandidate)) + var/mob/living/silicon/pai/pai = new(card) + pai.key = candidate.key + paikeys |= pai.ckey + card.setPersonality(pai) + if(!candidate.name) + pai.SetName(pick(ninja_names)) + else + pai.SetName(candidate.name) + if(candidate.description) + pai.flavor_text = candidate.description + if(candidate.eye_color) + pai.eye_color = candidate.eye_color + card.screen_color = pai.eye_color + if(candidate.chassis) + pai.chassis = candidate.chassis + if(candidate.ouremotion) + card.setEmotion(candidate.ouremotion) + if(candidate.gender) + pai.gender = candidate.gender + pai.update_icon() + pai.real_name = pai.name + card.looking_for_personality = 0 + + if(pai.mind) update_antag_icons(pai.mind) + + pai_candidates -= candidate + usr << browse(null, "window=findPai") + + if(href_list["new"]) + var/datum/paiCandidate/candidate = locate(href_list["candidate"]) + var/option = href_list["option"] + var/t = "" + + switch(option) + if("name") + t = sanitizeSafe(tgui_input_text(usr, "Enter a name for your pAI", "pAI Name", candidate.name, MAX_NAME_LEN), MAX_NAME_LEN) + if(t) + candidate.name = t + if("desc") + t = tgui_input_text(usr, "Enter a description for your pAI", "pAI Description", candidate.description, multiline = TRUE, prevent_enter = TRUE) + if(t) + candidate.description = sanitize(t) + if("role") + t = tgui_input_text(usr, "Enter a role for your pAI", "pAI Role", candidate.role) + if(t) + candidate.role = sanitize(t) + if("ooc") + t = tgui_input_text(usr, "Enter any OOC comments", "pAI OOC Comments", candidate.comments, multiline = TRUE, prevent_enter = TRUE) + if(t) + candidate.comments = sanitize(t) + if("save") + candidate.savefile_save(usr) + if("load") + candidate.savefile_load(usr) + //In case people have saved unsanitized stuff. + if(candidate.name) + candidate.name = sanitizeSafe(candidate.name, MAX_NAME_LEN) + if(candidate.description) + candidate.description = sanitize(candidate.description) + if(candidate.role) + candidate.role = sanitize(candidate.role) + if(candidate.comments) + candidate.comments = sanitize(candidate.comments) + + if("submit") + if(candidate) + candidate.ready = 1 + for(var/obj/item/device/paicard/p in GLOB.all_pai_cards) + if(p.looking_for_personality == 1) + p.alertUpdate() + usr << browse(null, "window=paiRecruit") + return + + recruitWindow(usr, href_list["allow_submit"] != "0") + +/datum/paiController/proc/recruitWindow(var/mob/M as mob, allowSubmit = 1) + var/datum/paiCandidate/candidate + for(var/datum/paiCandidate/c in pai_candidates) + if(!istype(c) || !istype(M)) + break + if(c.key == M.key) + candidate = c + if(!candidate) + candidate = new /datum/paiCandidate() + candidate.key = M.key + pai_candidates.Add(candidate) + + var/dat = "" + dat += {" + + "} + + dat += {" + + pAI Personality Configuration +
Please configure your pAI personality's options. Remember, what you enter here could determine whether or not the user requesting a personality chooses you!
+ +| Name: | +[candidate.name] | +
|---|---|
| What you plan to call yourself. Suggestions: Any character name you would choose for a station character OR an AI. | +|
| Description: | +[candidate.description] | +
| What sort of pAI you typically play; your mannerisms, your quirks, etc. This can be as sparse or as detailed as you like. | +|
| Preferred Role: | +[candidate.role] | +
| Do you like to partner with sneaky social ninjas? Like to help security hunt down thugs? Enjoy watching an engineer's back while he saves the station yet again? This doesn't have to be limited to just station jobs. Pretty much any general descriptor for what you'd like to be doing works here. | +|
| OOC Comments: | +[candidate.comments] | +
| Anything you'd like to address specifically to the player reading this in an OOC manner. \"I prefer more serious RP.\", \"I'm still learning the interface!\", etc. Feel free to leave this blank if you want. | +
+
| + Save Personality + | +
| + Load Personality + | +
+ "} + if(allowSubmit) + dat += {" +
| Submit Personality | +
+ "} + dat += {" + + "} + + M << browse(dat, "window=paiRecruit;size=580x580;") + +/datum/paiController/proc/findPAI(var/obj/item/device/paicard/p, var/mob/user) + requestRecruits(user) + var/list/available = list() + for(var/datum/paiCandidate/c in paiController.pai_candidates) + if(c.ready) + var/found = 0 + for(var/mob/observer/dead/o in player_list) + if(o.key == c.key && o.MayRespawn()) + found = 1 + if(found) + available.Add(c) + var/dat = "" + + dat += {" + + + + + + + pAI Availability List
+ "} + dat += "
Displaying available AI personalities from central database... If there are no entries, or if a suitable entry is not listed, check again later as more personalities may be added.
" + + for(var/datum/paiCandidate/c in available) + dat += {" +| Name: | +[c.name] | +
|---|---|
| Description: | +[c.description] | +
| Preferred Role: | +[c.role] | +
| OOC Comments: | +[c.comments] | +
| Download [c.name] + | +
+ "} + + dat += {" + + + "} + + user << browse(dat, "window=findPai") + + +/datum/paiController/proc/requestRecruits(var/mob/user) + inquirer = user + for(var/mob/observer/dead/O in player_list) + if(!O.MayRespawn()) + continue + if(jobban_isbanned(O, "pAI")) + continue + if(asked.Find(O.key)) + if(world.time < asked[O.key] + askDelay) + continue + else + asked.Remove(O.key) + if(O.client) + if(O.client.prefs.be_special & BE_PAI) + question(O.client) + +/datum/paiController/proc/question(var/client/C) + spawn(0) + if(!C) return + asked.Add(C.key) + asked[C.key] = world.time + + var/mob/ourmob = C.mob + if(ourmob) + var/time_till_respawn = ourmob.time_till_respawn() + if(time_till_respawn == -1 || time_till_respawn) + return + for(var/ourkey in paikeys) + if(ourkey == ourmob.ckey) + return + + var/response = tgui_alert(C, "[inquirer] is requesting a pAI personality. Would you like to play as a personal AI?", "pAI Request", list("Yes", "No", "Never for this round")) + if(!C) return //handle logouts that happen whilst the alert is waiting for a response. + if(response == "Yes") + recruitWindow(C.mob) + else if (response == "Never for this round") + C.prefs.be_special ^= BE_PAI diff --git a/code/modules/mob/living/silicon/pai/say.dm b/code/modules/mob/living/silicon/pai/say.dm index 4b18c42beb..ed38dfc9c8 100644 --- a/code/modules/mob/living/silicon/pai/say.dm +++ b/code/modules/mob/living/silicon/pai/say.dm @@ -1,5 +1,7 @@ /mob/living/silicon/pai/say(var/message, var/datum/language/speaking = null, var/whispering = 0) if(silence_time) to_chat(src, "Communication circuits remain uninitialized.") + else if(card.speech_synthesizer != PP_FUNCTIONAL) + to_chat(src, "Communication circuits damaged. Service required.") else - ..() \ No newline at end of file + ..() diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm index 7e4bff120a..d8594fd5fc 100644 --- a/code/modules/mob/living/silicon/pai/software_modules.dm +++ b/code/modules/mob/living/silicon/pai/software_modules.dm @@ -98,9 +98,10 @@ /datum/pai_software/crew_manifest name = "Crew Manifest" - ram_cost = 5 + ram_cost = 0 id = "manifest" toggle = 0 + default = 1 //Comes with the communicator already, also why not /datum/pai_software/crew_manifest/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) ui = SStgui.try_update_ui(user, src, ui) @@ -117,9 +118,10 @@ /datum/pai_software/messenger name = "Digital Messenger" - ram_cost = 5 + ram_cost = 0 id = "messenger" toggle = 0 + default = 1 //Can already be accessed through verbs, and also why not /datum/pai_software/messenger/tgui_interact(mob/living/silicon/pai/user, datum/tgui/ui, datum/tgui/parent_ui) return user.pda.tgui_interact(user, parent_ui = parent_ui) @@ -367,34 +369,24 @@ return data -/datum/pai_software/sec_hud - name = "Security HUD" - ram_cost = 20 - id = "sec_hud" +/datum/pai_software/pai_hud + name = "AR HUD" + ram_cost = 30 + id = "ar_hud" -/datum/pai_software/sec_hud/toggle(mob/living/silicon/pai/user) - user.secHUD = !user.secHUD - user.plane_holder.set_vis(VIS_CH_ID, user.secHUD) - user.plane_holder.set_vis(VIS_CH_WANTED, user.secHUD) - user.plane_holder.set_vis(VIS_CH_IMPTRACK, user.secHUD) - user.plane_holder.set_vis(VIS_CH_IMPLOYAL, user.secHUD) - user.plane_holder.set_vis(VIS_CH_IMPCHEM, user.secHUD) +/datum/pai_software/pai_hud/toggle(mob/living/silicon/pai/user) + user.paiHUD = !user.paiHUD + user.plane_holder.set_vis(VIS_CH_ID,user.paiHUD) + user.plane_holder.set_vis(VIS_CH_WANTED,user.paiHUD) + user.plane_holder.set_vis(VIS_CH_IMPTRACK,user.paiHUD) + user.plane_holder.set_vis(VIS_CH_IMPCHEM,user.paiHUD) + user.plane_holder.set_vis(VIS_CH_STATUS_R,user.paiHUD) + user.plane_holder.set_vis(VIS_CH_HEALTH_VR,user.paiHUD) + user.plane_holder.set_vis(VIS_CH_BACKUP,user.paiHUD) //backup stuff from silicon_vr is here now + user.plane_holder.set_vis(VIS_AUGMENTED,user.paiHUD) -/datum/pai_software/sec_hud/is_active(mob/living/silicon/pai/user) - return user.secHUD - -/datum/pai_software/med_hud - name = "Medical HUD" - ram_cost = 20 - id = "med_hud" - -/datum/pai_software/med_hud/toggle(mob/living/silicon/pai/user) - user.medHUD = !user.medHUD - user.plane_holder.set_vis(VIS_CH_STATUS, user.medHUD) - user.plane_holder.set_vis(VIS_CH_HEALTH, user.medHUD) - -/datum/pai_software/med_hud/is_active(mob/living/silicon/pai/user) - return user.medHUD +/datum/pai_software/pai_hud/is_active(mob/living/silicon/pai/user) + return user.paiHUD /datum/pai_software/translator name = "Universal Translator" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index f1d2b353cf..7287eefa02 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -353,7 +353,7 @@ spawn(0) var/newname - newname = sanitizeSafe(input(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","") as text, MAX_NAME_LEN) + newname = sanitizeSafe(tgui_input_text(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","", MAX_NAME_LEN), MAX_NAME_LEN) if (newname) custom_name = newname sprite_name = newname diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index 9636f2da51..1249a2da57 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -300,7 +300,7 @@ /obj/item/weapon/pen/robopen/proc/RenamePaper(mob/user, obj/item/weapon/paper/paper) if ( !user || !paper ) return - var/n_name = sanitizeSafe(input(user, "What would you like to label the paper?", "Paper Labelling", null) as text, 32) + var/n_name = sanitizeSafe(tgui_input_text(user, "What would you like to label the paper?", "Paper Labelling", null, 32), 32) if ( !user || !paper ) return diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 7caad30448..d014bf30b4 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -259,14 +259,14 @@ set desc = "Sets a description which will be shown when someone examines you." set category = "IC" - pose = sanitize(input(usr, "This is [src]. It is...", "Pose", null) as text) + pose = sanitize(tgui_input_text(usr, "This is [src]. It is...", "Pose", null)) /mob/living/silicon/verb/set_flavor() set name = "Set Flavour Text" set desc = "Sets an extended description of your character's features." set category = "IC" - flavor_text = sanitize(input(usr, "Please enter your new flavour text.", "Flavour text", null) as text) + flavor_text = sanitize(tgui_input_text(usr, "Please enter your new flavour text.", "Flavour text", null)) /mob/living/silicon/binarycheck() return 1 diff --git a/code/modules/mob/living/simple_mob/simple_mob.dm b/code/modules/mob/living/simple_mob/simple_mob.dm index d9d560188a..4808a3ff4e 100644 --- a/code/modules/mob/living/simple_mob/simple_mob.dm +++ b/code/modules/mob/living/simple_mob/simple_mob.dm @@ -309,7 +309,7 @@ /mob/living/simple_mob/Bump(var/atom/A) if(mobcard && istype(A, /obj/machinery/door)) var/obj/machinery/door/D = A - if(!istype(D, /obj/machinery/door/firedoor) && !istype(D, /obj/machinery/door/blast) && !istype(D, /obj/machinery/door/airlock/lift) && D.check_access(mobcard)) + if(client && !istype(D, /obj/machinery/door/firedoor) && !istype(D, /obj/machinery/door/blast) && !istype(D, /obj/machinery/door/airlock/lift) && D.check_access(mobcard)) D.open() else ..() diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index dae0fe6294..ebbb7bd73e 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -56,7 +56,8 @@ // Release belly contents before being gc'd! /mob/living/simple_mob/Destroy() release_vore_contents() - prey_excludes.Cut() + if(prey_excludes) + prey_excludes.Cut() return ..() //For all those ID-having mobs @@ -213,6 +214,7 @@ // Since they have bellies, add verbs to toggle settings on them. verbs |= /mob/living/simple_mob/proc/toggle_digestion verbs |= /mob/living/simple_mob/proc/toggle_fancygurgle + verbs |= /mob/living/proc/vertical_nom //A much more detailed version of the default /living implementation var/obj/belly/B = new /obj/belly(src) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm index 32ab7da58a..036e07c2d4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm @@ -870,18 +870,6 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? speak_chance = 0.5 wander = TRUE -/datum/language/teppi - name = "Teppi" - desc = "The language of the meat things." - speech_verb = "rumbles" - ask_verb = "tilts" - exclaim_verb = "roars" - key = "i" - flags = WHITELISTED - machine_understands = 0 - space_chance = 100 - syllables = list("gyoh", "snoof", "gyoooooOOOooh", "iuuuuh", "gyuuuuh") - ////////////////// Da babby ////////////// /mob/living/simple_mob/vore/alienanimals/teppi/baby diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm index 97da0b49ad..fd5fd72404 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm @@ -1,9 +1,9 @@ /mob/living/simple_mob/animal/passive/mouse nutrition = 20 //To prevent draining maint mice for infinite food. Low nutrition has no mechanical effect on simplemobs, so wont hurt mice themselves. - - no_vore = TRUE //Mice can't eat others due to the amount of bugs caused by it. vore_taste = "cheese" + restrict_vore_ventcrawl = TRUE + can_pull_size = ITEMSIZE_TINY // Rykka - Uncommented these. Not sure why they were commented out in the original Polaris files, maybe a mob rework mistake? can_pull_mobs = MOB_PULL_NONE // Rykka - Uncommented these. Not sure why they were commented out in the original Polaris files, maybe a mob rework mistake? diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm index ea41d429f8..c29ce4d137 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm @@ -257,7 +257,7 @@ var/list/_cat_default_emotes = list( if(named) to_chat(user, "\The [name] already has a name!") else - var/tmp_name = sanitizeSafe(input(user, "Give \the [name] a name", "Name"), MAX_NAME_LEN) + var/tmp_name = sanitizeSafe(tgui_input_text(user, "Give \the [name] a name", "Name", null, MAX_NAME_LEN), MAX_NAME_LEN) if(length(tmp_name) > 50) to_chat(user, "The name can be at most 50 characters long.") else diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm new file mode 100644 index 0000000000..0408c7ff27 --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm @@ -0,0 +1,29 @@ +/mob/living/simple_mob/animal/passive/fennec + name = "fennec" + desc = "A fox preferring arid climates, also known as a dingler, or a goob." + tt_desc = "Vulpes Zerda" + icon_state = "fennec" + item_state = "fennec" + + movement_cooldown = 0.5 SECONDS + + see_in_dark = 6 + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "kicks" + + holder_type = /obj/item/weapon/holder/fennec + mob_size = MOB_SMALL + + has_langs = list("Cat, Dog") //they're similar, why not. + +/mob/living/simple_mob/animal/passive/fennec/faux + name = "faux" + desc = "Domesticated fennec. Seems to like screaming just as much though." + +/mob/living/simple_mob/animal/passive/fennec/Initialize() + icon_living = "[initial(icon_state)]" + icon_dead = "[initial(icon_state)]_dead" + icon_rest = "[initial(icon_state)]_rest" + update_icon() + return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm index ef1aa44b59..d1e7c294e7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm @@ -51,6 +51,7 @@ List of things solar grubs should be able to do: var/datum/powernet/PN // Our powernet var/obj/structure/cable/attached // the attached cable var/shock_chance = 10 // Beware + var/tracked = FALSE /datum/say_list/solargrub emote_see = list("squelches", "squishes") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm index 0589a35391..454b4cafcd 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm @@ -47,6 +47,8 @@ var/global/list/grub_machine_overlays = list() var/obj/machinery/abstract_grub_machine/powermachine var/power_drained = 0 + var/tracked = FALSE + ai_holder_type = /datum/ai_holder/simple_mob/solargrub_larva /mob/living/simple_mob/animal/solargrub_larva/New() @@ -173,7 +175,8 @@ var/global/list/grub_machine_overlays = list() /mob/living/simple_mob/animal/solargrub_larva/proc/expand_grub() eject_from_machine() visible_message("\The [src] suddenly balloons in size!") - new /mob/living/simple_mob/vore/solargrub(get_turf(src)) + var/mob/living/simple_mob/vore/solargrub/adult = new(get_turf(src)) + adult.tracked = tracked // grub.power_drained = power_drained //TODO qdel(src) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm index b15a7e0e18..706031ce78 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm @@ -19,7 +19,7 @@ to_chat(src, "You've already set your name. Ask an admin to toggle \"nameset\" to 0 if you really must.") return var/newname - newname = sanitizeSafe(input(src,"Set your name. You only get to do this once. Max 52 chars.", "Name set","") as text, MAX_NAME_LEN) + newname = sanitizeSafe(tgui_input_text(src,"Set your name. You only get to do this once. Max 52 chars.", "Name set","", MAX_NAME_LEN), MAX_NAME_LEN) if (newname) name = newname voice_name = newname @@ -30,7 +30,7 @@ set desc = "Set your description." set category = "Abilities" var/newdesc - newdesc = sanitizeSafe(input(src,"Set your description. Max 4096 chars.", "Description set","") as text, MAX_MESSAGE_LEN) + newdesc = sanitizeSafe(tgui_input_text(src,"Set your description. Max 4096 chars.", "Description set","", prevent_enter = TRUE), MAX_MESSAGE_LEN) if(newdesc) desc = newdesc diff --git a/code/modules/mob/living/voice/voice.dm b/code/modules/mob/living/voice/voice.dm index 9caa58cb33..0e9e805dc9 100644 --- a/code/modules/mob/living/voice/voice.dm +++ b/code/modules/mob/living/voice/voice.dm @@ -80,7 +80,7 @@ set desc = "Changes your name." set src = usr - var/new_name = sanitizeSafe(input(src, "Who would you like to be now?", "Communicator", src.client.prefs.real_name) as text, MAX_NAME_LEN) + var/new_name = sanitizeSafe(tgui_input_text(src, "Who would you like to be now?", "Communicator", src.client.prefs.real_name, MAX_NAME_LEN), MAX_NAME_LEN) if(new_name) if(comm) comm.visible_message("[bicon(comm)] [src.name] has left, and now you see [new_name].") diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index d272340498..20ea18f855 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -293,7 +293,7 @@ set src in usr if(usr != src) to_chat(usr, "No.") - var/msg = sanitize(input(usr,"Set the flavor text in your 'examine' verb.","Flavor Text",html_decode(flavor_text)) as message|null, extra = 0) //VOREStation Edit: separating out OOC notes + var/msg = sanitize(tgui_input_text(usr,"Set the flavor text in your 'examine' verb.","Flavor Text",html_decode(flavor_text), multiline = TRUE, prevent_enter = TRUE), extra = 0) //VOREStation Edit: separating out OOC notes if(msg != null) flavor_text = msg diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 4b72d56741..e7158df528 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -132,7 +132,7 @@ // Emulates targetting a specific body part, and miss chances // May return null if missed // miss_chance_mod may be negative. -/proc/get_zone_with_miss_chance(zone, var/mob/target, var/miss_chance_mod = 0, var/ranged_attack=0) +/proc/get_zone_with_miss_chance(zone, var/mob/target, var/miss_chance_mod = 0, var/ranged_attack=0, var/force_hit = FALSE) zone = check_zone(zone) if(!ranged_attack) @@ -144,6 +144,9 @@ if(G.state >= GRAB_AGGRESSIVE) return zone + if(force_hit) + return zone + var/miss_chance = 10 if (zone in base_miss_chance) miss_chance = base_miss_chance[zone] diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm index b3a1f39454..2534755873 100644 --- a/code/modules/mob/mob_transformation_simple.dm +++ b/code/modules/mob/mob_transformation_simple.dm @@ -9,7 +9,7 @@ return if(!new_type) - new_type = input(usr, "Mob type path:", "Mob type") as text|null + new_type = tgui_input_text(usr, "Mob type path:", "Mob type") if(istext(new_type)) new_type = text2path(new_type) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index f3683f6ca4..efe2531616 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -182,7 +182,7 @@ if(!ticker || ticker.current_state != GAME_STATE_PLAYING) to_chat(usr, "The round is either not ready, or has already finished...") return - + var/time_till_respawn = time_till_respawn() if(time_till_respawn == -1) // Special case, never allowed to respawn to_chat(usr, "Respawning is not allowed!") @@ -224,7 +224,7 @@ return 0 var/datum/species/S = GLOB.all_species[client.prefs.species] - + if(!(S.spawn_flags & SPECIES_CAN_JOIN)) tgui_alert_async(src,"Your current species, [client.prefs.species], is not available for play on the station.") return 0 @@ -367,7 +367,7 @@ popup.set_content(dat) popup.open() -/mob/new_player/proc/time_till_respawn() +/mob/proc/time_till_respawn() if(!ckey) return -1 // What? @@ -387,14 +387,21 @@ /mob/new_player/proc/IsJobAvailable(rank) var/datum/job/job = job_master.GetJob(rank) - if(!job) return 0 - if(!job.is_position_available()) return 0 - if(jobban_isbanned(src,rank)) return 0 - if(!job.player_old_enough(src.client)) return 0 + if(!job) + return 0 + if(!job.is_position_available()) + return 0 + if(jobban_isbanned(src,rank)) + return 0 + if(!job.player_old_enough(src.client)) + return 0 //VOREStation Add - if(!job.player_has_enough_playtime(src.client)) return 0 - if(!is_job_whitelisted(src,rank)) return 0 - if(!job.player_has_enough_pto(src.client)) return 0 + if(!job.player_has_enough_playtime(src.client)) + return 0 + if(!is_job_whitelisted(src,rank)) + return 0 + if(!job.player_has_enough_pto(src.client)) + return 0 //VOREStation Add End return 1 diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 66d712bc44..c2e5a31951 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -205,6 +205,8 @@ // Determine what job is marked as 'High' priority, and dress them up as such. if(job_civilian_low & ASSISTANT) previewJob = job_master.GetJob(USELESS_JOB) + else if(ispAI(client.mob)) //VOREStation Edit! - pAIs shouldn't wear job gear~! + //Don't do anything! else for(var/datum/job/job in job_master.occupations) var/job_flag @@ -259,6 +261,7 @@ mannequin.update_transform() //VOREStation Edit to update size/shape stuff. mannequin.toggle_tail(setting = TRUE) mannequin.toggle_wing(setting = TRUE) + mannequin.update_tail_showing() COMPILE_OVERLAYS(mannequin) update_character_previews(new /mutable_appearance(mannequin)) diff --git a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm index 5eb6a57deb..77e1a8348e 100644 --- a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm @@ -119,6 +119,15 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/ears/antennae_eye + name = "antennae eye, colorable" + desc = "" + icon_state = "antennae" + extra_overlay = "antennae_eye_1" + extra_overlay2 = "antennae_eye_2" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + /datum/sprite_accessory/ears/curly_bug name = "curly antennae, colorable" desc = "" diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index 4637ac008e..4288f9bbc6 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -285,6 +285,11 @@ suit_sprites = 'icons/mob/taursuits_slug.dmi' icon_sprite_tag = "slug" +/datum/sprite_accessory/tail/taur/slug/snail + name = "Snail (Taur)" + icon_state = "slug_s" + extra_overlay = "snail_shell_marking" + /datum/sprite_accessory/tail/taur/frog name = "Frog (Taur)" icon_state = "frog_s" diff --git a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm index f182b5792e..2a574510b0 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm @@ -69,6 +69,15 @@ extra_overlay2 = "wolf_markings_2" //icon_sprite_tag = "wolf2c" +/datum/sprite_accessory/tail/taur/wolf/wolf_2c_wag + name = "Wolf 3-color (Taur, vwag)" + icon_state = "wolf_s" + extra_overlay = "wolf_markings" + extra_overlay2 = "wolf_markings_2" + ani_state = "fatwolf_s" + extra_overlay_w = "fatwolf_markings" + extra_overlay2_w = "wolf_markings_2" + /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c name = "Fat Wolf 3-color (Taur)" icon_state = "fatwolf_s" @@ -411,6 +420,12 @@ suit_sprites = 'icons/mob/taursuits_drake_vr.dmi' icon_sprite_tag = "drake" +/datum/sprite_accessory/tail/taur/ch/fatdrake + name = "Drake (Fat Taur dual-color)" + icon_state = "fatdrake_s" + extra_overlay = "fatdrake_markings" + icon_sprite_tag = "drake" + /datum/sprite_accessory/tail/taur/otie name = "Otie (Taur)" icon_state = "otie_s" diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index 703aac2813..f10ce85b86 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -42,7 +42,7 @@ var/input if(!message) - input = sanitize_or_reflect(input(src,"Choose an emote to display.") as text|null, src) + input = sanitize_or_reflect(tgui_input_text(src,"Choose an emote to display."), src) else input = message @@ -123,7 +123,7 @@ to_chat(src, "You cannot speak in IC (muted).") return if (!message) - message = input(usr, "Type a message to say.","Psay") as text|null + message = tgui_input_text(usr, "Type a message to say.","Psay") message = sanitize_or_reflect(message,src) if (!message) return @@ -204,7 +204,7 @@ to_chat(src, "You cannot speak in IC (muted).") return if (!message) - message = input(usr, "Type a message to emote.","Pme") as text|null + message = tgui_input_text(usr, "Type a message to emote.","Pme") message = sanitize_or_reflect(message,src) if (!message) return diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm index 7ab6de6fe5..197e472e92 100644 --- a/code/modules/mob/typing_indicator.dm +++ b/code/modules/mob/typing_indicator.dm @@ -40,11 +40,7 @@ set hidden = 1 set_typing_indicator(TRUE) - var/message - if(usr.client.prefs.tgui_input_mode) - message = tgui_input_text(usr, "Type your message:", "Say") - else - message = input(usr, "Type your message:", "Say") as text + var/message = tgui_input_text(usr, "Type your message:", "Say") set_typing_indicator(FALSE) if(message) @@ -55,11 +51,7 @@ set hidden = 1 set_typing_indicator(TRUE) - var/message - if(usr.client.prefs.tgui_input_mode) - message = tgui_input_message(usr, "Type your message:", "Emote") - else - message = input(usr, "Type your message:", "Emote") as message + var/message = tgui_input_text(usr, "Type your message:", "Emote", multiline = TRUE) set_typing_indicator(FALSE) if(message) @@ -70,11 +62,7 @@ set name = ".Whisper" set hidden = 1 - var/message - if(usr.client.prefs.tgui_input_mode) - message = tgui_input_text(usr, "Type your message:", "Whisper") - else - message = input(usr, "Type your message:", "Whisper") as text + var/message = tgui_input_text(usr, "Type your message:", "Whisper") if(message) whisper(message) @@ -83,11 +71,7 @@ set name = ".Subtle" set hidden = 1 - var/message - if(usr.client.prefs.tgui_input_mode) - message = tgui_input_message(usr, "Type your message:", "Subtle") - else - message = input(usr, "Type your message:", "Subtle") as message + var/message = tgui_input_text(usr, "Type your message:", "Subtle", multiline = TRUE) if(message) me_verb_subtle(message) diff --git a/code/modules/modular_computers/NTNet/NTNet.dm b/code/modules/modular_computers/NTNet/NTNet.dm index 6479f92a21..f725cf5aa7 100644 --- a/code/modules/modular_computers/NTNet/NTNet.dm +++ b/code/modules/modular_computers/NTNet/NTNet.dm @@ -10,21 +10,30 @@ var/global/datum/ntnet/ntnet_global = new() var/list/available_news = list() var/list/chat_channels = list() var/list/fileservers = list() - var/list/email_accounts = list() // I guess we won't have more than 999 email accounts active at once in single round, so this will do until Servers are implemented someday. + /// Holds all the email accounts that exists. Hopefully won't exceed 999 + var/list/email_accounts = list() var/list/banned_nids = list() - // Amount of logs the system tries to keep in memory. Keep below 999 to prevent byond from acting weirdly. - // High values make displaying logs much laggier. + /// A list of nid - os datum pairs. An OS in this list is not necessarily connected to NTNet or visible on it. + var/list/registered_nids = list() + /// Amount of log entries the system tries to keep in memory. Keep below 999 to prevent byond from acting weirdly. High values make displaying logs much laggier. var/setting_maxlogcount = 100 - // These only affect wireless. LAN (consoles) are unaffected since it would be possible to create scenario where someone turns off NTNet, and is unable to turn it back on since it refuses connections - var/setting_softwaredownload = 1 - var/setting_peertopeer = 1 - var/setting_communication = 1 - var/setting_systemcontrol = 1 - var/setting_disabled = 0 // Setting to 1 will disable all wireless, independently on relays status. + /// Programs requiring NTNET_SOFTWAREDOWNLOAD won't work if this is set to FALSE and public-facing device they are connecting with is wireless. + var/setting_softwaredownload = TRUE + /// Programs requiring NTNET_PEERTOPEER won't work if this is set to FALSE and public-facing device they are connecting with is wireless. + var/setting_peertopeer = TRUE + /// Programs requiring NTNET_COMMUNICATION won't work if this is set to FALSE and public-facing device they are connecting with is wireless. + var/setting_communication = TRUE + /// Programs requiring NTNET_SYSTEMCONTROL won't work if this is set to FALSE and public-facing device they are connecting with is wireless. + var/setting_systemcontrol = TRUE - var/intrusion_detection_enabled = 1 // Whether the IDS warning system is enabled - var/intrusion_detection_alarm = 0 // Set when there is an IDS warning due to malicious (antag) software. + /// Setting to TRUE will disable all wireless connections, independently off relays status. + var/setting_disabled = FALSE + + /// Whether the IDS warning system is enabled + var/intrusion_detection_enabled = TRUE + /// Set when there is an IDS warning due to malicious (antag) software. + var/intrusion_detection_alarm = FALSE // If new NTNet datum is spawned, it replaces the old one. @@ -62,7 +71,13 @@ var/global/datum/ntnet/ntnet_global = new() else break -/datum/ntnet/proc/check_banned(var/NID) +/datum/ntnet/proc/get_os_by_nid(NID) + return registered_nids["[NID]"] + +/datum/ntnet/proc/unregister(NID) + registered_nids -= "[NID]" + +/datum/ntnet/proc/check_banned(NID) if(!relays || !relays.len) return FALSE @@ -138,10 +153,12 @@ var/global/datum/ntnet/ntnet_global = new() // Resets the IDS alarm /datum/ntnet/proc/resetIDS() intrusion_detection_alarm = 0 + add_log("-!- INTRUSION DETECTION ALARM RESET BY SYSTEM OPERATOR -!-") /datum/ntnet/proc/toggleIDS() resetIDS() intrusion_detection_enabled = !intrusion_detection_enabled + add_log("Configuration Updated. Intrusion Detection [intrusion_detection_enabled ? "enabled" : "disabled"].") // Removes all logs /datum/ntnet/proc/purge_logs() @@ -185,4 +202,3 @@ var/global/datum/ntnet/ntnet_global = new() for(var/datum/ntnet_conversation/chan in chat_channels) if(chan.id == id) return chan - diff --git a/code/modules/modular_computers/NTNet/emails/email_account.dm b/code/modules/modular_computers/NTNet/emails/email_account.dm index b5f9388714..7cccdeb6bc 100644 --- a/code/modules/modular_computers/NTNet/emails/email_account.dm +++ b/code/modules/modular_computers/NTNet/emails/email_account.dm @@ -1,12 +1,22 @@ /datum/computer_file/data/email_account/ var/list/inbox = list() + var/list/outbox = list() var/list/spam = list() var/list/deleted = list() var/login = "" var/password = "" - var/can_login = TRUE // Whether you can log in with this account. Set to false for system accounts - var/suspended = FALSE // Whether the account is banned by the SA. + /// Whether you can log in with this account. Set to FALSE for system accounts. + var/can_login = TRUE + /// Whether the account is banned by the SA. + var/suspended = FALSE + var/connected_clients = list() + + var/fullname = "N/A" + var/assignment = "N/A" + + var/notification_mute = FALSE + var/notification_sound = "*beep*" /datum/computer_file/data/email_account/calculate_size() size = 1 @@ -64,7 +74,28 @@ can_login = FALSE /datum/computer_file/data/email_account/service/broadcaster/ - login = "broadcast@internal-services.nt" + login = EMAIL_BROADCAST + +/datum/computer_file/data/email_account/service/broadcaster/receive_mail(var/datum/computer_file/data/email_message/received_message, var/relayed) + if(suspended || !istype(received_message) || relayed) + return FALSE + // Possibly exploitable for user spamming so keep admins informed. + if(!received_message.spam) + log_and_message_admins("Broadcast email address used by [usr]. Message title: [received_message.title].") + + spawn(0) + for(var/datum/computer_file/data/email_account/email_account in ntnet_global.email_accounts) + var/datum/computer_file/data/email_message/new_message = received_message.clone() + send_mail(email_account.login, new_message, 1) + sleep(2) + + return TRUE + +/datum/computer_file/data/email_account/service/document + login = EMAIL_DOCUMENTS + +/datum/computer_file/data/email_account/service/sysadmin + login = EMAIL_SYSADMIN /datum/computer_file/data/email_account/service/broadcaster/receive_mail(var/datum/computer_file/data/email_message/received_message, var/relayed) if(!istype(received_message) || relayed) @@ -79,4 +110,4 @@ send_mail(email_account.login, new_message, 1) sleep(2) - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/modular_computers/computers/modular_computer/variables.dm b/code/modules/modular_computers/computers/modular_computer/variables.dm index 59c45f993a..101e7056f9 100644 --- a/code/modules/modular_computers/computers/modular_computer/variables.dm +++ b/code/modules/modular_computers/computers/modular_computer/variables.dm @@ -53,4 +53,12 @@ var/obj/item/weapon/computer_hardware/nano_printer/nano_printer // Nano Printer component of this computer, for your everyday paperwork needs. var/obj/item/weapon/computer_hardware/hard_drive/portable/portable_drive // Portable data storage var/obj/item/weapon/computer_hardware/ai_slot/ai_slot // AI slot, an intellicard housing that allows modifications of AIs. - var/obj/item/weapon/computer_hardware/tesla_link/tesla_link // Tesla Link, Allows remote charging from nearest APC. \ No newline at end of file + var/obj/item/weapon/computer_hardware/tesla_link/tesla_link // Tesla Link, Allows remote charging from nearest APC. + + var/modifiable = TRUE // can't be modified or damaged if false + + var/stores_pen = FALSE + var/obj/item/weapon/pen/stored_pen + + var/interact_sounds + var/interact_sound_volume = 40 diff --git a/code/modules/modular_computers/file_system/computer_file.dm b/code/modules/modular_computers/file_system/computer_file.dm index bb41552432..b477862535 100644 --- a/code/modules/modular_computers/file_system/computer_file.dm +++ b/code/modules/modular_computers/file_system/computer_file.dm @@ -1,18 +1,35 @@ var/global/file_uid = 0 /datum/computer_file/ - var/filename = "NewFile" // Placeholder. No spacebars - var/filetype = "XXX" // File full names are [filename].[filetype] so like NewFile.XXX in this case - var/size = 1 // File size in GQ. Integers only! - var/obj/item/weapon/computer_hardware/hard_drive/holder // Holder that contains this file. - var/unsendable = 0 // Whether the file may be sent to someone via NTNet transfer or other means. - var/undeletable = 0 // Whether the file may be deleted. Setting to 1 prevents deletion/renaming/etc. - var/uid // UID of this file + /// Placeholder. Whitespace and most special characters are not allowed. + var/filename = "NewFile" + /// File full names are [filename].[filetype] so like NewFile.XXX in this case + var/filetype = "XXX" + /// File size in GQ. Integers only! + var/size = 1 + /// Holder that contains this file. + var/obj/item/weapon/computer_hardware/hard_drive/holder + //// Whether the file may be sent to someone via NTNet transfer, email or other means. + var/unsendable = FALSE + /// Whether the file may be deleted. Setting to TRUE prevents deletion/renaming/etc. + var/undeletable = FALSE + /// Whether the file is hidden from view in the OS + var/hidden = FALSE + /// Protects files that should never be edited by the user due to special properties. + var/read_only = FALSE + /// UID of this file + var/uid + /// Any metadata the file uses. + var/list/metadata + /// Paper type to use for printing + var/papertype = /obj/item/weapon/paper -/datum/computer_file/New() +/datum/computer_file/New(list/md = null) ..() uid = file_uid file_uid++ + if(islist(md)) + metadata = md.Copy() /datum/computer_file/Destroy() if(!holder) @@ -30,10 +47,13 @@ var/global/file_uid = 0 var/datum/computer_file/temp = new type temp.unsendable = unsendable temp.undeletable = undeletable + temp.hidden = hidden temp.size = size + if(metadata) + temp.metadata = metadata.Copy() if(rename) temp.filename = filename + "(Copy)" else temp.filename = filename temp.filetype = filetype - return temp \ No newline at end of file + return temp diff --git a/code/modules/modular_computers/file_system/data.dm b/code/modules/modular_computers/file_system/data.dm index 7ad48bea54..c58ad7ac2b 100644 --- a/code/modules/modular_computers/file_system/data.dm +++ b/code/modules/modular_computers/file_system/data.dm @@ -1,10 +1,11 @@ // /data/ files store data in string format. // They don't contain other logic for now. /datum/computer_file/data - var/stored_data = "" // Stored data in string format. filetype = "DAT" + + var/stored_data = "" // Stored data in string format. var/block_size = 250 - var/do_not_edit = 0 // Whether the user will be reminded that the file probably shouldn't be edited. + var/do_not_edit = FALSE // Whether the user will be reminded that the file probably shouldn't be edited. /datum/computer_file/data/clone() var/datum/computer_file/data/temp = ..() @@ -15,5 +16,43 @@ /datum/computer_file/data/proc/calculate_size() size = max(1, round(length(stored_data) / block_size)) +/datum/computer_file/data/proc/generate_file_data(mob/user) + return digitalPencode2html(stored_data) + /datum/computer_file/data/logfile filetype = "LOG" + +/datum/computer_file/data/text + filetype = "TXT" + +/// Mapping tool - creates a named modular computer file in a computer's storage on late initialize. +/// Use this to do things like automatic records and blackboxes. Alternative for paper records. +/// Values can be in the editor for each map or as a subtype. +/// This is an obj because raw atoms can't be placed in DM or third-party mapping tools. +///obj/effect/computer_file_creator +// name = "computer file creator" +// desc = "This is a mapping tool used for installing text files onto a modular device when it's mapped on top of them. If you see it, it's bugged." +// icon = 'icons/effects/landmarks.dmi' +// icon_state = "x3" +// anchored = TRUE +// unacidable = TRUE +// simulated = FALSE +// invisibility = 101 +// /// The name that the file will have once it's created. +// var/file_name = "helloworld" +// /// The contents of this file. Uses paper formatting. +// var/file_info = "Hello World!" + +///obj/effect/computer_file_creator/Initialize() +// . = ..() +// return INITIALIZE_HINT_LATELOAD + +///obj/effect/computer_file_creator/LateInitialize() +// var/turf/T = get_turf(src) +// for (var/obj/O in T) +// if (!istype(O, /obj/machinery/computer/modular) && !istype(O, /obj/item/modular_computer)) +// continue +// var/datum/extension/interactive/ntos/os = get_extension(O, /datum/extension/interactive/ntos) +// if (os) +// os.create_data_file(file_name, file_info, /datum/computer_file/data/text) +// qdel(src) diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index d5e55940d0..905a6434be 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -1,30 +1,39 @@ // /program/ files are executable programs that do things. /datum/computer_file/program - filetype = "PRG" filename = "UnknownProgram" // File name. FILE NAME MUST BE UNIQUE IF YOU WANT THE PROGRAM TO BE DOWNLOADABLE FROM NTNET! + filetype = "PRG" + var/required_access = null // List of required accesses to run/download the program. var/requires_access_to_run = 1 // Whether the program checks for required_access when run. var/requires_access_to_download = 1 // Whether the program checks for required_access when downloading. + // TGUIModule var/datum/tgui_module/TM = null // If the program uses TGUIModule, put it here and it will be automagically opened. Otherwise implement tgui_interact. var/tguimodule_path = null // Path to tguimodule, make sure to set this if implementing new program. - // Etc Program stuff var/program_state = PROGRAM_STATE_KILLED// PROGRAM_STATE_KILLED or PROGRAM_STATE_BACKGROUND or PROGRAM_STATE_ACTIVE - specifies whether this program is running. var/obj/item/modular_computer/computer // Device that runs this program. + var/filedesc = "Unknown Program" // User-friendly name of this program. var/extended_desc = "N/A" // Short description of this program's function. + /// Category that this program belongs to. + var/category = PROG_MISC + var/usage_flags = PROGRAM_ALL // Bitflags (PROGRAM_CONSOLE, PROGRAM_LAPTOP, PROGRAM_TABLET combination) or PROGRAM_ALL + var/program_icon_state = null // Program-specific screen icon state var/program_key_state = "standby_key" // Program-specific keyboard icon state var/program_menu_icon = "newwin" // Icon to use for program's link in main menu + var/ui_header = null // Example: "something.gif" - a header image that will be rendered in computer's UI when this program is running at background. Images are taken from /nano/images/status_icons. Be careful not to use too large images! + var/requires_ntnet = 0 // Set to 1 for program to require nonstop NTNet connection to run. If NTNet connection is lost program crashes. var/requires_ntnet_feature = 0 // Optional, if above is set to 1 checks for specific function of NTNet (currently NTNET_SOFTWAREDOWNLOAD, NTNET_PEERTOPEER, NTNET_SYSTEMCONTROL and NTNET_COMMUNICATION) - var/ntnet_status = 1 // NTNet status, updated every tick by computer running this program. Don't use this for checks if NTNet works, computers do that. Use this for calculations, etc. - var/usage_flags = PROGRAM_ALL // Bitflags (PROGRAM_CONSOLE, PROGRAM_LAPTOP, PROGRAM_TABLET combination) or PROGRAM_ALL var/network_destination = null // Optional string that describes what NTNet server/system this program connects to. Used in default logging. + + var/ntnet_status = 1 // NTNet status, updated every tick by computer running this program. Don't use this for checks if NTNet works, computers do that. Use this for calculations, etc. var/available_on_ntnet = 1 // Whether the program can be downloaded from NTNet. Set to 0 to disable. var/available_on_syndinet = 0 // Whether the program can be downloaded from SyndiNet (accessible via emagging the computer). Set to 1 to enable. + + // Misc var/computer_emagged = 0 // Set to 1 if computer that's running us was emagged. Computer updates this every Process() tick - var/ui_header = null // Example: "something.gif" - a header image that will be rendered in computer's UI when this program is running at background. Images are taken from /nano/images/status_icons. Be careful not to use too large images! var/ntnet_speed = 0 // GQ/s - current network connectivity transfer rate /// Name of the tgui interface var/tgui_id @@ -230,4 +239,4 @@ /datum/computer_file/program/proc/relaymove(var/mob/M, direction) if(TM) - return TM.relaymove(M, direction) \ No newline at end of file + return TM.relaymove(M, direction) diff --git a/code/modules/modular_computers/file_system/programs/antagonist/hacked_camera.dm b/code/modules/modular_computers/file_system/programs/antagonist/hacked_camera.dm index 4c1b153734..3f6f4b1286 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/hacked_camera.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/hacked_camera.dm @@ -7,8 +7,8 @@ program_menu_icon = "zoomin" extended_desc = "This very advanced piece of software uses adaptive programming and large database of cipherkeys to bypass most encryptions used on camera networks. Be warned that system administrator may notice this." size = 73 // Very large, a price for bypassing ID checks completely. - available_on_ntnet = 0 - available_on_syndinet = 1 + available_on_ntnet = FALSE + available_on_syndinet = TRUE /datum/computer_file/program/camera_monitor/hacked/process_tick() ..() diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index 47fe4ea2b3..722face19e 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -7,5 +7,6 @@ program_menu_icon = "key" extended_desc = "Program for programming crew ID cards." required_access = access_change_ids - requires_ntnet = 0 + requires_ntnet = FALSE size = 8 + category = PROG_COMMAND diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm index 01db6036e9..61b6e97c8c 100644 --- a/code/modules/modular_computers/file_system/programs/command/comm.dm +++ b/code/modules/modular_computers/file_system/programs/command/comm.dm @@ -12,10 +12,11 @@ tguimodule_path = /datum/tgui_module/communications/ntos extended_desc = "Used to command and control. Can relay long-range communications. This program can not be run on tablet computers." required_access = access_heads - requires_ntnet = 1 + requires_ntnet = TRUE size = 12 usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP network_destination = "long-range communication array" + category = PROG_COMMAND var/datum/comm_message_listener/message_core = new /datum/computer_file/program/comm/clone() diff --git a/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm index d7f13fcbc5..8dd86e2baf 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm @@ -8,9 +8,10 @@ program_menu_icon = "alert" extended_desc = "This program provides visual interface for the engineering alarm system." required_access = access_engine - requires_ntnet = 1 + requires_ntnet = TRUE network_destination = "alarm monitoring network" size = 5 + category = PROG_MONITOR var/has_alert = 0 /datum/computer_file/program/alarm_monitor/process_tick() diff --git a/code/modules/modular_computers/file_system/programs/engineering/atmos_control.dm b/code/modules/modular_computers/file_system/programs/engineering/atmos_control.dm index 5c25ed8315..9fc593249f 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/atmos_control.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/atmos_control.dm @@ -7,8 +7,9 @@ program_menu_icon = "shuffle" extended_desc = "This program allows remote control of air alarms. This program can not be run on tablet computers." required_access = access_atmospherics - requires_ntnet = 1 + requires_ntnet = TRUE network_destination = "atmospheric control system" requires_ntnet_feature = NTNET_SYSTEMCONTROL usage_flags = PROGRAM_LAPTOP | PROGRAM_CONSOLE + category = PROG_ENG size = 17 diff --git a/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm index 5df437790b..7c3de1ef10 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm @@ -8,9 +8,10 @@ extended_desc = "This program connects to sensors to provide information about electrical systems" ui_header = "power_norm.gif" required_access = access_engine - requires_ntnet = 1 + requires_ntnet = TRUE network_destination = "power monitoring system" size = 9 + category = PROG_ENG var/has_alert = 0 /datum/computer_file/program/power_monitor/process_tick() diff --git a/code/modules/modular_computers/file_system/programs/engineering/rcon_console.dm b/code/modules/modular_computers/file_system/programs/engineering/rcon_console.dm index ded2e3922f..1ff068b90a 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/rcon_console.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/rcon_console.dm @@ -7,8 +7,9 @@ program_menu_icon = "power" extended_desc = "This program allows remote control of power distribution systems. This program can not be run on tablet computers." required_access = access_engine - requires_ntnet = 1 + requires_ntnet = TRUE network_destination = "RCON remote control system" requires_ntnet_feature = NTNET_SYSTEMCONTROL usage_flags = PROGRAM_LAPTOP | PROGRAM_CONSOLE size = 19 + category = PROG_ENG diff --git a/code/modules/modular_computers/file_system/programs/engineering/shutoff_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/shutoff_monitor.dm index e87991041e..70027b69e6 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/shutoff_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/shutoff_monitor.dm @@ -7,7 +7,8 @@ program_menu_icon = "wrench" extended_desc = "This program allows for remote monitoring and control of emergency shutoff valves." required_access = access_engine - requires_ntnet = 1 + requires_ntnet = TRUE network_destination = "shutoff valve control computer" size = 5 + category = PROG_ENG var/has_alert = 0 diff --git a/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm index 9c3cabd3f7..eafa7308fa 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm @@ -8,9 +8,10 @@ extended_desc = "This program connects to specially calibrated supermatter sensors to provide information on the status of supermatter-based engines." ui_header = "smmon_0.gif" required_access = access_engine - requires_ntnet = 1 + requires_ntnet = TRUE network_destination = "supermatter monitoring system" size = 5 + category = PROG_ENG var/last_status = 0 /datum/computer_file/program/supermatter_monitor/process_tick() diff --git a/code/modules/modular_computers/file_system/programs/generic/camera.dm b/code/modules/modular_computers/file_system/programs/generic/camera.dm index 41551e0cb0..d7ed210e78 100644 --- a/code/modules/modular_computers/file_system/programs/generic/camera.dm +++ b/code/modules/modular_computers/file_system/programs/generic/camera.dm @@ -40,6 +40,7 @@ size = 12 available_on_ntnet = 1 requires_ntnet = 1 + category = PROG_MONITOR // ERT Variant of the program /datum/computer_file/program/camera_monitor/ert diff --git a/code/modules/modular_computers/file_system/programs/generic/configurator.dm b/code/modules/modular_computers/file_system/programs/generic/configurator.dm index 2d660c8b7e..66c1a25464 100644 --- a/code/modules/modular_computers/file_system/programs/generic/configurator.dm +++ b/code/modules/modular_computers/file_system/programs/generic/configurator.dm @@ -12,6 +12,8 @@ unsendable = 1 undeletable = 1 size = 4 - available_on_ntnet = 0 - requires_ntnet = 0 + available_on_ntnet = FALSE + requires_ntnet = FALSE tguimodule_path = /datum/tgui_module/computer_configurator + usage_flags = PROGRAM_ALL + category = PROG_UTIL diff --git a/code/modules/modular_computers/file_system/programs/generic/email_client.dm b/code/modules/modular_computers/file_system/programs/generic/email_client.dm index 32d635fef4..cea1f070ce 100644 --- a/code/modules/modular_computers/file_system/programs/generic/email_client.dm +++ b/code/modules/modular_computers/file_system/programs/generic/email_client.dm @@ -6,10 +6,12 @@ program_key_state = "generic_key" program_menu_icon = "mail-closed" size = 7 - requires_ntnet = 1 - available_on_ntnet = 1 + requires_ntnet = TRUE + available_on_ntnet = TRUE var/stored_login = "" var/stored_password = "" + usage_flags = PROGRAM_ALL + category = PROG_OFFICE tguimodule_path = /datum/tgui_module/email_client diff --git a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm index b3827e507c..30719cf0be 100644 --- a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm @@ -13,6 +13,8 @@ var/open_file var/error + usage_flags = PROGRAM_ALL + category = PROG_UTIL /datum/computer_file/program/filemanager/tgui_act(action, list/params, datum/tgui/ui) if(..()) @@ -28,7 +30,7 @@ if("PRG_newtextfile") if(!HDD) return - var/newname = sanitize(input(usr, "Enter file name or leave blank to cancel:", "File rename")) + var/newname = sanitize(tgui_input_text(usr, "Enter file name or leave blank to cancel:", "File rename")) if(!newname) return var/datum/computer_file/data/F = new/datum/computer_file/data() @@ -63,7 +65,7 @@ var/oldtext = html_decode(F.stored_data) oldtext = replacetext(oldtext, "\[br\]", "\n") - var/newtext = sanitize(replacetext(input(usr, "Editing file [open_file]. You may use most tags used in paper formatting:", "Text Editor", oldtext) as message|null, "\n", "\[br\]"), MAX_TEXTFILE_LENGTH) + var/newtext = sanitize(replacetext(tgui_input_text(usr, "Editing file [open_file]. You may use most tags used in paper formatting:", "Text Editor", oldtext, MAX_TEXTFILE_LENGTH, TRUE, prevent_enter = TRUE), "\n", "\[br\]"), MAX_TEXTFILE_LENGTH) if(!newtext) return @@ -151,7 +153,7 @@ data["error"] = error if(!computer || !HDD) data["error"] = "I/O ERROR: Unable to access hard drive." - + data["filedata"] = null data["filename"] = null data["files"] = list() diff --git a/code/modules/modular_computers/file_system/programs/generic/game.dm b/code/modules/modular_computers/file_system/programs/generic/game.dm index 31eaac08d2..8d3219bc42 100644 --- a/code/modules/modular_computers/file_system/programs/generic/game.dm +++ b/code/modules/modular_computers/file_system/programs/generic/game.dm @@ -26,6 +26,8 @@ ///Determines which boss image to use on the UI. var/boss_id = 1 + usage_flags = PROGRAM_ALL + // This is the primary game loop, which handles the logic of being defeated or winning. /datum/computer_file/program/game/proc/game_check(mob/user) sleep(5) diff --git a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm index e72e30fd38..6eb6fc0f2e 100644 --- a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm @@ -8,7 +8,7 @@ size = 4 requires_ntnet = TRUE available_on_ntnet = TRUE - + usage_flags = PROGRAM_ALL tgui_id = "NtosNewsBrowser" var/datum/computer_file/data/news_article/loaded_article @@ -106,7 +106,7 @@ if(downloading || !loaded_article) return - var/savename = sanitize(input(usr, "Enter file name or leave blank to cancel:", "Save article", loaded_article.filename)) + var/savename = sanitize(tgui_input_text(usr, "Enter file name or leave blank to cancel:", "Save article", loaded_article.filename)) if(!savename) return TRUE var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive @@ -118,4 +118,3 @@ if("PRG_toggle_archived") . = TRUE show_archived = !show_archived - diff --git a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm index 14e2343e66..fd8884cac8 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm @@ -16,12 +16,19 @@ var/datum/computer_file/program/downloaded_file = null var/hacked_download = 0 - var/download_completion = 0 //GQ of downloaded data. + ///GQ of downloaded data. + var/download_completion = 0 var/download_netspeed = 0 var/downloaderror = "" - var/obj/item/modular_computer/my_computer = null var/list/downloads_queue[0] + var/file_info + var/server + usage_flags = PROGRAM_ALL + category = PROG_UTIL + + var/obj/item/modular_computer/my_computer = null + /datum/computer_file/program/ntnetdownload/kill_program() ..() abort_file_download() diff --git a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm index a9a1e3456d..ab26ed4862 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm @@ -12,12 +12,16 @@ ui_header = "ntnrc_idle.gif" available_on_ntnet = 1 tgui_id = "NtosNetChat" - var/last_message // Used to generate the toolbar icon + /// Used to generate the toolbar icon + var/last_message var/username var/active_channel var/list/channel_history = list() - var/operator_mode = FALSE // Channel operator mode - var/netadmin_mode = FALSE // Administrator mode (invisible to other users + bypasses passwords) + /// Channel operator mode + var/operator_mode = FALSE + /// Administrator mode (invisible to other users + bypasses passwords) + var/netadmin_mode = FALSE + usage_flags = PROGRAM_ALL /datum/computer_file/program/chatclient/New() username = "DefaultUser[rand(100, 999)]" @@ -169,7 +173,7 @@ var/list/data = list() data["can_admin"] = can_run(user, FALSE, access_network) return data - + /datum/computer_file/program/chatclient/tgui_data(mob/user) if(!ntnet_global || !ntnet_global.chat_channels) return list() @@ -223,4 +227,4 @@ data["authed"] = FALSE data["messages"] = list() - return data \ No newline at end of file + return data diff --git a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm index ea88d3597e..1c73f44baa 100644 --- a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm +++ b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm @@ -8,11 +8,12 @@ var/global/nttransfer_uid = 0 program_key_state = "generic_key" program_menu_icon = "transferthick-e-w" size = 7 - requires_ntnet = 1 + requires_ntnet = TRUE requires_ntnet_feature = NTNET_PEERTOPEER network_destination = "other device via P2P tunnel" - available_on_ntnet = 1 + available_on_ntnet = TRUE tgui_id = "NtosNetTransfer" + category = PROG_UTIL var/error = "" // Error screen var/server_password = "" // Optional password to download the file. @@ -23,7 +24,7 @@ var/global/nttransfer_uid = 0 var/download_completion = 0 // Download progress in GQ var/actual_netspeed = 0 // Displayed in the UI, this is the actual transfer speed. var/unique_token // UID of this program - var/upload_menu = 0 // Whether we show the program list and upload menu + var/upload_menu = FALSE // Whether we show the program list and upload menu /datum/computer_file/program/nttransfer/New() unique_token = nttransfer_uid @@ -86,14 +87,14 @@ var/global/nttransfer_uid = 0 data["download_progress"] = download_completion data["download_netspeed"] = actual_netspeed data["download_name"] = "[downloaded_file.filename].[downloaded_file.filetype]" - + data["uploading"] = !!provided_file if(provided_file) data["upload_uid"] = unique_token data["upload_clients"] = connected_clients.len data["upload_haspassword"] = server_password ? 1 : 0 data["upload_filename"] = "[provided_file.filename].[provided_file.filetype]" - + data["upload_filelist"] = list() if(upload_menu) var/list/all_files = list() @@ -104,7 +105,7 @@ var/global/nttransfer_uid = 0 "size" = F.size ))) data["upload_filelist"] = all_files - + data["servers"] = list() if(!(downloaded_file || provided_file || upload_menu)) var/list/all_servers = list() @@ -133,7 +134,7 @@ var/global/nttransfer_uid = 0 if(!remote || !remote.provided_file) return if(remote.server_password) - var/pass = sanitize(input(usr, "Code 401 Unauthorized. Please enter password:", "Password required")) + var/pass = sanitize(tgui_input_text(usr, "Code 401 Unauthorized. Please enter password:", "Password required")) if(pass != remote.server_password) error = "Incorrect Password" return @@ -151,7 +152,7 @@ var/global/nttransfer_uid = 0 provided_file = null return TRUE if("PRG_setpassword") - var/pass = sanitize(input(usr, "Enter new server password. Leave blank to cancel, input 'none' to disable password.", "Server security", "none")) + var/pass = sanitize(tgui_input_text(usr, "Enter new server password. Leave blank to cancel, input 'none' to disable password.", "Server security", "none")) if(!pass) return if(pass == "none") diff --git a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm index b22be72d1e..599f79fe78 100644 --- a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm +++ b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm @@ -9,12 +9,15 @@ available_on_ntnet = TRUE tgui_id = "NtosWordProcessor" - var/browsing + var/browsing = FALSE var/open_file var/loaded_data var/error var/is_edited + usage_flags = PROGRAM_ALL + category = PROG_OFFICE + /datum/computer_file/program/wordprocessor/proc/get_file(var/filename) var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive if(!HDD) @@ -130,7 +133,7 @@ if(tgui_alert(usr, "Would you like to save your changes first?","Save Changes",list("Yes","No")) == "Yes") save_file(open_file) - var/newname = sanitize(input(usr, "Enter file name:", "New File") as text|null) + var/newname = sanitize(tgui_input_text(usr, "Enter file name:", "New File")) if(!newname) return TRUE var/datum/computer_file/data/F = create_file(newname) @@ -143,7 +146,7 @@ return TRUE if("PRG_saveasfile") - var/newname = sanitize(input(usr, "Enter file name:", "Save As") as text|null) + var/newname = sanitize(tgui_input_text(usr, "Enter file name:", "Save As")) if(!newname) return TRUE var/datum/computer_file/data/F = create_file(newname, loaded_data) @@ -155,7 +158,7 @@ if("PRG_savefile") if(!open_file) - open_file = sanitize(input(usr, "Enter file name:", "Save As") as text|null) + open_file = sanitize(tgui_input_text(usr, "Enter file name:", "Save As")) if(!open_file) return 0 if(!save_file(open_file)) @@ -166,7 +169,7 @@ var/oldtext = html_decode(loaded_data) oldtext = replacetext(oldtext, "\[br\]", "\n") - var/newtext = sanitize(replacetext(input(usr, "Editing file '[open_file]'. You may use most tags used in paper formatting:", "Text Editor", oldtext) as message|null, "\n", "\[br\]"), MAX_TEXTFILE_LENGTH) + var/newtext = sanitize(replacetext(tgui_input_text(usr, "Editing file '[open_file]'. You may use most tags used in paper formatting:", "Text Editor", oldtext, MAX_TEXTFILE_LENGTH, TRUE, prevent_enter = TRUE), "\n", "\[br\]"), MAX_TEXTFILE_LENGTH) if(!newtext) return loaded_data = newtext @@ -229,4 +232,4 @@ data["filedata"] = pencode2html(loaded_data) data["filename"] = "UNNAMED" - return data \ No newline at end of file + return data diff --git a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm index 9b94707eb2..f536770859 100644 --- a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm +++ b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm @@ -7,6 +7,7 @@ program_menu_icon = "heart" extended_desc = "This program connects to life signs monitoring system to provide basic information on crew health." required_access = access_medical - requires_ntnet = 1 + requires_ntnet = TRUE network_destination = "crew lifesigns monitoring system" size = 11 + category = PROG_MONITOR diff --git a/code/modules/modular_computers/file_system/programs/research/email_administration.dm b/code/modules/modular_computers/file_system/programs/research/email_administration.dm index 0ad80422cb..fbcaf7df1b 100644 --- a/code/modules/modular_computers/file_system/programs/research/email_administration.dm +++ b/code/modules/modular_computers/file_system/programs/research/email_administration.dm @@ -6,10 +6,11 @@ program_key_state = "generic_key" program_menu_icon = "mail-open" size = 12 - requires_ntnet = 1 - available_on_ntnet = 1 + requires_ntnet = TRUE + available_on_ntnet = TRUE tgui_id = "NtosEmailAdministration" required_access = access_network + category = PROG_ADMIN var/datum/computer_file/data/email_account/current_account = null var/datum/computer_file/data/email_message/current_message = null @@ -92,7 +93,7 @@ if(!current_account) return TRUE - var/newpass = sanitize(input(usr,"Enter new password for account [current_account.login]", "Password"), 100) + var/newpass = sanitize(tgui_input_text(usr,"Enter new password for account [current_account.login]", "Password", null, 100), 100) if(!newpass) return TRUE current_account.password = newpass @@ -120,7 +121,7 @@ var/newdomain = sanitize(tgui_input_list(usr,"Pick domain:", "Domain name", using_map.usable_email_tlds)) if(!newdomain) return TRUE - var/newlogin = sanitize(input(usr,"Pick account name (@[newdomain]):", "Account name"), 100) + var/newlogin = sanitize(tgui_input_text(usr,"Pick account name (@[newdomain]):", "Account name", null, 100), 100) if(!newlogin) return TRUE diff --git a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm index d1aa9b7833..c74d927b9f 100644 --- a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm +++ b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm @@ -10,6 +10,7 @@ required_access = access_network available_on_ntnet = TRUE tgui_id = "NtosNetMonitor" + category = PROG_ADMIN /datum/computer_file/program/ntnetmonitor/tgui_data(mob/user) if(!ntnet_global) @@ -80,14 +81,14 @@ if("ban_nid") if(!ntnet_global) return - var/nid = input(usr,"Enter NID of device which you want to block from the network:", "Enter NID") as null|num + var/nid = tgui_input_number(usr,"Enter NID of device which you want to block from the network:", "Enter NID") if(nid && tgui_status(usr, state) == STATUS_INTERACTIVE) ntnet_global.banned_nids |= nid return TRUE if("unban_nid") if(!ntnet_global) return - var/nid = input(usr,"Enter NID of device which you want to unblock from the network:", "Enter NID") as null|num + var/nid = tgui_input_number(usr,"Enter NID of device which you want to unblock from the network:", "Enter NID") if(nid && tgui_status(usr, state) == STATUS_INTERACTIVE) ntnet_global.banned_nids -= nid - return TRUE + return TRUE diff --git a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm index 752d6d849e..eea7f5e306 100644 --- a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm +++ b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm @@ -17,11 +17,12 @@ var/warrant_uid = 0 program_icon_state = "warrant" program_key_state = "security_key" program_menu_icon = "star" - requires_ntnet = 1 - available_on_ntnet = 1 + requires_ntnet = TRUE + available_on_ntnet = TRUE required_access = access_security usage_flags = PROGRAM_ALL tgui_id = "NtosDigitalWarrant" + category = PROG_SEC var/datum/data/record/warrant/activewarrant @@ -119,7 +120,7 @@ var/warrant_uid = 0 if("editwarrantnamecustom") . = TRUE - var/new_name = sanitize(input(usr, "Please input name") as null|text) + var/new_name = sanitize(tgui_input_text(usr, "Please input name")) if(tgui_status(usr, state) == STATUS_INTERACTIVE) if (!new_name) return @@ -127,7 +128,7 @@ var/warrant_uid = 0 if("editwarrantcharges") . = TRUE - var/new_charges = sanitize(input(usr, "Please input charges", "Charges", activewarrant.fields["charges"]) as null|text) + var/new_charges = sanitize(tgui_input_text(usr, "Please input charges", "Charges", activewarrant.fields["charges"])) if(tgui_status(usr, state) == STATUS_INTERACTIVE) if (!new_charges) return diff --git a/code/modules/modular_computers/file_system/programs/ships/navigation.dm b/code/modules/modular_computers/file_system/programs/ships/navigation.dm index b8fecd9657..b01811210d 100644 --- a/code/modules/modular_computers/file_system/programs/ships/navigation.dm +++ b/code/modules/modular_computers/file_system/programs/ships/navigation.dm @@ -7,6 +7,6 @@ program_menu_icon = "pin-s" extended_desc = "Displays a ship's location in the sector." required_access = null - requires_ntnet = 1 + requires_ntnet = TRUE network_destination = "ship position sensors" size = 4 diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm index e82ab5b634..10a97887e0 100644 --- a/code/modules/modular_computers/hardware/_hardware.dm +++ b/code/modules/modular_computers/hardware/_hardware.dm @@ -3,33 +3,46 @@ desc = "Unknown Hardware." icon = 'icons/obj/modular_components.dmi' var/obj/item/modular_computer/holder2 = null - var/power_usage = 0 // If the hardware uses extra power, change this. - var/enabled = 1 // If the hardware is turned off set this to 0. - var/critical = 1 // Prevent disabling for important component, like the HDD. - var/hardware_size = 1 // Limits which devices can contain this component. 1: Tablets/Laptops/Consoles, 2: Laptops/Consoles, 3: Consoles only - var/damage = 0 // Current damage level - var/max_damage = 100 // Maximal damage level. - var/damage_malfunction = 20 // "Malfunction" threshold. When damage exceeds this value the hardware piece will semi-randomly fail and do !!FUN!! things - var/damage_failure = 50 // "Failure" threshold. When damage exceeds this value the hardware piece will not work at all. - var/malfunction_probability = 10// Chance of malfunction when the component is damaged -/obj/item/weapon/computer_hardware/attackby(var/obj/item/W as obj, var/mob/living/user as mob) + /// If the hardware uses extra power, change this. + var/power_usage = 0 + /// If the hardware is turned off set this to FALSE. + var/enabled = TRUE + /// Prevent disabling for important component, like the HDD. + var/critical = 1 + /// Limits which devices can contain this component. 1: All, 2: Laptops/Consoles, 3: Consoles only + var/hardware_size = 1 + /// Current damage level + var/damage = 0 + /// Maximal damage level. + var/max_damage = 100 + /// "Malfunction" threshold. When damage exceeds this value the hardware piece will semi-randomly fail and do !!FUN!! things + var/damage_malfunction = 20 + /// "Failure" threshold. When damage exceeds this value the hardware piece will not work at all. + var/damage_failure = 50 + /// Chance of malfunction when the component is damaged + var/malfunction_probability = 10 + var/usage_flags = PROGRAM_ALL + /// Whether attackby will be passed on it even with a closed panel + var/external_slot + +/obj/item/weapon/computer_hardware/attackby(obj/item/W as obj, mob/living/user as mob) // Multitool. Runs diagnostics if(istype(W, /obj/item/device/multitool)) to_chat(user, "***** DIAGNOSTICS REPORT *****") diagnostics(user) to_chat(user, "******************************") - return 1 + return TRUE // Nanopaste. Repair all damage if present for a single unit. var/obj/item/stack/S = W if(istype(S, /obj/item/stack/nanopaste)) if(!damage) to_chat(user, "\The [src] doesn't seem to require repairs.") - return 1 + return TRUE if(S.use(1)) to_chat(user, "You apply a bit of \the [W] to \the [src]. It immediately repairs all damage.") damage = 0 - return 1 + return TRUE // Cable coil. Works as repair method, but will probably require multiple applications and more cable. if(istype(S, /obj/item/stack/cable_coil)) if(!damage) @@ -38,11 +51,11 @@ if(S.use(1)) to_chat(user, "You patch up \the [src] with a bit of \the [W].") take_damage(-10) - return 1 + return TRUE return ..() -// Called on multitool click, prints diagnostic information to the user. +/// Returns a list of lines containing diagnostic information for display. /obj/item/weapon/computer_hardware/proc/diagnostics(var/mob/user) to_chat(user, "Hardware Integrity Test... (Corruption: [damage]/[max_damage]) [damage > damage_failure ? "FAIL" : damage > damage_malfunction ? "WARN" : "PASS"]") @@ -57,20 +70,20 @@ holder2 = null return ..() -// Handles damage checks +/// Handles damage checks /obj/item/weapon/computer_hardware/proc/check_functionality() // Turned off if(!enabled) - return 0 + return FALSE // Too damaged to work at all. if(damage > damage_failure) - return 0 + return FALSE // Still working. Well, sometimes... if(damage > damage_malfunction) if(prob(malfunction_probability)) - return 0 + return FALSE // Good to go. - return 1 + return TRUE /obj/item/weapon/computer_hardware/examine(var/mob/user) . = ..() @@ -81,8 +94,7 @@ else if(damage) . += "It seems to be slightly damaged." -// Damages the component. Contains necessary checks. Negative damage "heals" the component. +/// Damages the component. Contains necessary checks. Negative damage "heals" the component. /obj/item/weapon/computer_hardware/take_damage(var/amount) damage += round(amount) // We want nice rounded numbers here. damage = between(0, damage, max_damage) // Clamp the value. - diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm index c9aa58d8d1..e365ff16e6 100644 --- a/code/modules/modular_computers/hardware/hard_drive.dm +++ b/code/modules/modular_computers/hardware/hard_drive.dm @@ -5,9 +5,13 @@ icon_state = "hdd_normal" hardware_size = 1 origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) + var/max_capacity = 128 var/used_capacity = 0 - var/list/stored_files = list() // List of stored files on this drive. DO NOT MODIFY DIRECTLY! + /// List of stored files on this drive. DO NOT MODIFY DIRECTLY! + var/list/stored_files = list() + /// Whether drive is protected against changes + var/read_only = FALSE /obj/item/weapon/computer_hardware/hard_drive/advanced name = "advanced hard drive" @@ -60,6 +64,7 @@ // 999 is a byond limit that is in place. It's unlikely someone will reach that many files anyway, since you would sooner run out of space. to_chat(user, "NT-NFS File Table Status: [stored_files.len]/999") to_chat(user, "Storage capacity: [used_capacity]/[max_capacity]GQ") + to_chat(user, "Read-only mode: [(read_only ? "ON" : "OFF")]") // Use this proc to add file to the drive. Returns 1 on success and 0 on failure. Contains necessary sanity checks. /obj/item/weapon/computer_hardware/hard_drive/proc/store_file(var/datum/computer_file/F) @@ -164,4 +169,4 @@ /obj/item/weapon/computer_hardware/hard_drive/New() install_default_programs() - ..() \ No newline at end of file + ..() diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm index 65014be37f..b3b37ab54f 100644 --- a/code/modules/modular_computers/hardware/network_card.dm +++ b/code/modules/modular_computers/hardware/network_card.dm @@ -8,12 +8,20 @@ var/global/ntnet_card_uid = 1 critical = 0 icon_state = "netcard_basic" hardware_size = 1 - var/identification_id = null // Identification ID. Technically MAC address of this device. Can't be changed by user. - var/identification_string = "" // Identification string, technically nickname seen in the network. Can be set by user. - var/long_range = 0 - var/ethernet = 0 // Hard-wired, therefore always on, ignores NTNet wireless checks. malfunction_probability = 1 + /// Identification ID. Technically MAC address of this device. Can't be changed by user. + var/identification_id = null + /// Identification string, technically nickname seen in the network. Can be set by user. + var/identification_string = "" + + /// Long-range cards have stronger connections, letting them reach relays from connected Z-levels. + var/long_range = 0 + /// Hard-wired, therefore always on, ignores NTNet wireless checks. + var/ethernet = 0 + /// If set, uses the value to funnel connections through another network card. + var/proxy_id + /obj/item/weapon/computer_hardware/network_card/diagnostics(var/mob/user) ..() to_chat(user, "NIX Unique ID: [identification_id]") diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index f673e060ef..0242ad2a1f 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -285,7 +285,7 @@ return 0 if(customer_account.security_level != 0) //If card requires pin authentication (ie seclevel 1 or 2) - var/attempt_pin = input(usr, "Enter pin code", "Vendor transaction") as num + var/attempt_pin = tgui_input_number(usr, "Enter pin code", "Vendor transaction") customer_account = attempt_account_access(I.associated_account_number, attempt_pin, 2) if(!customer_account) diff --git a/code/modules/multiz/ladder_assembly_vr.dm b/code/modules/multiz/ladder_assembly_vr.dm index 3512a3b07f..b6e5bddf7e 100644 --- a/code/modules/multiz/ladder_assembly_vr.dm +++ b/code/modules/multiz/ladder_assembly_vr.dm @@ -16,7 +16,7 @@ /obj/structure/ladder_assembly/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/weapon/pen)) - var/t = sanitizeSafe(input(user, "Enter the name for the ladder.", "Ladder Name", src.created_name), MAX_NAME_LEN) + var/t = sanitizeSafe(tgui_input_text(user, "Enter the name for the ladder.", "Ladder Name", src.created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(in_range(src, user)) created_name = t return diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm index 49dd8eab97..a8dde43ee9 100644 --- a/code/modules/multiz/movement_vr.dm +++ b/code/modules/multiz/movement_vr.dm @@ -43,16 +43,16 @@ var/mob/living/prey = src var/fallloc = prey.loc - if(pred.can_be_drop_pred && prey.can_be_drop_prey && pred.drop_vore && prey.drop_vore) + if(pred.vore_selected && pred.can_be_drop_pred && prey.can_be_drop_prey && pred.drop_vore && prey.drop_vore) pred.feed_grabbed_to_self_falling_nom(pred,prey) pred.loc = fallloc if(!safe_fall) pred.Weaken(8) pred.visible_message("\The [pred] falls right onto \the [prey]!") - else if(prey.can_be_drop_pred && pred.can_be_drop_prey && pred.drop_vore && prey.drop_vore) + else if(prey.vore_selected && prey.can_be_drop_pred && pred.can_be_drop_prey && pred.drop_vore && prey.drop_vore) prey.feed_grabbed_to_self_falling_nom(prey,pred) - pred.Weaken(4) - pred.visible_message("\The [pred] falls right into \the [prey]!") + prey.Weaken(4) + prey.visible_message("\The [pred] falls right into \the [prey]!") else pred.loc = prey.loc if(!safe_fall) diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm index b3bbddfd4b..eddc1743df 100644 --- a/code/modules/multiz/turf.dm +++ b/code/modules/multiz/turf.dm @@ -53,6 +53,8 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr pathweight = 100000 //Seriously, don't try and path over this one numbnuts dynamic_lighting = 0 // Someday lets do proper lighting z-transfer. Until then we are leaving this off so it looks nicer. can_build_into_floor = TRUE + can_dirty = FALSE // It's open space + can_start_dirty = FALSE /turf/simulated/open/vacuum oxygen = 0 diff --git a/code/modules/news/new_newspaper.dm b/code/modules/news/new_newspaper.dm index c9759a5a83..3962f80cf4 100644 --- a/code/modules/news/new_newspaper.dm +++ b/code/modules/news/new_newspaper.dm @@ -134,7 +134,7 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user) if(scribble_page == curr_page) to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?") else - var/s = sanitize(input(user, "Write something", "Newspaper", "")) + var/s = sanitize(tgui_input_text(user, "Write something", "Newspaper", "")) s = sanitize(s) if(!s) return diff --git a/code/modules/news/newspaper.dm b/code/modules/news/newspaper.dm index 86a1149169..9eae4b19ee 100644 --- a/code/modules/news/newspaper.dm +++ b/code/modules/news/newspaper.dm @@ -135,7 +135,7 @@ if(scribble_page == curr_page) to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?") else - var/s = sanitize(input(user, "Write something", "Newspaper", "")) + var/s = sanitize(tgui_input_text(user, "Write something", "Newspaper", "")) s = sanitize(s) if(!s) return diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm index 48213b19a4..d334b91c21 100644 --- a/code/modules/nifsoft/nif.dm +++ b/code/modules/nifsoft/nif.dm @@ -677,7 +677,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable to_chat(src,"You don't have a NIF, not sure why this was here.") return - var/new_flavor = sanitize(input(src,"Describe how your NIF alters your appearance, like glowy eyes or metal plate on your head, etc. Be sensible. Clear this for no examine text. 128ch max.","Describe NIF", nif.examine_msg) as null|text, max_length = 128) + var/new_flavor = sanitize(tgui_input_text(src,"Describe how your NIF alters your appearance, like glowy eyes or metal plate on your head, etc. Be sensible. Clear this for no examine text. 128ch max.","Describe NIF", nif.examine_msg, 128), max_length = 128) //They clicked cancel or meanwhile lost their NIF if(!nif || isnull(new_flavor)) return //No changes diff --git a/code/modules/nifsoft/nifsoft.dm b/code/modules/nifsoft/nifsoft.dm index ad1af357f1..f4f3135b8e 100644 --- a/code/modules/nifsoft/nifsoft.dm +++ b/code/modules/nifsoft/nifsoft.dm @@ -263,7 +263,7 @@ ..(A,user,flag,params) /obj/item/weapon/disk/nifsoft/compliance/attack_self(mob/user) - var/newlaws = input(user,"Please Input Laws","Compliance Laws",laws) as message + var/newlaws = tgui_input_text(user, "Please Input Laws", "Compliance Laws", laws, multiline = TRUE, prevent_enter = TRUE) newlaws = sanitize(newlaws,2048) if(newlaws) to_chat(user,"You set the laws to:
[newlaws]") diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm index 750f1b7df2..a8f66619a6 100644 --- a/code/modules/nifsoft/software/13_soulcatcher.dm +++ b/code/modules/nifsoft/software/13_soulcatcher.dm @@ -125,10 +125,10 @@ switch(choice) if("Design Inside") - var/new_flavor = input(nif.human, "Type what the prey sees after being 'caught'. This will be \ + var/new_flavor = tgui_input_text(nif.human, "Type what the prey sees after being 'caught'. This will be \ printed after an intro ending with: \"Around you, you see...\" to the prey. If you already \ have prey, this will be printed to them after \"Your surroundings change to...\". Limit 2048 char.", \ - "VR Environment", html_decode(inside_flavor)) as message + "VR Environment", html_decode(inside_flavor), MAX_MESSAGE_LEN*2, TRUE, prevent_enter = TRUE) new_flavor = sanitize(new_flavor, MAX_MESSAGE_LEN*2) inside_flavor = new_flavor nif.notify("Updating VR environment...") @@ -326,7 +326,7 @@ /mob/living/carbon/brain/caught_soul/hear_say() if(ext_deaf || !client) return FALSE - ..() + .=..() /mob/living/carbon/brain/caught_soul/show_message(msg, type, alt, alt_type) if(ext_blind || !client) @@ -494,7 +494,7 @@ to_chat(src,SPAN_WARNING("You need a loaded mind to use NSay.")) return if(!message) - message = input(usr, "Type a message to say.","Speak into Soulcatcher") as text|null + message = tgui_input_text(usr, "Type a message to say.","Speak into Soulcatcher") if(message) var/sane_message = sanitize(message) SC.say_into(sane_message,src) @@ -503,7 +503,7 @@ set name = "NMe" set desc = "Emote into your NIF's Soulcatcher." set category = "IC" - + src.nme_act(message) /mob/proc/nme_act(message as text|null) @@ -525,7 +525,7 @@ return if(!message) - message = input(usr, "Type an action to perform.","Emote into Soulcatcher") as text|null + message = tgui_input_text(usr, "Type an action to perform.","Emote into Soulcatcher") if(message) var/sane_message = sanitize(message) SC.emote_into(sane_message,src) @@ -580,7 +580,7 @@ set category = "Soulcatcher" if(!message) - message = input(usr, "Type a message to say.","Speak into Soulcatcher") as text|null + message = tgui_input_text(usr, "Type a message to say.","Speak into Soulcatcher") if(message) var/sane_message = sanitize(message) soulcatcher.say_into(sane_message,src,null) @@ -591,7 +591,7 @@ set category = "Soulcatcher" if(!message) - message = input(usr, "Type an action to perform.","Emote into Soulcatcher") as text|null + message = tgui_input_text(usr, "Type an action to perform.","Emote into Soulcatcher") if(message) var/sane_message = sanitize(message) soulcatcher.emote_into(sane_message,src,null) diff --git a/code/modules/nifsoft/software/14_commlink.dm b/code/modules/nifsoft/software/14_commlink.dm index 93e1af799c..75a04fc589 100644 --- a/code/modules/nifsoft/software/14_commlink.dm +++ b/code/modules/nifsoft/software/14_commlink.dm @@ -128,4 +128,4 @@ return if(ringer && nif.human) - nif.notify("Commlink message from [who]: \"[text]\" (Open)") + nif.notify("Commlink message from [who]: \"[text]\" (Open) (Reply)") diff --git a/code/modules/nifsoft/software/15_misc.dm b/code/modules/nifsoft/software/15_misc.dm index 46db84c235..8e7101395f 100644 --- a/code/modules/nifsoft/software/15_misc.dm +++ b/code/modules/nifsoft/software/15_misc.dm @@ -127,7 +127,7 @@ /datum/nifsoft/sizechange/activate() if((. = ..())) - var/new_size = input(usr, "Put the desired size (25-200%), or (1-600%) in dormitory areas.", "Set Size", 200) as num|null + var/new_size = tgui_input_number(usr, "Put the desired size (25-200%), or (1-600%) in dormitory areas.", "Set Size", 200, 600, 1) if (!nif.human.size_range_check(new_size)) if(new_size) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 85d0720670..8f5d5bc9a0 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -378,7 +378,7 @@ droplimb(0, DROPLIMB_EDGE) else if(spread_dam && owner && parent && (brute_overflow || burn_overflow) && (brute_overflow >= 5 || burn_overflow >= 5) && !permutation) //No infinite damage loops. var/brute_third = brute_overflow * 0.33 - var/burn_third = burn_overflow * 0.33 + var/burn_third = burn_overflow * 0.33 if(children && children.len) var/brute_on_children = brute_third / children.len var/burn_on_children = burn_third / children.len @@ -1063,14 +1063,14 @@ Note that amputating the affected organ does in fact remove the infection from t if((status & ORGAN_BROKEN) || cannot_break) return - if(owner) - owner.visible_message(\ - "You hear a loud cracking sound coming from \the [owner].",\ - "Something feels like it shattered in your [name]!",\ - "You hear a sickening crack.") - jostle_bone() - if(organ_can_feel_pain() && !isbelly(owner.loc)) + if(owner) //VOREStation Edit Start + if(organ_can_feel_pain() && !isbelly(owner.loc) && !isliving(owner.loc)) + owner.visible_message(\ + "You hear a loud cracking sound coming from \the [owner].",\ + "Something feels like it shattered in your [name]!",\ + "You hear a sickening crack.") owner.emote("scream") + jostle_bone() //VOREStation Edit End playsound(src, "fracture", 10, 1, -2) status |= ORGAN_BROKEN diff --git a/code/modules/overmap/champagne.dm b/code/modules/overmap/champagne.dm index 477f9cc072..0d36766535 100644 --- a/code/modules/overmap/champagne.dm +++ b/code/modules/overmap/champagne.dm @@ -27,7 +27,7 @@ return user.visible_message("[user] lifts [src] bottle over [comp]!") - var/shuttle_name = input(usr, "Choose a name for the shuttle", "New Shuttle Name") as null|text + var/shuttle_name = tgui_input_text(usr, "Choose a name for the shuttle", "New Shuttle Name") if(!shuttle_name || QDELETED(src) || QDELETED(comp) || comp.shuttle_tag || user.incapacitated()) return // After input() safety re-checks diff --git a/code/modules/overmap/disperser/disperser_console.dm b/code/modules/overmap/disperser/disperser_console.dm index 789d768e6b..d67bb87c5c 100644 --- a/code/modules/overmap/disperser/disperser_console.dm +++ b/code/modules/overmap/disperser/disperser_console.dm @@ -177,7 +177,7 @@ . = TRUE if("calibration") - var/input = input(usr, "0-9", "disperser calibration", 0) as num|null + var/input = tgui_input_number(usr, "0-9", "disperser calibration", 0, 9, 0) if(!isnull(input)) //can be zero so we explicitly check for null var/calnum = sanitize_integer(text2num(params["calibration"]), 0, caldigit)//sanitiiiiize calibration[calnum + 1] = sanitize_integer(input, 0, 9, 0)//must add 1 because js indexes from 0 @@ -189,14 +189,14 @@ . = TRUE if("strength") - var/input = input(usr, "1-5", "disperser strength", 1) as num|null + var/input = tgui_input_number(usr, "1-5", "disperser strength", 1, 5, 1) if(input && tgui_status(usr, state) == STATUS_INTERACTIVE) strength = sanitize_integer(input, 1, 5, 1) middle.update_idle_power_usage(strength * range * 100) . = TRUE if("range") - var/input = input(usr, "1-5", "disperser radius", 1) as num|null + var/input = tgui_input_number(usr, "1-5", "disperser radius", 1, 5, 1) if(input && tgui_status(usr, state) == STATUS_INTERACTIVE) range = sanitize_integer(input, 1, 5, 1) middle.update_idle_power_usage(strength * range * 100) diff --git a/code/modules/overmap/ships/computers/engine_control.dm b/code/modules/overmap/ships/computers/engine_control.dm index 1110f6b246..ab1bb61b74 100644 --- a/code/modules/overmap/ships/computers/engine_control.dm +++ b/code/modules/overmap/ships/computers/engine_control.dm @@ -62,7 +62,7 @@ . = TRUE if("set_global_limit") - var/newlim = input(usr, "Input new thrust limit (0..100%)", "Thrust limit", linked.thrust_limit*100) as num + var/newlim = tgui_input_number(usr, "Input new thrust limit (0..100%)", "Thrust limit", linked.thrust_limit*100, 100, 0) if(tgui_status(usr, state) != STATUS_INTERACTIVE) return FALSE linked.thrust_limit = clamp(newlim/100, 0, 1) @@ -78,7 +78,7 @@ if("set_limit") var/datum/ship_engine/E = locate(params["engine"]) - var/newlim = input(usr, "Input new thrust limit (0..100)", "Thrust limit", E.get_thrust_limit()) as num + var/newlim = tgui_input_number(usr, "Input new thrust limit (0..100)", "Thrust limit", E.get_thrust_limit(), 100, 0) if(tgui_status(usr, state) != STATUS_INTERACTIVE) return FALSE var/limit = clamp(newlim/100, 0, 1) diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 2c821ef793..64212fd360 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -157,7 +157,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) switch(action) if("add") var/datum/computer_file/data/waypoint/R = new() - var/sec_name = input(usr, "Input navigation entry name", "New navigation entry", "Sector #[known_sectors.len]") as text + var/sec_name = tgui_input_text(usr, "Input navigation entry name", "New navigation entry", "Sector #[known_sectors.len]") if(tgui_status(usr, state) != STATUS_INTERACTIVE) return FALSE if(!sec_name) @@ -171,10 +171,10 @@ GLOBAL_LIST_EMPTY(all_waypoints) R.fields["x"] = linked.x R.fields["y"] = linked.y if("new") - var/newx = input(usr, "Input new entry x coordinate", "Coordinate input", linked.x) as num + var/newx = tgui_input_number(usr, "Input new entry x coordinate", "Coordinate input", linked.x) if(tgui_status(usr, state) != STATUS_INTERACTIVE) return TRUE - var/newy = input(usr, "Input new entry y coordinate", "Coordinate input", linked.y) as num + var/newy = tgui_input_number(usr, "Input new entry y coordinate", "Coordinate input", linked.y) if(tgui_status(usr, state) != STATUS_INTERACTIVE) return FALSE R.fields["x"] = CLAMP(newx, 1, world.maxx) @@ -191,14 +191,14 @@ GLOBAL_LIST_EMPTY(all_waypoints) if("setcoord") if(params["setx"]) - var/newx = input(usr, "Input new destiniation x coordinate", "Coordinate input", dx) as num|null + var/newx = tgui_input_number(usr, "Input new destiniation x coordinate", "Coordinate input", dx) if(tgui_status(usr, state) != STATUS_INTERACTIVE) return if(newx) dx = CLAMP(newx, 1, world.maxx) if(params["sety"]) - var/newy = input(usr, "Input new destiniation y coordinate", "Coordinate input", dy) as num|null + var/newy = tgui_input_number(usr, "Input new destiniation y coordinate", "Coordinate input", dy) if(tgui_status(usr, state) != STATUS_INTERACTIVE) return if(newy) @@ -216,13 +216,13 @@ GLOBAL_LIST_EMPTY(all_waypoints) . = TRUE if("speedlimit") - var/newlimit = input(usr, "Input new speed limit for autopilot (0 to brake)", "Autopilot speed limit", speedlimit*1000) as num|null + var/newlimit = tgui_input_number(usr, "Input new speed limit for autopilot (0 to brake)", "Autopilot speed limit", speedlimit*1000) if(newlimit) speedlimit = CLAMP(newlimit/1000, 0, 100) . = TRUE if("accellimit") - var/newlimit = input(usr, "Input new acceleration limit", "Acceleration limit", accellimit*1000) as num|null + var/newlimit = tgui_input_number(usr, "Input new acceleration limit", "Acceleration limit", accellimit*1000) if(newlimit) accellimit = max(newlimit/1000, 0) . = TRUE diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index e09678f9b0..21cd9654ee 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -106,7 +106,7 @@ if(sensors) switch(action) if("range") - var/nrange = input(usr, "Set new sensors range", "Sensor range", sensors.range) as num|null + var/nrange = tgui_input_number(usr, "Set new sensors range", "Sensor range", sensors.range) if(tgui_status(usr, state) != STATUS_INTERACTIVE) return FALSE if(nrange) diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm index 1a6077c30a..ec906ca3ad 100644 --- a/code/modules/paperwork/adminpaper.dm +++ b/code/modules/paperwork/adminpaper.dm @@ -87,7 +87,7 @@ to_chat(usr, "There isn't enough space left on \the [src] to write anything.") return - var/raw_t = tgui_input_message(usr, "Enter what you want to write:", "Write") + var/raw_t = tgui_input_text(usr, "Enter what you want to write:", "Write", multiline = TRUE, prevent_enter = TRUE) if(!raw_t) return var/t = sanitize(raw_t, free_space, extra = 0) @@ -158,4 +158,4 @@ return /obj/item/weapon/paper/admin/get_signature() - return input(usr, "Enter the name you wish to sign the paper with (will prompt for multiple entries, in order of entry)", "Signature") as text|null + return tgui_input_text(usr, "Enter the name you wish to sign the paper with (will prompt for multiple entries, in order of entry)", "Signature") diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index eb4ab5a835..9a8b40e043 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -133,7 +133,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins /obj/machinery/photocopier/faxmachine/attackby(obj/item/O as obj, mob/user as mob) if(O.is_multitool() && panel_open) - var/input = sanitize(input(usr, "What Department ID would you like to give this fax machine?", "Multitool-Fax Machine Interface", department)) + var/input = sanitize(tgui_input_text(usr, "What Department ID would you like to give this fax machine?", "Multitool-Fax Machine Interface", department)) if(!input) to_chat(usr, "No input found. Please hang up and try your call again.") return diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index c8869817ce..9953b77c45 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -69,7 +69,7 @@ to_chat(user, "You put the [W] into \the [src].") update_icon() else if(istype(W, /obj/item/weapon/pen)) - var/n_name = sanitizeSafe(input(usr, "What would you like to label the folder?", "Folder Labelling", null) as text, MAX_NAME_LEN) + var/n_name = sanitizeSafe(tgui_input_text(usr, "What would you like to label the folder?", "Folder Labelling", null, MAX_NAME_LEN), MAX_NAME_LEN) if((loc == usr && usr.stat == 0)) name = "folder[(n_name ? text("- '[n_name]'") : null)]" return diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 1b2624c125..5666b97d5e 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -73,7 +73,7 @@ if(mode) to_chat(user, SPAN_NOTICE("You turn on \the [src].")) //Now let them chose the text. - var/str = sanitizeSafe(input(user,"Label text?","Set label",""), MAX_NAME_LEN) + var/str = sanitizeSafe(tgui_input_text(user,"Label text?","Set label","",MAX_NAME_LEN), MAX_NAME_LEN) if(!str || !length(str)) to_chat(user, SPAN_WARNING("Invalid text.")) return diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 57fac614b8..547f72f6c9 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -179,7 +179,7 @@ if((CLUMSY in usr.mutations) && prob(50)) to_chat(usr, "You cut yourself on the paper.") return - var/n_name = sanitizeSafe(input(usr, "What would you like to label the paper?", "Paper Labelling", null) as text, MAX_NAME_LEN) + var/n_name = sanitizeSafe(tgui_input_text(usr, "What would you like to label the paper?", "Paper Labelling", null, MAX_NAME_LEN), MAX_NAME_LEN) // We check loc one level up, so we can rename in clipboards and such. See also: /obj/item/weapon/photo/rename() if((loc == usr || loc.loc && loc.loc == usr) && usr.stat == 0 && n_name) @@ -448,7 +448,7 @@ to_chat(usr, "There isn't enough space left on \the [src] to write anything.") return - var/raw = input(usr, "Enter what you want to write:", "Write") as null|message + var/raw = tgui_input_text(usr, "Enter what you want to write:", "Write", multiline = TRUE, prevent_enter = TRUE) if(!raw) return diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 24aeae6c71..287927a6d3 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -192,7 +192,7 @@ set category = "Object" set src in usr - var/n_name = sanitizeSafe(input(usr, "What would you like to label the bundle?", "Bundle Labelling", null) as text, MAX_NAME_LEN) + var/n_name = sanitizeSafe(tgui_input_text(usr, "What would you like to label the bundle?", "Bundle Labelling", null, MAX_NAME_LEN), MAX_NAME_LEN) if((loc == usr || loc.loc && loc.loc == usr) && usr.stat == 0) name = "[(n_name ? text("[n_name]") : "paper")]" add_fingerprint(usr) diff --git a/code/modules/paperwork/paper_sticky.dm b/code/modules/paperwork/paper_sticky.dm index 04f4249cfb..ba2a9195b3 100644 --- a/code/modules/paperwork/paper_sticky.dm +++ b/code/modules/paperwork/paper_sticky.dm @@ -34,7 +34,7 @@ if(writing_space <= 0) to_chat(user, SPAN_WARNING("There is no room left on \the [src].")) return - var/text = sanitizeSafe(input(usr, "What would you like to write?") as text, writing_space) + var/text = sanitizeSafe(tgui_input_text(usr, "What would you like to write?", null, null, writing_space), writing_space) if(!text || thing.loc != user || (!Adjacent(user) && loc != user) || user.incapacitated()) return user.visible_message("\The [user] jots a note down on \the [src].") diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 9fcf6c33ac..bcc0d0abc4 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -282,7 +282,7 @@ if(new_signature) signature = new_signature */ - signature = sanitize(input(usr, "Enter new signature. Leave blank for 'Anonymous'", "New Signature", signature)) + signature = sanitize(tgui_input_text(usr, "Enter new signature. Leave blank for 'Anonymous'", "New Signature", signature)) /obj/item/weapon/pen/proc/get_signature(var/mob/user) return (user && user.real_name) ? user.real_name : "Anonymous" diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index cc4d8103e1..4a79eb64a8 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -47,7 +47,7 @@ var/global/photo_count = 0 /obj/item/weapon/photo/attackby(obj/item/weapon/P as obj, mob/user as mob) if(istype(P, /obj/item/weapon/pen)) - var/txt = sanitize(input(user, "What would you like to write on the back?", "Photo Writing", null) as text, 128) + var/txt = sanitize(tgui_input_text(user, "What would you like to write on the back?", "Photo Writing", null, 128), 128) if(loc == user && user.stat == 0) scribble = txt ..() @@ -75,7 +75,7 @@ var/global/photo_count = 0 set category = "Object" set src in usr - var/n_name = sanitizeSafe(input(usr, "What would you like to label the photo?", "Photo Labelling", null) as text, MAX_NAME_LEN) + var/n_name = sanitizeSafe(tgui_input_text(usr, "What would you like to label the photo?", "Photo Labelling", null, MAX_NAME_LEN), MAX_NAME_LEN) //loc.loc check is for making possible renaming photos in clipboards if(( (loc == usr || (loc.loc && loc.loc == usr)) && usr.stat == 0)) name = "[(n_name ? text("[n_name]") : "photo")]" diff --git a/code/modules/pda/core_apps.dm b/code/modules/pda/core_apps.dm index 141f41a8fb..d140faed5c 100644 --- a/code/modules/pda/core_apps.dm +++ b/code/modules/pda/core_apps.dm @@ -62,7 +62,7 @@ return TRUE switch(action) if("Edit") - var/n = input(usr, "Please enter message", name, notehtml) as message + var/n = tgui_input_text(usr, "Please enter message", name, notehtml, multiline = TRUE, prevent_enter = TRUE) if(pda.loc == usr) note = adminscrub(n) notehtml = html_decode(note) diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm index 03996dc35c..6aa833fd83 100644 --- a/code/modules/pda/messenger.dm +++ b/code/modules/pda/messenger.dm @@ -120,7 +120,7 @@ /datum/data/pda/app/messenger/proc/create_message(var/mob/living/U, var/obj/item/device/pda/P) - var/t = input(U, "Please enter message", name, null) as text|null + var/t = tgui_input_text(U, "Please enter message", name, null) if(!t) return t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN)) diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm index a19552d368..c61624e40b 100644 --- a/code/modules/pda/pda.dm +++ b/code/modules/pda/pda.dm @@ -102,7 +102,7 @@ var/global/list/obj/item/device/pda/PDAs = list() O.show_message(text("[bicon(src)] *[ttone]*")) /obj/item/device/pda/proc/set_ringtone() - var/t = input(usr, "Please enter new ringtone", name, ttone) as text + var/t = tgui_input_text(usr, "Please enter new ringtone", name, ttone) if(in_range(src, usr) && loc == usr) if(t) if(hidden_uplink && hidden_uplink.check_trigger(usr, lowertext(t), lowertext(lock_code))) diff --git a/code/modules/persistence/graffiti.dm b/code/modules/persistence/graffiti.dm index cbd2fe01a9..e9a031bc8e 100644 --- a/code/modules/persistence/graffiti.dm +++ b/code/modules/persistence/graffiti.dm @@ -55,7 +55,7 @@ to_chat(user, SPAN_WARNING("You are banned from leaving persistent information across rounds.")) return - var/_message = sanitize(input(usr, "Enter an additional message to engrave.", "Graffiti") as null|text, trim = TRUE) + var/_message = sanitize(tgui_input_text(usr, "Enter an additional message to engrave.", "Graffiti"), trim = TRUE) if(_message && loc && user && !user.incapacitated() && user.Adjacent(loc) && thing.loc == user) user.visible_message("\The [user] begins carving something into \the [loc].") if(do_after(user, max(20, length(_message)), src) && loc) diff --git a/code/modules/persistence/storage/smartfridge.dm b/code/modules/persistence/storage/smartfridge.dm index a47099f328..1ffe9eb586 100644 --- a/code/modules/persistence/storage/smartfridge.dm +++ b/code/modules/persistence/storage/smartfridge.dm @@ -65,12 +65,12 @@ /datum/persistent/storage/smartfridge/produce name = "fruit storage" max_storage = 50 - store_per_type = FALSE + store_per_type = TRUE target_type = /obj/machinery/smartfridge/produce /datum/persistent/storage/smartfridge/produce/lossy name = "fruit storage lossy" - go_missing_chance = 12.5 // 10% loss between rounds + go_missing_chance = 10 // 10% loss chance between rounds /datum/persistent/storage/smartfridge/produce/generate_items(var/list/L) // Mostly same as storage/generate_items() but without converting string to path . = list() diff --git a/code/modules/planet/sif.dm b/code/modules/planet/sif.dm index d86f2ce82f..207c6e2bcf 100644 --- a/code/modules/planet/sif.dm +++ b/code/modules/planet/sif.dm @@ -447,7 +447,7 @@ var/datum/planet/sif/planet_sif = null light_color = "#FF0000" flight_failure_modifier = 25 transition_chances = list( - WEATHER_BLOODMOON = 100 + WEATHER_BLOOD_MOON = 100 ) observed_message = "Everything is red. Something really wrong is going on." transition_messages = list( diff --git a/code/modules/planet/virgo3b_vr.dm b/code/modules/planet/virgo3b_vr.dm index 822faa2d7e..9e76fd1eda 100644 --- a/code/modules/planet/virgo3b_vr.dm +++ b/code/modules/planet/virgo3b_vr.dm @@ -395,7 +395,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null if(show_message) to_chat(H, "Hail patters onto your umbrella.") continue - + var/target_zone = pick(BP_ALL) var/amount_blocked = H.run_armor_check(target_zone, "melee") var/amount_soaked = H.get_armor_soak(target_zone, "melee") @@ -419,7 +419,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null light_color = "#FF0000" flight_failure_modifier = 25 transition_chances = list( - WEATHER_BLOODMOON = 100 + WEATHER_BLOOD_MOON = 100 ) observed_message = "Everything is red. Something really ominous is going on." transition_messages = list( diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm index 24ffbf70c5..0555d29a3a 100644 --- a/code/modules/planet/virgo3c_vr.dm +++ b/code/modules/planet/virgo3c_vr.dm @@ -150,7 +150,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null WEATHER_CLEAR = 60, WEATHER_OVERCAST = 20, WEATHER_LIGHT_SNOW = 1, - WEATHER_BLOODMOON = 1, + WEATHER_BLOOD_MOON = 1, WEATHER_EMBERFALL = 0.5) transition_messages = list( "The sky clears up.", @@ -294,7 +294,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null effect_message = "Rain falls on you, drenching you in water." var/next_lightning_strike = 0 // world.time when lightning will strike. - var/min_lightning_cooldown = 1 SECONDS + var/min_lightning_cooldown = 1 MINUTE var/max_lightning_cooldown = 5 MINUTE observed_message = "An intense storm pours down over the region." transition_messages = list( @@ -410,7 +410,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null temp_low = 273.15 // 0c flight_failure_modifier = 25 transition_chances = list( - WEATHER_BLOODMOON = 25, + WEATHER_BLOOD_MOON = 25, WEATHER_CLEAR = 75 ) observed_message = "Everything is red. Something really ominous is going on." @@ -601,7 +601,7 @@ VIRGO3C_TURF_CREATE(/turf/simulated/floor/tiled/asteroid_steel/outdoors) /mob/living/simple_mob/vore/bigdragon/friendly = 1, /mob/living/simple_mob/vore/alienanimals/dustjumper = 20 ) - + /turf/simulated/floor/outdoors/grass/forest/virgo3c/Initialize() if(tree_chance && prob(tree_chance) && !check_density()) diff --git a/code/modules/planet/virgo4_vr.dm b/code/modules/planet/virgo4_vr.dm index 74cd6c33b4..f4e2118e80 100644 --- a/code/modules/planet/virgo4_vr.dm +++ b/code/modules/planet/virgo4_vr.dm @@ -392,7 +392,7 @@ var/datum/planet/virgo4/planet_virgo4 = null temp_low = 283.15 // 10c flight_failure_modifier = 25 transition_chances = list( - WEATHER_BLOODMOON = 100 + WEATHER_BLOOD_MOON = 100 ) observed_message = "Everything is red. Something really ominous is going on." transition_messages = list( diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index 83d81f99a7..f8915e08af 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -93,7 +93,7 @@ /obj/machinery/power/breakerbox/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) if(istype(W, /obj/item/device/multitool)) - var/newtag = input(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system") as text + var/newtag = tgui_input_text(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system") if(newtag) RCon_tag = newtag to_chat(user, "You changed the RCON tag to: [newtag]") diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index a4efe1336c..c850085bbd 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -978,7 +978,7 @@ var/list/possible_cable_coil_colours = list( /obj/item/stack/cable_coil/alien/attack_hand(mob/user as mob) if (user.get_inactive_hand() == src) - var/N = input(usr, "How many units of wire do you want to take from [src]? You can only take up to [amount] at a time.", "Split stacks", 1) as num|null + var/N = tgui_input_number(usr, "How many units of wire do you want to take from [src]? You can only take up to [amount] at a time.", "Split stacks", 1) if(N && N <= amount) var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc) CC.amount = N diff --git a/code/modules/power/fusion/core/_core.dm b/code/modules/power/fusion/core/_core.dm index 0fb5626a57..308c930783 100644 --- a/code/modules/power/fusion/core/_core.dm +++ b/code/modules/power/fusion/core/_core.dm @@ -149,7 +149,7 @@ GLOBAL_LIST_EMPTY(fusion_cores) return if(istype(W, /obj/item/device/multitool)) - var/new_ident = input(usr, "Enter a new ident tag.", "Fusion Core", id_tag) as null|text + var/new_ident = tgui_input_text(usr, "Enter a new ident tag.", "Fusion Core", id_tag) if(new_ident && user.Adjacent(src)) id_tag = new_ident return diff --git a/code/modules/power/fusion/core/core_control.dm b/code/modules/power/fusion/core/core_control.dm index 7f909d4896..ae3af61c9a 100644 --- a/code/modules/power/fusion/core/core_control.dm +++ b/code/modules/power/fusion/core/core_control.dm @@ -24,7 +24,7 @@ /obj/machinery/computer/fusion_core_control/attackby(var/obj/item/thing, var/mob/user) ..() if(istype(thing, /obj/item/device/multitool)) - var/new_ident = sanitize_text(input(usr, "Enter a new ident tag.", "Core Control", monitor.core_tag) as null|text) + var/new_ident = sanitize_text(tgui_input_text(usr, "Enter a new ident tag.", "Core Control", monitor.core_tag)) if(new_ident && user.Adjacent(src)) monitor.core_tag = new_ident // id_tag = new_ident diff --git a/code/modules/power/fusion/fuel_assembly/fuel_control.dm b/code/modules/power/fusion/fuel_assembly/fuel_control.dm index 6fd14755af..24394b7973 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_control.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_control.dm @@ -117,7 +117,7 @@ /obj/machinery/computer/fusion_fuel_control/attackby(var/obj/item/W, var/mob/user) ..() if(istype(W, /obj/item/device/multitool)) - var/new_ident = input(usr, "Enter a new ident tag.", "Fuel Control", monitor.fuel_tag) as null|text + var/new_ident = tgui_input_text(usr, "Enter a new ident tag.", "Fuel Control", monitor.fuel_tag) if(new_ident && user.Adjacent(src)) monitor.fuel_tag = new_ident return diff --git a/code/modules/power/fusion/fuel_assembly/fuel_injector.dm b/code/modules/power/fusion/fuel_assembly/fuel_injector.dm index b8df226775..77b703e85e 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_injector.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_injector.dm @@ -43,7 +43,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors) /obj/machinery/fusion_fuel_injector/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/device/multitool)) - var/new_ident = input(usr, "Enter a new ident tag.", "Fuel Injector", id_tag) as null|text + var/new_ident = tgui_input_text(usr, "Enter a new ident tag.", "Fuel Injector", id_tag) if(new_ident && user.Adjacent(src)) id_tag = new_ident return diff --git a/code/modules/power/fusion/gyrotron/gyrotron.dm b/code/modules/power/fusion/gyrotron/gyrotron.dm index 8f7e1f9f52..b2b33ef96b 100644 --- a/code/modules/power/fusion/gyrotron/gyrotron.dm +++ b/code/modules/power/fusion/gyrotron/gyrotron.dm @@ -53,7 +53,7 @@ GLOBAL_LIST_EMPTY(gyrotrons) /obj/machinery/power/emitter/gyrotron/attackby(var/obj/item/W, var/mob/user) if(istype(W, /obj/item/device/multitool)) - var/new_ident = input(usr, "Enter a new ident tag.", "Gyrotron", id_tag) as null|text + var/new_ident = tgui_input_text(usr, "Enter a new ident tag.", "Gyrotron", id_tag) if(new_ident && user.Adjacent(src)) id_tag = new_ident return diff --git a/code/modules/power/fusion/gyrotron/gyrotron_control.dm b/code/modules/power/fusion/gyrotron/gyrotron_control.dm index ef4dd1641c..9ff359fd29 100644 --- a/code/modules/power/fusion/gyrotron/gyrotron_control.dm +++ b/code/modules/power/fusion/gyrotron/gyrotron_control.dm @@ -119,7 +119,7 @@ /obj/machinery/computer/gyrotron_control/attackby(var/obj/item/W, var/mob/user) ..() if(istype(W, /obj/item/device/multitool)) - var/new_ident = input(usr, "Enter a new ident tag.", "Gyrotron Control", monitor.gyro_tag) as null|text + var/new_ident = tgui_input_text(usr, "Enter a new ident tag.", "Gyrotron Control", monitor.gyro_tag) if(new_ident && user.Adjacent(src)) monitor.gyro_tag = new_ident return diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 2a79ddb08a..bcd27128f9 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -1,1073 +1,1093 @@ -// The lighting system -// -// consists of light fixtures (/obj/machinery/light) and light tube/bulb items (/obj/item/weapon/light) - - -// status values shared between lighting fixtures and items -#define LIGHT_OK 0 -#define LIGHT_EMPTY 1 -#define LIGHT_BROKEN 2 -#define LIGHT_BURNED 3 -#define LIGHT_BULB_TEMPERATURE 400 //K - used value for a 60W bulb -#define LIGHTING_POWER_FACTOR 2 //5W per luminosity * range //VOREStation Edit: why the fuck are lights eating so much power, 2W per thing -#define LIGHT_EMERGENCY_POWER_USE 0.2 //How much power emergency lights will consume per tick - -var/global/list/light_type_cache = list() -/proc/get_light_type_instance(var/light_type) - . = light_type_cache[light_type] - if(!.) - . = new light_type - light_type_cache[light_type] = . - -/obj/machinery/light_construct - name = "light fixture frame" - desc = "A light fixture under construction." - icon = 'icons/obj/lighting.dmi' - icon_state = "tube-construct-stage1" - anchored = TRUE - plane = MOB_PLANE - layer = ABOVE_MOB_LAYER - var/stage = 1 - var/fixture_type = /obj/machinery/light - var/sheets_refunded = 2 - var/obj/machinery/light/newlight = null - var/obj/item/weapon/cell/cell = null - - var/cell_connectors = TRUE - -/obj/machinery/light_construct/New(var/atom/newloc, var/newdir, var/building = 0, var/datum/frame/frame_types/frame_type, var/obj/machinery/light/fixture = null) - ..(newloc) - if(fixture) - fixture_type = fixture.type - fixture.transfer_fingerprints_to(src) - set_dir(fixture.dir) - stage = 2 - else if(newdir) - set_dir(newdir) - update_icon() - -/obj/machinery/light_construct/update_icon() - switch(stage) - if(1) - icon_state = "tube-construct-stage1" - if(2) - icon_state = "tube-construct-stage2" - if(3) - icon_state = "tube-empty" - -/obj/machinery/light_construct/examine(mob/user) - . = ..() - if(get_dist(user, src) <= 2) - switch(stage) - if(1) - . += "It's an empty frame." - if(2) - . += "It's wired." - if(3) - . += "The casing is closed." - if(cell_connectors) - if(cell) - . += "You see [cell] inside the casing." - else - . += "The casing has no power cell for backup power." - else - . += "This casing doesn't support power cells for backup power." - -/obj/machinery/light_construct/attack_hand(mob/user) - . = ..() - if(.) - return . // obj/machinery/attack_hand returns 1 if user can't use the machine - if(cell) - user.visible_message("[user] removes [cell] from [src]!","You remove [cell].") - user.put_in_hands(cell) - cell.update_icon() - cell = null - -/obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/user as mob) - src.add_fingerprint(user) - if(istype(W, /obj/item/weapon/cell/emergency_light)) - if(!cell_connectors) - to_chat(user, "This [name] can't support a power cell!") - return - if(!user.unEquip(W)) - to_chat(user, "[W] is stuck to your hand!") - return - if(cell) - to_chat(user, "There is a power cell already installed!") - else if(user.drop_from_inventory(W)) - user.visible_message("[user] hooks up [W] to [src].", \ - "You add [W] to [src].") - playsound(src, 'sound/machines/click.ogg', 50, TRUE) - W.forceMove(src) - cell = W - add_fingerprint(user) - return - - if (W.is_wrench()) - if (src.stage == 1) - playsound(src, W.usesound, 75, 1) - to_chat(usr, "You begin deconstructing [src].") - if (!do_after(usr, 30 * W.toolspeed)) - return - new /obj/item/stack/material/steel( get_turf(src.loc), sheets_refunded ) - user.visible_message("[user.name] deconstructs [src].", \ - "You deconstruct [src].", "You hear a noise.") - playsound(src, 'sound/items/Deconstruct.ogg', 75, 1) - qdel(src) - if (src.stage == 2) - to_chat(usr, "You have to remove the wires first.") - return - - if (src.stage == 3) - to_chat(usr, "You have to unscrew the case first.") - return - - if(W.is_wirecutter()) - if (src.stage != 2) return - src.stage = 1 - src.update_icon() - new /obj/item/stack/cable_coil(get_turf(src.loc), 1, "red") - user.visible_message("[user.name] removes the wiring from [src].", \ - "You remove the wiring from [src].", "You hear a noise.") - playsound(src, W.usesound, 50, 1) - return - - if(istype(W, /obj/item/stack/cable_coil)) - if (src.stage != 1) return - var/obj/item/stack/cable_coil/coil = W - if (coil.use(1)) - src.stage = 2 - src.update_icon() - user.visible_message("[user.name] adds wires to [src].", \ - "You add wires to [src].") - return - - if(W.is_screwdriver()) - if (src.stage == 2) - src.stage = 3 - src.update_icon() - user.visible_message("[user.name] closes [src]'s casing.", \ - "You close [src]'s casing.", "You hear a noise.") - playsound(src, W.usesound, 75, 1) - - var/obj/machinery/light/newlight = new fixture_type(src.loc, src) - newlight.set_dir(src.dir) - src.transfer_fingerprints_to(newlight) - if(cell) - newlight.cell = cell - cell.forceMove(newlight) - cell = null - qdel(src) - return - ..() - -/obj/machinery/light_construct/small - name = "small light fixture frame" - desc = "A small light fixture under construction." - icon = 'icons/obj/lighting.dmi' - icon_state = "bulb-construct-stage1" - anchored = TRUE - stage = 1 - fixture_type = /obj/machinery/light/small - sheets_refunded = 1 - -/obj/machinery/light_construct/small/update_icon() - switch(stage) - if(1) - icon_state = "bulb-construct-stage1" - if(2) - icon_state = "bulb-construct-stage2" - if(3) - icon_state = "bulb-empty" - -/obj/machinery/light_construct/flamp - name = "floor light fixture frame" - desc = "A floor light fixture under construction." - icon = 'icons/obj/lighting.dmi' - icon_state = "flamp-construct-stage1" - anchored = FALSE - plane = OBJ_PLANE - layer = OBJ_LAYER - stage = 1 - fixture_type = /obj/machinery/light/flamp - sheets_refunded = 2 - -/obj/machinery/light_construct/flamp/update_icon() - switch(stage) - if(1) - icon_state = "flamp-construct-stage1" - if(2) - icon_state = "flamp-construct-stage2" - if(3) - icon_state = "flamp-empty" - -// the standard tube light fixture -/obj/machinery/light - name = "light fixture" - icon = 'icons/obj/lighting_vr.dmi' //VOREStation Edit - var/base_state = "tube" // base description and icon_state - icon_state = "tube1" - desc = "A lighting fixture." - anchored = TRUE - plane = MOB_PLANE - layer = ABOVE_MOB_LAYER - use_power = USE_POWER_ACTIVE - idle_power_usage = 2 - active_power_usage = 10 - power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list - var/on = 0 // 1 if on, 0 if off - var/brightness_range - var/brightness_power - var/brightness_color - var/status = LIGHT_OK // LIGHT_OK, _EMPTY, _BURNED or _BROKEN - var/flickering = 0 - var/light_type = /obj/item/weapon/light/tube // the type of light item - var/construct_type = /obj/machinery/light_construct - var/switchcount = 0 // count of number of times switched on/off - // this is used to calc the probability the light burns out - - var/rigged = 0 // true if rigged to explode - //VOREStation Edit Start - var/needsound = FALSE // Flag to prevent playing turn-on sound multiple times, and from playing at roundstart - var/shows_alerts = TRUE // Flag for if this fixture should show alerts. Make sure icon states exist! - var/current_alert = null // Which alert are we showing right now? - //VOREStation Edit End - - var/auto_flicker = FALSE // If true, will constantly flicker, so long as someone is around to see it (otherwise its a waste of CPU). - - var/obj/item/weapon/cell/emergency_light/cell - var/start_with_cell = TRUE // if true, this fixture generates a very weak cell at roundstart - - var/emergency_mode = FALSE // if true, the light is in emergency mode - var/no_emergency = FALSE // if true, this light cannot ever have an emergency mode - var/bulb_emergency_brightness_mul = 0.25 // multiplier for this light's base brightness in emergency power mode - var/bulb_emergency_colour = "#FF3232" // determines the colour of the light while it's in emergency mode - var/bulb_emergency_pow_mul = 0.75 // the multiplier for determining the light's power in emergency mode - var/bulb_emergency_pow_min = 0.5 // the minimum value for the light's power in emergency mode - - var/nightshift_enabled = FALSE - var/nightshift_allowed = TRUE - var/brightness_range_ns - var/brightness_power_ns - var/brightness_color_ns - -/obj/machinery/light/flicker - auto_flicker = TRUE - -/obj/machinery/light/no_nightshift - nightshift_allowed = FALSE - -// the smaller bulb light fixture - -/obj/machinery/light/small - icon_state = "bulb1" - base_state = "bulb" - desc = "A small lighting fixture." - light_type = /obj/item/weapon/light/bulb - construct_type = /obj/machinery/light_construct/small - shows_alerts = FALSE //VOREStation Edit - -/obj/machinery/light/small/flicker - auto_flicker = TRUE - -/obj/machinery/light/poi - start_with_cell = FALSE - -/obj/machinery/light/small/poi - start_with_cell = FALSE - -/obj/machinery/light/flamp - icon = 'icons/obj/lighting.dmi' //VOREStation Edit - icon_state = "flamp1" - base_state = "flamp" - plane = OBJ_PLANE - layer = OBJ_LAYER - desc = "A floor lamp." - light_type = /obj/item/weapon/light/bulb/large - construct_type = /obj/machinery/light_construct/flamp - shows_alerts = FALSE //VOREStation Edit - var/lamp_shade = 1 - -/obj/machinery/light/flamp/Initialize(mapload, obj/machinery/light_construct/construct = null) - . = ..() - if(construct) - start_with_cell = FALSE - lamp_shade = 0 - update_icon() - else - if(start_with_cell && !no_emergency) - cell = new/obj/item/weapon/cell/emergency_light(src) - - -/obj/machinery/light/flamp/flicker - auto_flicker = TRUE - -/obj/machinery/light/small/emergency - light_type = /obj/item/weapon/light/bulb/red - -/obj/machinery/light/small/emergency/flicker - auto_flicker = TRUE - -/obj/machinery/light/spot - name = "spotlight" - light_type = /obj/item/weapon/light/tube/large - shows_alerts = FALSE //VOREStation Edit - -//YW ADDITION START -/obj/machinery/light/spot/no_nightshift - nightshift_allowed = FALSE -//YW ADDITION END - -/obj/machinery/light/spot/flicker - auto_flicker = TRUE - -//VOREStation Add - Shadeless! -/obj/machinery/light/flamp/noshade - lamp_shade = 0 -//VOREStation Add End - -// create a new lighting fixture -/obj/machinery/light/Initialize(mapload, obj/machinery/light_construct/construct = null) - . =..() - - if(start_with_cell && !no_emergency) - cell = new/obj/item/weapon/cell/emergency_light(src) - if(construct) - start_with_cell = FALSE - status = LIGHT_EMPTY - construct_type = construct.type - construct.transfer_fingerprints_to(src) - set_dir(construct.dir) - else - if(start_with_cell && !no_emergency) - cell = new/obj/item/weapon/cell/emergency_light(src) - var/obj/item/weapon/light/L = get_light_type_instance(light_type) - update_from_bulb(L) - if(prob(L.broken_chance)) - broken(1) - - on = powered() - update(0) - -/obj/machinery/light/Destroy() - var/area/A = get_area(src) - if(A) - on = 0 -// A.update_lights() - QDEL_NULL(cell) - return ..() - -/obj/machinery/light/update_icon() - - switch(status) // set icon_states - if(LIGHT_OK) - //VOREStation Edit Start - if(shows_alerts && current_alert && on) - icon_state = "[base_state]-alert-[current_alert]" - else - icon_state = "[base_state][on]" - //VOREStation Edit End - if(LIGHT_EMPTY) - icon_state = "[base_state]-empty" - on = 0 - if(LIGHT_BURNED) - icon_state = "[base_state]-burned" - on = 0 - if(LIGHT_BROKEN) - icon_state = "[base_state]-broken" - on = 0 - return - -/obj/machinery/light/flamp/update_icon() - if(lamp_shade) - base_state = "flampshade" - switch(status) // set icon_states - if(LIGHT_OK) - icon_state = "[base_state][on]" - if(LIGHT_EMPTY) - on = 0 - icon_state = "[base_state][on]" - if(LIGHT_BURNED) - on = 0 - icon_state = "[base_state][on]" - if(LIGHT_BROKEN) - on = 0 - icon_state = "[base_state][on]" - return - else - base_state = "flamp" - ..() -//VOREStation Edit Start -/obj/machinery/light/proc/set_alert_atmos() - if(!shows_alerts) - return - current_alert = "atmos" - brightness_color = "#6D6DFC" - update() - -/obj/machinery/light/proc/set_alert_fire() - if(!shows_alerts) - return - current_alert = "fire" - brightness_color = "#FF3030" - update() - -/obj/machinery/light/proc/reset_alert() - if(!shows_alerts) - return - - current_alert = null - var/obj/item/weapon/light/L = get_light_type_instance(light_type) - - if(L) - update_from_bulb(L) - else - brightness_color = nightshift_enabled ? initial(brightness_color_ns) : initial(brightness_color) - - update() - -//VOREstation Edit End -// update lighting -/obj/machinery/light/proc/update(var/trigger = 1) - update_icon() - //VOREStation Edit Start - if(!on) - needsound = TRUE // Play sound next time we turn on - else if(needsound) - playsound(src, 'sound/effects/lighton.ogg', 65, 1) - needsound = FALSE // Don't play sound again until we've been turned off - //VOREStation Edit End - - if(on) - var/correct_range = nightshift_enabled ? brightness_range_ns : brightness_range - var/correct_power = nightshift_enabled ? brightness_power_ns : brightness_power - var/correct_color = nightshift_enabled ? brightness_color_ns : brightness_color - if(light_range != correct_range || light_power != correct_power || light_color != correct_color) - if(!auto_flicker) - switchcount++ - if(rigged) - if(status == LIGHT_OK && trigger) - - log_admin("LOG: Rigged light explosion, last touched by [fingerprintslast]") - message_admins("LOG: Rigged light explosion, last touched by [fingerprintslast]") - - explode() - else if( prob( min(60, switchcount*switchcount*0.01) ) ) - if(status == LIGHT_OK && trigger) - status = LIGHT_BURNED - update_icon() - on = 0 - set_light(0) - else - update_use_power(USE_POWER_ACTIVE) - set_light(correct_range, correct_power, correct_color) - if(cell?.charge < cell?.maxcharge) - START_PROCESSING(SSobj, src) - else if(has_emergency_power(LIGHT_EMERGENCY_POWER_USE) && !turned_off()) - update_use_power(USE_POWER_IDLE) - emergency_mode = TRUE - START_PROCESSING(SSobj, src) - else - update_use_power(USE_POWER_IDLE) - set_light(0) - update_icon() - - update_active_power_usage((light_range * light_power) * LIGHTING_POWER_FACTOR) - -/obj/machinery/light/proc/nightshift_mode(var/state) - if(!nightshift_allowed) - return - - if(state != nightshift_enabled) - nightshift_enabled = state - update(FALSE) - -/obj/machinery/light/attack_generic(var/mob/user, var/damage) - if(!damage) - return - if(status == LIGHT_EMPTY||status == LIGHT_BROKEN) - to_chat(user, "That object is useless to you.") - return - if(!(status == LIGHT_OK||status == LIGHT_BURNED)) - return - visible_message("[user] smashes the light!") - user.do_attack_animation(src) - broken() - return 1 - -/obj/machinery/light/take_damage(var/damage) - if(!damage) - return - if(status == LIGHT_EMPTY||status == LIGHT_BROKEN) - return - if(!(status == LIGHT_OK||status == LIGHT_BURNED)) - return - broken() - return 1 - -/obj/machinery/light/blob_act() - broken() - -// attempt to set the light's on/off status -// will not switch on if broken/burned/empty -/obj/machinery/light/proc/seton(var/s) - on = (s && status == LIGHT_OK) - update() - -/obj/machinery/light/get_cell() - return cell - -// examine verb -/obj/machinery/light/examine(mob/user) - . = ..() - var/fitting = get_fitting_name() - switch(status) - if(LIGHT_OK) - . += "It is turned [on? "on" : "off"]." - if(LIGHT_EMPTY) - . += "The [fitting] has been removed." - if(LIGHT_BURNED) - . += "The [fitting] is burnt out." - if(LIGHT_BROKEN) - . += "The [fitting] has been smashed." - if(cell) - . += "Its backup power charge meter reads [round((cell.charge / cell.maxcharge) * 100, 0.1)]%." - - -/obj/machinery/light/proc/get_fitting_name() - var/obj/item/weapon/light/L = light_type - return initial(L.name) - -/obj/machinery/light/proc/update_from_bulb(obj/item/weapon/light/L) - status = L.status - switchcount = L.switchcount - rigged = L.rigged - - brightness_range = L.brightness_range - brightness_power = L.brightness_power - brightness_color = L.brightness_color - - brightness_range_ns = L.nightshift_range - brightness_power_ns = L.nightshift_power - brightness_color_ns = L.nightshift_color - -// attack with item - insert light (if right type), otherwise try to break the light - -/obj/machinery/light/proc/insert_bulb(obj/item/weapon/light/L) - update_from_bulb(L) - qdel(L) - - on = powered() - update() - - if(on && rigged) - - log_admin("LOG: Rigged light explosion, last touched by [fingerprintslast]") - message_admins("LOG: Rigged light explosion, last touched by [fingerprintslast]") - - explode() - -/obj/machinery/light/proc/remove_bulb() - . = new light_type(src.loc, src) - - switchcount = 0 - status = LIGHT_EMPTY - update() - -/obj/machinery/light/attackby(obj/item/W, mob/user) - - //Light replacer code - if(istype(W, /obj/item/device/lightreplacer)) - var/obj/item/device/lightreplacer/LR = W - if(isliving(user)) - var/mob/living/U = user - LR.ReplaceLight(src, U) - return - - // attempt to insert light - if(istype(W, /obj/item/weapon/light)) - if(status != LIGHT_EMPTY) - to_chat(user, "There is a [get_fitting_name()] already inserted.") - return - if(!istype(W, light_type)) - to_chat(user, "This type of light requires a [get_fitting_name()].") - return - - to_chat(user, "You insert [W].") - insert_bulb(W) - src.add_fingerprint(user) - - // attempt to break the light - //If xenos decide they want to smash a light bulb with a toolbox, who am I to stop them? /N - - else if(status != LIGHT_BROKEN && status != LIGHT_EMPTY) - - - if(prob(1+W.force * 5)) - - to_chat(user, "You hit the light, and it smashes!") - for(var/mob/M in viewers(src)) - if(M == user) - continue - M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) - if(on && !(W.flags & NOCONDUCT)) - //if(!user.mutations & COLD_RESISTANCE) - if (prob(12)) - electrocute_mob(user, get_area(src), src, 0.3) - broken() - - else - to_chat(user, "You hit the light!") - - // attempt to stick weapon into light socket - else if(status == LIGHT_EMPTY) - if(W.is_screwdriver()) //If it's a screwdriver open it. - playsound(src, W.usesound, 75, 1) - user.visible_message("[user.name] opens [src]'s casing.", \ - "You open [src]'s casing.", "You hear a noise.") - new construct_type(src.loc, fixture = src) - qdel(src) - return - - to_chat(user, "You stick \the [W] into the light socket!") - if(has_power() && !(W.flags & NOCONDUCT)) - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(3, 1, src) - s.start() - //if(!user.mutations & COLD_RESISTANCE) - if (prob(75)) - electrocute_mob(user, get_area(src), src, rand(0.7,1.0)) - -/obj/machinery/light/flamp/attackby(obj/item/W, mob/user) - if(W.is_wrench()) - anchored = !anchored - playsound(src, W.usesound, 50, 1) - to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") - - if(!lamp_shade) - if(istype(W, /obj/item/weapon/lampshade)) - lamp_shade = 1 - qdel(W) - update_icon() - return - - else - if(W.is_screwdriver()) - playsound(src, W.usesound, 75, 1) - user.visible_message("[user.name] removes [src]'s lamp shade.", \ - "You remove [src]'s lamp shade.", "You hear a noise.") - lamp_shade = 0 - new /obj/item/weapon/lampshade(src.loc) - update_icon() - return - - ..() - -// returns if the light has power /but/ is manually turned off -// if a light is turned off, it won't activate emergency power -/obj/machinery/light/proc/turned_off() - var/area/A = get_area(src) - return !A.lightswitch && A.power_light || flickering - -// returns whether this light has power -// true if area has power and lightswitch is on -/obj/machinery/light/proc/has_power() - var/area/A = get_area(src) - return A && A.lightswitch && (!A.requires_power || A.power_light) - -/obj/machinery/light/flamp/has_power() - var/area/A = get_area(src) - if(lamp_shade) - return A && (!A.requires_power || A.power_light) - else - return A && A.lightswitch && (!A.requires_power || A.power_light) - -// returns whether this light has emergency power -// can also return if it has access to a certain amount of that power -/obj/machinery/light/proc/has_emergency_power(pwr) - if(no_emergency || !cell) - return FALSE - if(pwr ? cell.charge >= pwr : cell.charge) - return status == LIGHT_OK - -// attempts to use power from the installed emergency cell, returns true if it does and false if it doesn't -/obj/machinery/light/proc/use_emergency_power(pwr = LIGHT_EMERGENCY_POWER_USE) - if(turned_off()) - return FALSE - if(!has_emergency_power(pwr)) - return FALSE - if(cell.charge > 300) //it's meant to handle 120 W, ya doofus - visible_message("[src] short-circuits from too powerful of a power cell!") - status = LIGHT_BURNED - return FALSE - cell.use(pwr) - set_light(brightness_range * bulb_emergency_brightness_mul, max(bulb_emergency_pow_min, bulb_emergency_pow_mul * (cell.charge / cell.maxcharge)), bulb_emergency_colour) - return TRUE - -/obj/machinery/light/proc/flicker(var/amount = rand(10, 20)) - if(flickering) return - flickering = 1 - spawn(0) - if(on && status == LIGHT_OK) - for(var/i = 0; i < amount; i++) - if(status != LIGHT_OK) break - on = !on - update(0) - if(!on) // Only play when the light turns off. - playsound(src, 'sound/effects/light_flicker.ogg', 50, 1) - sleep(rand(5, 15)) - on = (status == LIGHT_OK) - update(0) - flickering = 0 - -// ai attack - turn on/off emergency lighting for a specific fixture -/obj/machinery/light/attack_ai(mob/user) - no_emergency = !no_emergency - to_chat(user, "Emergency lights for this fixture have been [no_emergency ? "disabled" : "enabled"].") - update(FALSE) - return - -// ai alt click - Make light flicker. Very important for atmosphere. -/obj/machinery/light/AIAltClick(mob/user) - flicker(1) - -/obj/machinery/light/flamp/attack_ai(mob/user) - attack_hand() - return - -// attack with hand - remove tube/bulb -// if hands aren't protected and the light is on, burn the player -/obj/machinery/light/attack_hand(mob/user) - - add_fingerprint(user) - - if(status == LIGHT_EMPTY) - to_chat(user, "There is no [get_fitting_name()] in this light.") - return - - if(istype(user,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = user - if(H.species.can_shred(H)) - user.setClickCooldown(user.get_attack_speed()) - for(var/mob/M in viewers(src)) - M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) - broken() - return - - // make it burn hands if not wearing fire-insulated gloves - if(on) - var/prot = 0 - var/mob/living/carbon/human/H = user - - if(istype(H)) - if(H.species.heat_level_1 > LIGHT_BULB_TEMPERATURE) - prot = 1 - else if(H.gloves) - var/obj/item/clothing/gloves/G = H.gloves - if(G.max_heat_protection_temperature) - if(G.max_heat_protection_temperature > LIGHT_BULB_TEMPERATURE) - prot = 1 - else - prot = 1 - - if(prot > 0 || (COLD_RESISTANCE in user.mutations)) - to_chat(user, "You remove the light [get_fitting_name()]") - else if(TK in user.mutations) - to_chat(user, "You telekinetically remove the light [get_fitting_name()].") - else - to_chat(user, "You try to remove the light [get_fitting_name()], but it's too hot and you don't want to burn your hand.") - return // if burned, don't remove the light - else - to_chat(user, "You remove the light [get_fitting_name()].") - - // create a light tube/bulb item and put it in the user's hand - user.put_in_active_hand(remove_bulb()) //puts it in our active hand - -/obj/machinery/light/flamp/attack_hand(mob/user) - if(lamp_shade) - if(status == LIGHT_EMPTY) - to_chat(user, "There is no [get_fitting_name()] in this light.") - return - - if(on) - on = 0 - update() - else - on = has_power() - update() - else - ..() - - -/obj/machinery/light/attack_tk(mob/user) - if(status == LIGHT_EMPTY) - to_chat(user, "There is no [get_fitting_name()] in this light.") - return - - to_chat(user, "You telekinetically remove the light [get_fitting_name()].") - remove_bulb() - -// break the light and make sparks if was on - -/obj/machinery/light/proc/broken(var/skip_sound_and_sparks = 0) - if(status == LIGHT_EMPTY) - return - - if(!skip_sound_and_sparks) - if(status == LIGHT_OK || status == LIGHT_BURNED) - playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) - if(on) - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(3, 1, src) - s.start() - status = LIGHT_BROKEN - update() - -/obj/machinery/light/proc/fix() - if(status == LIGHT_OK) - return - status = LIGHT_OK - on = 1 - update() - -// explosion effect -// destroy the whole light fixture or just shatter it - -/obj/machinery/light/ex_act(severity) - switch(severity) - if(1.0) - qdel(src) - return - if(2.0) - if (prob(75)) - broken() - if(3.0) - if (prob(50)) - broken() - return - -//blob effect - - -// timed process -// use power - -/obj/machinery/light/process() - if(!cell) - return PROCESS_KILL - if(has_power()) - emergency_mode = FALSE - update(FALSE) - if(!cell.give(LIGHT_EMERGENCY_POWER_USE*2)) // Recharge and stop if no more was able to be added - return PROCESS_KILL - if(emergency_mode && !use_emergency_power(LIGHT_EMERGENCY_POWER_USE)) - update(FALSE) //Disables emergency mode and sets the color to normal - return PROCESS_KILL // Drop out if we're out of cell power. These are often in POIs and there's no point in recharging. - - if(auto_flicker && !flickering) - if(check_for_player_proximity(src, radius = 12, ignore_ghosts = FALSE, ignore_afk = TRUE)) - seton(TRUE) // Lights must be on to flicker. - flicker(5) - else - seton(FALSE) // Otherwise keep it dark and spooky for when someone shows up. - -// called when area power state changes -/obj/machinery/light/power_change() - spawn(10) - seton(has_power()) - -// called when on fire - -/obj/machinery/light/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(prob(max(0, exposed_temperature - 673))) //0% at <400C, 100% at >500C - broken() - -// explode the light - -/obj/machinery/light/proc/explode() - var/turf/T = get_turf(src.loc) - spawn(0) - broken() // break it first to give a warning - sleep(2) - explosion(T, 0, 0, 2, 2) - sleep(1) - qdel(src) - -// the light item -// can be tube or bulb subtypes -// will fit into empty /obj/machinery/light of the corresponding type - -/obj/item/weapon/light - icon = 'icons/obj/lighting.dmi' - force = 2 - throwforce = 5 - w_class = ITEMSIZE_TINY - matter = list(MAT_STEEL = 60) - - ///LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN - var/status = LIGHT_OK - ///Base icon_state name to append suffixes for status - var/base_state - ///Number of times switched on/off - var/switchcount = 0 - ///Is this light set to explode - var/rigged = 0 - ///The chance (prob()) that this light will be broken at roundstart - var/broken_chance = 2 - - ///The raidus in turfs this light will reach. It will be at it's most dim this many turfs away. - /// This is also used in power draw calculation for machinery/lights. - var/brightness_range = 8 - ///The light will fall off over more/less range based on this. The formula is complicated. - var/brightness_power = 1 - ///The color of the light emitted. - var/brightness_color = LIGHT_COLOR_INCANDESCENT_TUBE - - ///Replaces brightness_range during nightshifts. - var/nightshift_range = 8 - ///Replaces brightness_power during nightshifts. - var/nightshift_power = 0.45 - ///Replaces brightness_color during nightshifts. - var/nightshift_color = LIGHT_COLOR_NIGHTSHIFT - - drop_sound = 'sound/items/drop/glass.ogg' - pickup_sound = 'sound/items/pickup/glass.ogg' - -/obj/item/weapon/light/tube - name = "light tube" - desc = "A replacement light tube." - icon_state = "ltube" - base_state = "ltube" - item_state = "c_tube" - matter = list(MAT_GLASS = 100) - brightness_range = 7 - brightness_power = 2 - -/obj/item/weapon/light/tube/large - w_class = ITEMSIZE_SMALL - name = "large light tube" - brightness_range = 15 - brightness_power = 4 - - nightshift_range = 10 - nightshift_power = 1.5 - -/obj/item/weapon/light/bulb - name = "light bulb" - desc = "A replacement light bulb." - icon_state = "lbulb" - base_state = "lbulb" - item_state = "contvapour" - matter = list(MAT_GLASS = 100) - brightness_range = 5 - brightness_power = 1 - brightness_color = LIGHT_COLOR_INCANDESCENT_BULB - - nightshift_range = 3 - nightshift_power = 0.5 - -// For 'floor lamps' in outdoor use and such -/obj/item/weapon/light/bulb/large - name = "large light bulb" - brightness_range = 7 - brightness_power = 1.5 - - nightshift_range = 4 - nightshift_power = 0.75 - -/obj/item/weapon/light/throw_impact(atom/hit_atom) - ..() - shatter() - -/obj/item/weapon/light/bulb/red - brightness_range = 4 - color = "#da0205" - brightness_color = "#da0205" - -/obj/item/weapon/light/bulb/fire - name = "fire bulb" - desc = "A replacement fire bulb." - icon_state = "fbulb" - base_state = "fbulb" - item_state = "egg4" - matter = list(MAT_GLASS = 100) - -// update the icon state and description of the light -/obj/item/weapon/light/update_icon() - switch(status) - if(LIGHT_OK) - icon_state = base_state - desc = "A replacement [name]." - if(LIGHT_BURNED) - icon_state = "[base_state]-burned" - desc = "A burnt-out [name]." - if(LIGHT_BROKEN) - icon_state = "[base_state]-broken" - desc = "A broken [name]." - - -/obj/item/weapon/light/New(atom/newloc, obj/machinery/light/fixture = null) - ..() - if(fixture) - status = fixture.status - rigged = fixture.rigged - switchcount = fixture.switchcount - fixture.transfer_fingerprints_to(src) - - //shouldn't be necessary to copy these unless someone varedits stuff, but just in case - brightness_range = fixture.brightness_range - brightness_power = fixture.brightness_power - brightness_color = fixture.brightness_color - update_icon() - - -// attack bulb/tube with object -// if a syringe, can inject phoron to make it explode -/obj/item/weapon/light/attackby(var/obj/item/I, var/mob/user) - ..() - if(istype(I, /obj/item/weapon/reagent_containers/syringe)) - var/obj/item/weapon/reagent_containers/syringe/S = I - - to_chat(user, "You inject the solution into the [src].") - - if(S.reagents.has_reagent("phoron", 5)) - - log_admin("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.") - message_admins("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.") - - rigged = 1 - - S.reagents.clear_reagents() - else - ..() - return - -// called after an attack with a light item -// shatter light, unless it was an attempt to put it in a light socket -// now only shatter if the intent was harm - -/obj/item/weapon/light/afterattack(atom/target, mob/user, proximity) - if(!proximity) return - if(istype(target, /obj/machinery/light)) - return - if(user.a_intent != I_HURT) - return - - shatter() - -/obj/item/weapon/light/proc/shatter() - if(status == LIGHT_OK || status == LIGHT_BURNED) - src.visible_message("[name] shatters."," You hear a small glass object shatter.") - status = LIGHT_BROKEN - force = 5 - sharp = TRUE - playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) - update_icon() - -//Lamp Shade -/obj/item/weapon/lampshade - name = "lamp shade" - desc = "A lamp shade for a lamp." - icon = 'icons/obj/lighting.dmi' - icon_state = "lampshade" - w_class = ITEMSIZE_TINY +// The lighting system +// +// consists of light fixtures (/obj/machinery/light) and light tube/bulb items (/obj/item/weapon/light) + + +// status values shared between lighting fixtures and items +#define LIGHT_OK 0 +#define LIGHT_EMPTY 1 +#define LIGHT_BROKEN 2 +#define LIGHT_BURNED 3 +#define LIGHT_BULB_TEMPERATURE 400 //K - used value for a 60W bulb +#define LIGHTING_POWER_FACTOR 2 //5W per luminosity * range //VOREStation Edit: why the fuck are lights eating so much power, 2W per thing +#define LIGHT_EMERGENCY_POWER_USE 0.2 //How much power emergency lights will consume per tick + +var/global/list/light_type_cache = list() +/proc/get_light_type_instance(var/light_type) + . = light_type_cache[light_type] + if(!.) + . = new light_type + light_type_cache[light_type] = . + +/obj/machinery/light_construct + name = "light fixture frame" + desc = "A light fixture under construction." + icon = 'icons/obj/lighting.dmi' + icon_state = "tube-construct-stage1" + anchored = TRUE + plane = MOB_PLANE + layer = ABOVE_MOB_LAYER + var/stage = 1 + var/fixture_type = /obj/machinery/light + var/sheets_refunded = 2 + var/obj/machinery/light/newlight = null + var/obj/item/weapon/cell/cell = null + + var/cell_connectors = TRUE + +/obj/machinery/light_construct/New(var/atom/newloc, var/newdir, var/building = 0, var/datum/frame/frame_types/frame_type, var/obj/machinery/light/fixture = null) + ..(newloc) + if(fixture) + fixture_type = fixture.type + fixture.transfer_fingerprints_to(src) + set_dir(fixture.dir) + stage = 2 + else if(newdir) + set_dir(newdir) + update_icon() + +/obj/machinery/light_construct/update_icon() + switch(stage) + if(1) + icon_state = "tube-construct-stage1" + if(2) + icon_state = "tube-construct-stage2" + if(3) + icon_state = "tube-empty" + +/obj/machinery/light_construct/examine(mob/user) + . = ..() + if(get_dist(user, src) <= 2) + switch(stage) + if(1) + . += "It's an empty frame." + if(2) + . += "It's wired." + if(3) + . += "The casing is closed." + if(cell_connectors) + if(cell) + . += "You see [cell] inside the casing." + else + . += "The casing has no power cell for backup power." + else + . += "This casing doesn't support power cells for backup power." + +/obj/machinery/light_construct/attack_hand(mob/user) + . = ..() + if(.) + return . // obj/machinery/attack_hand returns 1 if user can't use the machine + if(cell) + user.visible_message("[user] removes [cell] from [src]!","You remove [cell].") + user.put_in_hands(cell) + cell.update_icon() + cell = null + +/obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/user as mob) + src.add_fingerprint(user) + if(istype(W, /obj/item/weapon/cell/emergency_light)) + if(!cell_connectors) + to_chat(user, "This [name] can't support a power cell!") + return + if(!user.unEquip(W)) + to_chat(user, "[W] is stuck to your hand!") + return + if(cell) + to_chat(user, "There is a power cell already installed!") + else if(user.drop_from_inventory(W)) + user.visible_message("[user] hooks up [W] to [src].", \ + "You add [W] to [src].") + playsound(src, 'sound/machines/click.ogg', 50, TRUE) + W.forceMove(src) + cell = W + add_fingerprint(user) + return + + if (W.is_wrench()) + if (src.stage == 1) + playsound(src, W.usesound, 75, 1) + to_chat(usr, "You begin deconstructing [src].") + if (!do_after(usr, 30 * W.toolspeed)) + return + new /obj/item/stack/material/steel( get_turf(src.loc), sheets_refunded ) + user.visible_message("[user.name] deconstructs [src].", \ + "You deconstruct [src].", "You hear a noise.") + playsound(src, 'sound/items/Deconstruct.ogg', 75, 1) + qdel(src) + if (src.stage == 2) + to_chat(usr, "You have to remove the wires first.") + return + + if (src.stage == 3) + to_chat(usr, "You have to unscrew the case first.") + return + + if(W.is_wirecutter()) + if (src.stage != 2) return + src.stage = 1 + src.update_icon() + new /obj/item/stack/cable_coil(get_turf(src.loc), 1, "red") + user.visible_message("[user.name] removes the wiring from [src].", \ + "You remove the wiring from [src].", "You hear a noise.") + playsound(src, W.usesound, 50, 1) + return + + if(istype(W, /obj/item/stack/cable_coil)) + if (src.stage != 1) return + var/obj/item/stack/cable_coil/coil = W + if (coil.use(1)) + src.stage = 2 + src.update_icon() + user.visible_message("[user.name] adds wires to [src].", \ + "You add wires to [src].") + return + + if(W.is_screwdriver()) + if (src.stage == 2) + src.stage = 3 + src.update_icon() + user.visible_message("[user.name] closes [src]'s casing.", \ + "You close [src]'s casing.", "You hear a noise.") + playsound(src, W.usesound, 75, 1) + + var/obj/machinery/light/newlight = new fixture_type(src.loc, src) + newlight.set_dir(src.dir) + src.transfer_fingerprints_to(newlight) + if(cell) + newlight.cell = cell + cell.forceMove(newlight) + cell = null + qdel(src) + return + ..() + +/obj/machinery/light_construct/small + name = "small light fixture frame" + desc = "A small light fixture under construction." + icon = 'icons/obj/lighting.dmi' + icon_state = "bulb-construct-stage1" + anchored = TRUE + stage = 1 + fixture_type = /obj/machinery/light/small + sheets_refunded = 1 + +/obj/machinery/light_construct/small/update_icon() + switch(stage) + if(1) + icon_state = "bulb-construct-stage1" + if(2) + icon_state = "bulb-construct-stage2" + if(3) + icon_state = "bulb-empty" + +/obj/machinery/light_construct/flamp + name = "floor light fixture frame" + desc = "A floor light fixture under construction." + icon = 'icons/obj/lighting.dmi' + icon_state = "flamp-construct-stage1" + anchored = FALSE + plane = OBJ_PLANE + layer = OBJ_LAYER + stage = 1 + fixture_type = /obj/machinery/light/flamp + sheets_refunded = 2 + +/obj/machinery/light_construct/flamp/update_icon() + switch(stage) + if(1) + icon_state = "flamp-construct-stage1" + if(2) + icon_state = "flamp-construct-stage2" + if(3) + icon_state = "flamp-empty" + +// the standard tube light fixture +/obj/machinery/light + name = "light fixture" + icon = 'icons/obj/lighting_vr.dmi' //VOREStation Edit + var/base_state = "tube" // base description and icon_state + icon_state = "tube1" + desc = "A lighting fixture." + anchored = TRUE + plane = MOB_PLANE + layer = ABOVE_MOB_LAYER + use_power = USE_POWER_ACTIVE + idle_power_usage = 2 + active_power_usage = 10 + power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list + var/on = 0 // 1 if on, 0 if off + var/brightness_range + var/brightness_power + var/brightness_color + var/status = LIGHT_OK // LIGHT_OK, _EMPTY, _BURNED or _BROKEN + var/flickering = 0 + var/light_type = /obj/item/weapon/light/tube // the type of light item + var/construct_type = /obj/machinery/light_construct + var/switchcount = 0 // count of number of times switched on/off + // this is used to calc the probability the light burns out + + var/rigged = 0 // true if rigged to explode + //VOREStation Edit Start + var/needsound = FALSE // Flag to prevent playing turn-on sound multiple times, and from playing at roundstart + var/shows_alerts = TRUE // Flag for if this fixture should show alerts. Make sure icon states exist! + var/current_alert = null // Which alert are we showing right now? + //VOREStation Edit End + + var/auto_flicker = FALSE // If true, will constantly flicker, so long as someone is around to see it (otherwise its a waste of CPU). + + var/obj/item/weapon/cell/emergency_light/cell + var/start_with_cell = TRUE // if true, this fixture generates a very weak cell at roundstart + + var/emergency_mode = FALSE // if true, the light is in emergency mode + var/no_emergency = FALSE // if true, this light cannot ever have an emergency mode + var/bulb_emergency_brightness_mul = 0.25 // multiplier for this light's base brightness in emergency power mode + var/bulb_emergency_colour = "#FF3232" // determines the colour of the light while it's in emergency mode + var/bulb_emergency_pow_mul = 0.75 // the multiplier for determining the light's power in emergency mode + var/bulb_emergency_pow_min = 0.5 // the minimum value for the light's power in emergency mode + + var/nightshift_enabled = FALSE + var/nightshift_allowed = TRUE + var/brightness_range_ns + var/brightness_power_ns + var/brightness_color_ns + + var/overlay_color = LIGHT_COLOR_INCANDESCENT_TUBE + + +/obj/machinery/light/flicker + auto_flicker = TRUE + +/obj/machinery/light/no_nightshift + nightshift_allowed = FALSE + +// the smaller bulb light fixture + +/obj/machinery/light/small + icon_state = "bulb1" + base_state = "bulb" + desc = "A small lighting fixture." + light_type = /obj/item/weapon/light/bulb + construct_type = /obj/machinery/light_construct/small + shows_alerts = FALSE //VOREStation Edit + overlay_color = LIGHT_COLOR_INCANDESCENT_BULB + +/obj/machinery/light/small/flicker + auto_flicker = TRUE + +/obj/machinery/light/poi + start_with_cell = FALSE + +/obj/machinery/light/small/poi + start_with_cell = FALSE + +/obj/machinery/light/flamp + icon = 'icons/obj/lighting.dmi' //VOREStation Edit + icon_state = "flamp1" + base_state = "flamp" + plane = OBJ_PLANE + layer = OBJ_LAYER + desc = "A floor lamp." + light_type = /obj/item/weapon/light/bulb/large + construct_type = /obj/machinery/light_construct/flamp + shows_alerts = FALSE //VOREStation Edit + var/lamp_shade = 1 + overlay_color = LIGHT_COLOR_INCANDESCENT_BULB + +/obj/machinery/light/flamp/Initialize(mapload, obj/machinery/light_construct/construct = null) + . = ..() + if(construct) + start_with_cell = FALSE + lamp_shade = 0 + update_icon() + else + if(start_with_cell && !no_emergency) + cell = new/obj/item/weapon/cell/emergency_light(src) + + +/obj/machinery/light/flamp/flicker + auto_flicker = TRUE + +/obj/machinery/light/small/emergency + light_type = /obj/item/weapon/light/bulb/red + +/obj/machinery/light/small/emergency/flicker + auto_flicker = TRUE + +/obj/machinery/light/spot + name = "spotlight" + light_type = /obj/item/weapon/light/tube/large + shows_alerts = FALSE //VOREStation Edit + +//YW ADDITION START +/obj/machinery/light/spot/no_nightshift + nightshift_allowed = FALSE +//YW ADDITION END + +/obj/machinery/light/spot/flicker + auto_flicker = TRUE + +//VOREStation Add - Shadeless! +/obj/machinery/light/flamp/noshade + lamp_shade = 0 +//VOREStation Add End + +// create a new lighting fixture +/obj/machinery/light/Initialize(mapload, obj/machinery/light_construct/construct = null) + . =..() + + if(start_with_cell && !no_emergency) + cell = new/obj/item/weapon/cell/emergency_light(src) + if(construct) + start_with_cell = FALSE + status = LIGHT_EMPTY + construct_type = construct.type + construct.transfer_fingerprints_to(src) + set_dir(construct.dir) + else + if(start_with_cell && !no_emergency) + cell = new/obj/item/weapon/cell/emergency_light(src) + var/obj/item/weapon/light/L = get_light_type_instance(light_type) + update_from_bulb(L) + if(prob(L.broken_chance)) + broken(1) + + on = powered() + update(0) + +/obj/machinery/light/Destroy() + var/area/A = get_area(src) + if(A) + on = 0 +// A.update_lights() + QDEL_NULL(cell) + return ..() + +/obj/machinery/light/update_icon() + + switch(status) // set icon_states + if(LIGHT_OK) + //VOREStation Edit Start + if(shows_alerts && current_alert && on) + icon_state = "[base_state]-alert-[current_alert]" + add_light_overlay(FALSE, icon_state) + else + icon_state = "[base_state][on]" + if(on) + add_light_overlay() + else + remove_light_overlay() + //VOREStation Edit End + if(LIGHT_EMPTY) + icon_state = "[base_state]-empty" + on = 0 + remove_light_overlay() //VOREStation add + if(LIGHT_BURNED) + icon_state = "[base_state]-burned" + on = 0 + remove_light_overlay() //VOREStation add + if(LIGHT_BROKEN) + icon_state = "[base_state]-broken" + on = 0 + remove_light_overlay() //VOREStation add + return + +/obj/machinery/light/flamp/update_icon() + if(lamp_shade) + base_state = "flampshade" + switch(status) // set icon_states + if(LIGHT_OK) + icon_state = "[base_state][on]" + if(on) //VOREStation add + add_light_overlay() //VOREStation add + else //VOREStation add + remove_light_overlay() //VOREStation add + if(LIGHT_EMPTY) + on = 0 + icon_state = "[base_state][on]" + remove_light_overlay() //VOREStation add + if(LIGHT_BURNED) + on = 0 + icon_state = "[base_state][on]" + remove_light_overlay() //VOREStation add + if(LIGHT_BROKEN) + on = 0 + icon_state = "[base_state][on]" + remove_light_overlay() //VOREStation add + return + else + base_state = "flamp" + ..() +//VOREStation Edit Start +/obj/machinery/light/proc/set_alert_atmos() + if(!shows_alerts) + return + current_alert = "atmos" + brightness_color = "#6D6DFC" + update() + +/obj/machinery/light/proc/set_alert_fire() + if(!shows_alerts) + return + current_alert = "fire" + brightness_color = "#FF3030" + update() + +/obj/machinery/light/proc/reset_alert() + if(!shows_alerts) + return + + current_alert = null + var/obj/item/weapon/light/L = get_light_type_instance(light_type) + + if(L) + update_from_bulb(L) + else + brightness_color = nightshift_enabled ? initial(brightness_color_ns) : initial(brightness_color) + + update() + +//VOREstation Edit End +// update lighting +/obj/machinery/light/proc/update(var/trigger = 1) + update_icon() + //VOREStation Edit Start + if(!on) + needsound = TRUE // Play sound next time we turn on + else if(needsound) + playsound(src, 'sound/effects/lighton.ogg', 65, 1) + needsound = FALSE // Don't play sound again until we've been turned off + //VOREStation Edit End + + if(on) + var/correct_range = nightshift_enabled ? brightness_range_ns : brightness_range + var/correct_power = nightshift_enabled ? brightness_power_ns : brightness_power + var/correct_color = nightshift_enabled ? brightness_color_ns : brightness_color + if(light_range != correct_range || light_power != correct_power || light_color != correct_color) + if(!auto_flicker) + switchcount++ + if(rigged) + if(status == LIGHT_OK && trigger) + + log_admin("LOG: Rigged light explosion, last touched by [fingerprintslast]") + message_admins("LOG: Rigged light explosion, last touched by [fingerprintslast]") + + explode() + else if( prob( min(60, switchcount*switchcount*0.01) ) ) + if(status == LIGHT_OK && trigger) + status = LIGHT_BURNED + update_icon() + on = 0 + set_light(0) + else + update_use_power(USE_POWER_ACTIVE) + set_light(correct_range, correct_power, correct_color) + if(cell?.charge < cell?.maxcharge) + START_PROCESSING(SSobj, src) + else if(has_emergency_power(LIGHT_EMERGENCY_POWER_USE) && !turned_off()) + update_use_power(USE_POWER_IDLE) + emergency_mode = TRUE + START_PROCESSING(SSobj, src) + else + update_use_power(USE_POWER_IDLE) + set_light(0) + update_icon() + + update_active_power_usage((light_range * light_power) * LIGHTING_POWER_FACTOR) + +/obj/machinery/light/proc/nightshift_mode(var/state) + if(!nightshift_allowed) + return + + if(state != nightshift_enabled) + nightshift_enabled = state + update(FALSE) + +/obj/machinery/light/attack_generic(var/mob/user, var/damage) + if(!damage) + return + if(status == LIGHT_EMPTY||status == LIGHT_BROKEN) + to_chat(user, "That object is useless to you.") + return + if(!(status == LIGHT_OK||status == LIGHT_BURNED)) + return + visible_message("[user] smashes the light!") + user.do_attack_animation(src) + broken() + return 1 + +/obj/machinery/light/take_damage(var/damage) + if(!damage) + return + if(status == LIGHT_EMPTY||status == LIGHT_BROKEN) + return + if(!(status == LIGHT_OK||status == LIGHT_BURNED)) + return + broken() + return 1 + +/obj/machinery/light/blob_act() + broken() + +// attempt to set the light's on/off status +// will not switch on if broken/burned/empty +/obj/machinery/light/proc/seton(var/s) + on = (s && status == LIGHT_OK) + update() + +/obj/machinery/light/get_cell() + return cell + +// examine verb +/obj/machinery/light/examine(mob/user) + . = ..() + var/fitting = get_fitting_name() + switch(status) + if(LIGHT_OK) + . += "It is turned [on? "on" : "off"]." + if(LIGHT_EMPTY) + . += "The [fitting] has been removed." + if(LIGHT_BURNED) + . += "The [fitting] is burnt out." + if(LIGHT_BROKEN) + . += "The [fitting] has been smashed." + if(cell) + . += "Its backup power charge meter reads [round((cell.charge / cell.maxcharge) * 100, 0.1)]%." + + +/obj/machinery/light/proc/get_fitting_name() + var/obj/item/weapon/light/L = light_type + return initial(L.name) + +/obj/machinery/light/proc/update_from_bulb(obj/item/weapon/light/L) + status = L.status + switchcount = L.switchcount + rigged = L.rigged + + brightness_range = L.brightness_range + brightness_power = L.brightness_power + brightness_color = L.brightness_color + + brightness_range_ns = L.nightshift_range + brightness_power_ns = L.nightshift_power + brightness_color_ns = L.nightshift_color + +// attack with item - insert light (if right type), otherwise try to break the light + +/obj/machinery/light/proc/insert_bulb(obj/item/weapon/light/L) + update_from_bulb(L) + qdel(L) + + on = powered() + update() + + if(on && rigged) + + log_admin("LOG: Rigged light explosion, last touched by [fingerprintslast]") + message_admins("LOG: Rigged light explosion, last touched by [fingerprintslast]") + + explode() + +/obj/machinery/light/proc/remove_bulb() + . = new light_type(src.loc, src) + + switchcount = 0 + status = LIGHT_EMPTY + update() + +/obj/machinery/light/attackby(obj/item/W, mob/user) + + //Light replacer code + if(istype(W, /obj/item/device/lightreplacer)) + var/obj/item/device/lightreplacer/LR = W + if(isliving(user)) + var/mob/living/U = user + LR.ReplaceLight(src, U) + return + + // attempt to insert light + if(istype(W, /obj/item/weapon/light)) + if(status != LIGHT_EMPTY) + to_chat(user, "There is a [get_fitting_name()] already inserted.") + return + if(!istype(W, light_type)) + to_chat(user, "This type of light requires a [get_fitting_name()].") + return + + to_chat(user, "You insert [W].") + insert_bulb(W) + src.add_fingerprint(user) + + // attempt to break the light + //If xenos decide they want to smash a light bulb with a toolbox, who am I to stop them? /N + + else if(status != LIGHT_BROKEN && status != LIGHT_EMPTY) + + + if(prob(1+W.force * 5)) + + to_chat(user, "You hit the light, and it smashes!") + for(var/mob/M in viewers(src)) + if(M == user) + continue + M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) + if(on && !(W.flags & NOCONDUCT)) + //if(!user.mutations & COLD_RESISTANCE) + if (prob(12)) + electrocute_mob(user, get_area(src), src, 0.3) + broken() + + else + to_chat(user, "You hit the light!") + + // attempt to stick weapon into light socket + else if(status == LIGHT_EMPTY) + if(W.is_screwdriver()) //If it's a screwdriver open it. + playsound(src, W.usesound, 75, 1) + user.visible_message("[user.name] opens [src]'s casing.", \ + "You open [src]'s casing.", "You hear a noise.") + new construct_type(src.loc, fixture = src) + qdel(src) + return + + to_chat(user, "You stick \the [W] into the light socket!") + if(has_power() && !(W.flags & NOCONDUCT)) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(3, 1, src) + s.start() + //if(!user.mutations & COLD_RESISTANCE) + if (prob(75)) + electrocute_mob(user, get_area(src), src, rand(0.7,1.0)) + +/obj/machinery/light/flamp/attackby(obj/item/W, mob/user) + if(W.is_wrench()) + anchored = !anchored + playsound(src, W.usesound, 50, 1) + to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + + if(!lamp_shade) + if(istype(W, /obj/item/weapon/lampshade)) + lamp_shade = 1 + qdel(W) + update_icon() + return + + else + if(W.is_screwdriver()) + playsound(src, W.usesound, 75, 1) + user.visible_message("[user.name] removes [src]'s lamp shade.", \ + "You remove [src]'s lamp shade.", "You hear a noise.") + lamp_shade = 0 + new /obj/item/weapon/lampshade(src.loc) + update_icon() + return + + ..() + +// returns if the light has power /but/ is manually turned off +// if a light is turned off, it won't activate emergency power +/obj/machinery/light/proc/turned_off() + var/area/A = get_area(src) + return !A.lightswitch && A.power_light || flickering + +// returns whether this light has power +// true if area has power and lightswitch is on +/obj/machinery/light/proc/has_power() + var/area/A = get_area(src) + return A && A.lightswitch && (!A.requires_power || A.power_light) + +/obj/machinery/light/flamp/has_power() + var/area/A = get_area(src) + if(lamp_shade) + return A && (!A.requires_power || A.power_light) + else + return A && A.lightswitch && (!A.requires_power || A.power_light) + +// returns whether this light has emergency power +// can also return if it has access to a certain amount of that power +/obj/machinery/light/proc/has_emergency_power(pwr) + if(no_emergency || !cell) + return FALSE + if(pwr ? cell.charge >= pwr : cell.charge) + return status == LIGHT_OK + +// attempts to use power from the installed emergency cell, returns true if it does and false if it doesn't +/obj/machinery/light/proc/use_emergency_power(pwr = LIGHT_EMERGENCY_POWER_USE) + if(turned_off()) + return FALSE + if(!has_emergency_power(pwr)) + return FALSE + if(cell.charge > 300) //it's meant to handle 120 W, ya doofus + visible_message("[src] short-circuits from too powerful of a power cell!") + status = LIGHT_BURNED + return FALSE + cell.use(pwr) + set_light(brightness_range * bulb_emergency_brightness_mul, max(bulb_emergency_pow_min, bulb_emergency_pow_mul * (cell.charge / cell.maxcharge)), bulb_emergency_colour) + return TRUE + +/obj/machinery/light/proc/flicker(var/amount = rand(10, 20)) + if(flickering) return + flickering = 1 + spawn(0) + if(on && status == LIGHT_OK) + for(var/i = 0; i < amount; i++) + if(status != LIGHT_OK) break + on = !on + update(0) + if(!on) // Only play when the light turns off. + playsound(src, 'sound/effects/light_flicker.ogg', 50, 1) + sleep(rand(5, 15)) + on = (status == LIGHT_OK) + update(0) + flickering = 0 + +// ai attack - turn on/off emergency lighting for a specific fixture +/obj/machinery/light/attack_ai(mob/user) + no_emergency = !no_emergency + to_chat(user, "Emergency lights for this fixture have been [no_emergency ? "disabled" : "enabled"].") + update(FALSE) + return + +// ai alt click - Make light flicker. Very important for atmosphere. +/obj/machinery/light/AIAltClick(mob/user) + flicker(1) + +/obj/machinery/light/flamp/attack_ai(mob/user) + attack_hand() + return + +// attack with hand - remove tube/bulb +// if hands aren't protected and the light is on, burn the player +/obj/machinery/light/attack_hand(mob/user) + + add_fingerprint(user) + + if(status == LIGHT_EMPTY) + to_chat(user, "There is no [get_fitting_name()] in this light.") + return + + if(istype(user,/mob/living/carbon/human)) + var/mob/living/carbon/human/H = user + if(H.species.can_shred(H)) + user.setClickCooldown(user.get_attack_speed()) + for(var/mob/M in viewers(src)) + M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) + broken() + return + + // make it burn hands if not wearing fire-insulated gloves + if(on) + var/prot = 0 + var/mob/living/carbon/human/H = user + + if(istype(H)) + if(H.species.heat_level_1 > LIGHT_BULB_TEMPERATURE) + prot = 1 + else if(H.gloves) + var/obj/item/clothing/gloves/G = H.gloves + if(G.max_heat_protection_temperature) + if(G.max_heat_protection_temperature > LIGHT_BULB_TEMPERATURE) + prot = 1 + else + prot = 1 + + if(prot > 0 || (COLD_RESISTANCE in user.mutations)) + to_chat(user, "You remove the light [get_fitting_name()]") + else if(TK in user.mutations) + to_chat(user, "You telekinetically remove the light [get_fitting_name()].") + else + to_chat(user, "You try to remove the light [get_fitting_name()], but it's too hot and you don't want to burn your hand.") + return // if burned, don't remove the light + else + to_chat(user, "You remove the light [get_fitting_name()].") + + // create a light tube/bulb item and put it in the user's hand + user.put_in_active_hand(remove_bulb()) //puts it in our active hand + +/obj/machinery/light/flamp/attack_hand(mob/user) + if(lamp_shade) + if(status == LIGHT_EMPTY) + to_chat(user, "There is no [get_fitting_name()] in this light.") + return + + if(on) + on = 0 + update() + else + on = has_power() + update() + else + ..() + + +/obj/machinery/light/attack_tk(mob/user) + if(status == LIGHT_EMPTY) + to_chat(user, "There is no [get_fitting_name()] in this light.") + return + + to_chat(user, "You telekinetically remove the light [get_fitting_name()].") + remove_bulb() + +// break the light and make sparks if was on + +/obj/machinery/light/proc/broken(var/skip_sound_and_sparks = 0) + if(status == LIGHT_EMPTY) + return + + if(!skip_sound_and_sparks) + if(status == LIGHT_OK || status == LIGHT_BURNED) + playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) + if(on) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(3, 1, src) + s.start() + status = LIGHT_BROKEN + update() + +/obj/machinery/light/proc/fix() + if(status == LIGHT_OK) + return + status = LIGHT_OK + on = 1 + update() + +// explosion effect +// destroy the whole light fixture or just shatter it + +/obj/machinery/light/ex_act(severity) + switch(severity) + if(1.0) + qdel(src) + return + if(2.0) + if (prob(75)) + broken() + if(3.0) + if (prob(50)) + broken() + return + +//blob effect + + +// timed process +// use power + +/obj/machinery/light/process() + if(!cell) + return PROCESS_KILL + if(has_power()) + emergency_mode = FALSE + update(FALSE) + if(!cell.give(LIGHT_EMERGENCY_POWER_USE*2)) // Recharge and stop if no more was able to be added + return PROCESS_KILL + if(emergency_mode && !use_emergency_power(LIGHT_EMERGENCY_POWER_USE)) + update(FALSE) //Disables emergency mode and sets the color to normal + return PROCESS_KILL // Drop out if we're out of cell power. These are often in POIs and there's no point in recharging. + + if(auto_flicker && !flickering) + if(check_for_player_proximity(src, radius = 12, ignore_ghosts = FALSE, ignore_afk = TRUE)) + seton(TRUE) // Lights must be on to flicker. + flicker(5) + else + seton(FALSE) // Otherwise keep it dark and spooky for when someone shows up. + +// called when area power state changes +/obj/machinery/light/power_change() + spawn(10) + seton(has_power()) + +// called when on fire + +/obj/machinery/light/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) + if(prob(max(0, exposed_temperature - 673))) //0% at <400C, 100% at >500C + broken() + +// explode the light + +/obj/machinery/light/proc/explode() + var/turf/T = get_turf(src.loc) + spawn(0) + broken() // break it first to give a warning + sleep(2) + explosion(T, 0, 0, 2, 2) + sleep(1) + qdel(src) + +// the light item +// can be tube or bulb subtypes +// will fit into empty /obj/machinery/light of the corresponding type + +/obj/item/weapon/light + icon = 'icons/obj/lighting.dmi' + force = 2 + throwforce = 5 + w_class = ITEMSIZE_TINY + matter = list(MAT_STEEL = 60) + + ///LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN + var/status = LIGHT_OK + ///Base icon_state name to append suffixes for status + var/base_state + ///Number of times switched on/off + var/switchcount = 0 + ///Is this light set to explode + var/rigged = 0 + ///The chance (prob()) that this light will be broken at roundstart + var/broken_chance = 2 + + ///The raidus in turfs this light will reach. It will be at it's most dim this many turfs away. + /// This is also used in power draw calculation for machinery/lights. + var/brightness_range = 8 + ///The light will fall off over more/less range based on this. The formula is complicated. + var/brightness_power = 1 + ///The color of the light emitted. + var/brightness_color = LIGHT_COLOR_INCANDESCENT_TUBE + + ///Replaces brightness_range during nightshifts. + var/nightshift_range = 8 + ///Replaces brightness_power during nightshifts. + var/nightshift_power = 0.45 + ///Replaces brightness_color during nightshifts. + var/nightshift_color = LIGHT_COLOR_NIGHTSHIFT + + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' + +/obj/item/weapon/light/tube + name = "light tube" + desc = "A replacement light tube." + icon_state = "ltube" + base_state = "ltube" + item_state = "c_tube" + matter = list(MAT_GLASS = 100) + brightness_range = 7 + brightness_power = 2 + +/obj/item/weapon/light/tube/large + w_class = ITEMSIZE_SMALL + name = "large light tube" + brightness_range = 15 + brightness_power = 4 + + nightshift_range = 10 + nightshift_power = 1.5 + +/obj/item/weapon/light/bulb + name = "light bulb" + desc = "A replacement light bulb." + icon_state = "lbulb" + base_state = "lbulb" + item_state = "contvapour" + matter = list(MAT_GLASS = 100) + brightness_range = 5 + brightness_power = 1 + brightness_color = LIGHT_COLOR_INCANDESCENT_BULB + + nightshift_range = 3 + nightshift_power = 0.5 + +// For 'floor lamps' in outdoor use and such +/obj/item/weapon/light/bulb/large + name = "large light bulb" + brightness_range = 7 + brightness_power = 1.5 + + nightshift_range = 4 + nightshift_power = 0.75 + +/obj/item/weapon/light/throw_impact(atom/hit_atom) + ..() + shatter() + +/obj/item/weapon/light/bulb/red + brightness_range = 4 + color = "#da0205" + brightness_color = "#da0205" + +/obj/item/weapon/light/bulb/fire + name = "fire bulb" + desc = "A replacement fire bulb." + icon_state = "fbulb" + base_state = "fbulb" + item_state = "egg4" + matter = list(MAT_GLASS = 100) + +// update the icon state and description of the light +/obj/item/weapon/light/update_icon() + switch(status) + if(LIGHT_OK) + icon_state = base_state + desc = "A replacement [name]." + if(LIGHT_BURNED) + icon_state = "[base_state]-burned" + desc = "A burnt-out [name]." + if(LIGHT_BROKEN) + icon_state = "[base_state]-broken" + desc = "A broken [name]." + + +/obj/item/weapon/light/New(atom/newloc, obj/machinery/light/fixture = null) + ..() + if(fixture) + status = fixture.status + rigged = fixture.rigged + switchcount = fixture.switchcount + fixture.transfer_fingerprints_to(src) + + //shouldn't be necessary to copy these unless someone varedits stuff, but just in case + brightness_range = fixture.brightness_range + brightness_power = fixture.brightness_power + brightness_color = fixture.brightness_color + update_icon() + + +// attack bulb/tube with object +// if a syringe, can inject phoron to make it explode +/obj/item/weapon/light/attackby(var/obj/item/I, var/mob/user) + ..() + if(istype(I, /obj/item/weapon/reagent_containers/syringe)) + var/obj/item/weapon/reagent_containers/syringe/S = I + + to_chat(user, "You inject the solution into the [src].") + + if(S.reagents.has_reagent("phoron", 5)) + + log_admin("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.") + message_admins("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.") + + rigged = 1 + + S.reagents.clear_reagents() + else + ..() + return + +// called after an attack with a light item +// shatter light, unless it was an attempt to put it in a light socket +// now only shatter if the intent was harm + +/obj/item/weapon/light/afterattack(atom/target, mob/user, proximity) + if(!proximity) return + if(istype(target, /obj/machinery/light)) + return + if(user.a_intent != I_HURT) + return + + shatter() + +/obj/item/weapon/light/proc/shatter() + if(status == LIGHT_OK || status == LIGHT_BURNED) + src.visible_message("[name] shatters."," You hear a small glass object shatter.") + status = LIGHT_BROKEN + force = 5 + sharp = TRUE + playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) + update_icon() + +//Lamp Shade +/obj/item/weapon/lampshade + name = "lamp shade" + desc = "A lamp shade for a lamp." + icon = 'icons/obj/lighting.dmi' + icon_state = "lampshade" + w_class = ITEMSIZE_TINY diff --git a/code/modules/power/lighting_vr.dm b/code/modules/power/lighting_vr.dm index b7f0fb320c..6b023141fc 100644 --- a/code/modules/power/lighting_vr.dm +++ b/code/modules/power/lighting_vr.dm @@ -46,7 +46,7 @@ /obj/item/weapon/light/bulb/large brightness_range = 6 brightness_power = 1 - + nightshift_range = 6 nightshift_power = 0.45 @@ -60,6 +60,7 @@ plane = TURF_PLANE layer = ABOVE_TURF_LAYER construct_type = /obj/machinery/light_construct/floortube + overlay_above_everything = FALSE /obj/machinery/light/floortube/flicker auto_flicker = TRUE @@ -106,6 +107,7 @@ plane = MOB_PLANE layer = ABOVE_MOB_LAYER construct_type = /obj/machinery/light_construct/bigfloorlamp + overlay_above_everything = TRUE /obj/machinery/light/bigfloorlamp/flicker auto_flicker = TRUE @@ -128,3 +130,82 @@ icon_state = "big_flamp-construct-stage2" if(3) icon_state = "big_flamp-empty" + +// Fairy lights + +/obj/item/weapon/light/bulb/smol + brightness_range = 1 + brightness_power = 0.5 + + nightshift_range = 1 + nightshift_power = 0.25 + + +/obj/machinery/light/small/fairylights + icon = 'icons/obj/lighting_vr.dmi' + icon_state = "fairy_lights1" + base_state = "fairy_lights" + desc = "A set of lights on a long string of wire, anchored to the walls." + light_type = /obj/item/weapon/light/bulb/smol + shows_alerts = FALSE + anchored = TRUE + plane = ABOVE_MOB_PLANE + layer = ABOVE_MOB_LAYER + construct_type = null + overlay_color = LIGHT_COLOR_INCANDESCENT_BULB + overlay_above_everything = TRUE + color = "#3e5064" + +/obj/machinery/light/small/fairylights/broken() + return + +/obj/machinery/light/small/fairylights/flicker + auto_flicker = TRUE + +/obj/machinery/light + var/image/overlay_layer = null + var/overlay_above_everything = TRUE + +/obj/machinery/light/proc/add_light_overlay(do_color = TRUE, provided_state = null) + remove_light_overlay() + if(provided_state) + overlay_layer = image(icon, "[provided_state]-overlay") + else + overlay_layer = image(icon, "[base_state]-overlay") + overlay_layer.appearance_flags = RESET_COLOR|KEEP_APART + if(overlay_color && do_color) + overlay_layer.color = overlay_color + if(overlay_above_everything) + overlay_layer.plane = PLANE_LIGHTING_ABOVE + else + overlay_layer.plane = PLANE_EMISSIVE + + add_overlay(overlay_layer) + +/obj/machinery/light/proc/remove_light_overlay() + if(overlay_layer) + cut_overlay(overlay_layer) + qdel(overlay_layer) + overlay_layer = null + + +/* +/obj/machinery/light_construct/bigfloorlamp + name = "big floor light fixture frame" + desc = "A big floor light fixture under construction." + icon = 'icons/obj/lighting32x64.dmi' + icon_state = "big_flamp-construct-stage1" + stage = 1 + anchored = FALSE + fixture_type = /obj/machinery/light/bigfloorlamp + sheets_refunded = 1 + +/obj/machinery/light_construct/bigfloorlamp/update_icon() + switch(stage) + if(1) + icon_state = "big_flamp-construct-stage1" + if(2) + icon_state = "big_flamp-construct-stage2" + if(3) + icon_state = "big_flamp-empty" +*/ diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 39d413677d..494e4152fc 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -365,7 +365,8 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity) return 0 // VOREStation Edit Start - if(istype(get_area(T), /area/crew_quarters/sleep)) //No going to dorms + var/area/A = get_area(T) + if(A.forbid_events) //No going to dorms return 0 // VOREStation Edit End diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index c496720063..416734eae9 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -315,6 +315,8 @@ GLOBAL_LIST_EMPTY(smeses) "[user.name] has added cables to the [src].",\ "You added cables to the [src].") stat = 0 + if(!powernet) + connect_to_network() return FALSE else if(W.is_wirecutter() && !building_terminal) @@ -418,7 +420,7 @@ GLOBAL_LIST_EMPTY(smeses) switch(io) if(SMES_TGUI_INPUT) set_input(target) - if(SMES_TGUI_OUTPUT) + if(SMES_TGUI_OUTPUT) set_output(target) diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 4f1b4e5dcd..381f6b09f6 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -312,7 +312,7 @@ // Multitool - change RCON tag if(istype(W, /obj/item/device/multitool)) - var/newtag = input(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system") as text + var/newtag = tgui_input_text(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system") if(newtag) RCon_tag = newtag to_chat(user, "You changed the RCON tag to: [newtag]") diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 297a749aa7..77a5659cdd 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -124,7 +124,7 @@ if(default_deconstruction_crowbar(user, W)) return if(istype(W, /obj/item/device/multitool)) - var/new_ident = input(usr, "Enter a new ident tag.", name, comp_id) as null|text + var/new_ident = tgui_input_text(usr, "Enter a new ident tag.", name, comp_id) if(new_ident && user.Adjacent(src)) comp_id = new_ident return @@ -337,7 +337,7 @@ /obj/machinery/computer/turbine_computer/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/device/multitool)) - var/new_ident = input(usr, "Enter a new ident tag.", name, id) as null|text + var/new_ident = tgui_input_text(usr, "Enter a new ident tag.", name, id) if(new_ident && user.Adjacent(src)) id = new_ident return diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 46736474b7..b600bb8ce0 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -37,7 +37,7 @@ return var/tmp_label = "" - var/label_text = sanitizeSafe(input(user, "Inscribe some text into \the [initial(BB.name)]","Inscription",tmp_label), MAX_NAME_LEN) + var/label_text = sanitizeSafe(tgui_input_text(user, "Inscribe some text into \the [initial(BB.name)]","Inscription",tmp_label,MAX_NAME_LEN), MAX_NAME_LEN) if(length(label_text) > 20) to_chat(user, "The inscription can be at most 20 characters long.") else if(!label_text) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index cf95dcf703..0cc7147e1f 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -1,810 +1,816 @@ -/* - Defines a firing mode for a gun. - - A firemode is created from a list of fire mode settings. Each setting modifies the value of the gun var with the same name. - If the fire mode value for a setting is null, it will be replaced with the initial value of that gun's variable when the firemode is created. - Obviously not compatible with variables that take a null value. If a setting is not present, then the corresponding var will not be modified. -*/ -/datum/firemode - var/name = "default" - var/list/settings = list() - -/datum/firemode/New(obj/item/weapon/gun/gun, list/properties = null) - ..() - if(!properties) return - - for(var/propname in properties) - var/propvalue = properties[propname] - - if(propname == "mode_name") - name = propvalue - if(isnull(propvalue)) - settings[propname] = gun.vars[propname] //better than initial() as it handles list vars like burst_accuracy - else - settings[propname] = propvalue - -/datum/firemode/proc/apply_to(obj/item/weapon/gun/gun) - for(var/propname in settings) - gun.vars[propname] = settings[propname] - -//Parent gun type. Guns are weapons that can be aimed at mobs and act over a distance -/obj/item/weapon/gun - name = "gun" - desc = "Its a gun. It's pretty terrible, though." - icon = 'icons/obj/gun.dmi' - item_icons = list( - slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', - slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi', - ) - icon_state = "detective" - item_state = "gun" - slot_flags = SLOT_BELT|SLOT_HOLSTER - matter = list(MAT_STEEL = 2000) - w_class = ITEMSIZE_NORMAL - throwforce = 5 - throw_speed = 4 - throw_range = 5 - force = 5 - preserve_item = 1 - origin_tech = list(TECH_COMBAT = 1) - attack_verb = list("struck", "hit", "bashed") - zoomdevicename = "scope" - drop_sound = 'sound/items/drop/gun.ogg' - pickup_sound = 'sound/items/pickup/gun.ogg' - - var/recoil_mode = 1 //0 = no micro recoil, 1 = regular, anything higher than 1 is a multiplier //YAWN Addition, ported from CHOMP - var/automatic = 0 - var/burst = 1 - var/fire_delay = 6 //delay after shooting before the gun can be used again - var/burst_delay = 2 //delay between shots, if firing in bursts - var/move_delay = 1 - var/fire_sound = null // This is handled by projectile.dm's fire_sound var now, but you can override the projectile's fire_sound with this one if you want to. - var/fire_sound_text = "gunshot" - var/fire_anim = null - var/recoil = 0 //screen shake - var/silenced = 0 - var/muzzle_flash = 3 - var/accuracy = 0 //Accuracy is measured in percents. +15 accuracy means that everything is effectively one tile closer for the purpose of miss chance, -15 means the opposite. launchers are not supported, at the moment. - var/scoped_accuracy = null - var/list/burst_accuracy = list(0) //allows for different accuracies for each shot in a burst. Applied on top of accuracy - var/list/dispersion = list(0) - var/mode_name = null - var/projectile_type = /obj/item/projectile //On ballistics, only used to check for the cham gun - - var/wielded_item_state - var/one_handed_penalty = 0 // Penalty applied if someone fires a two-handed gun with one hand. - var/obj/screen/auto_target/auto_target - var/shooting = 0 - var/next_fire_time = 0 - - var/sel_mode = 1 //index of the currently selected mode - var/list/firemodes = list() - - //aiming system stuff - var/keep_aim = 1 //1 for keep shooting until aim is lowered - //0 for one bullet after tarrget moves and aim is lowered - var/multi_aim = 0 //Used to determine if you can target multiple people. - var/tmp/list/mob/living/aim_targets //List of who yer targeting. - var/tmp/mob/living/last_moved_mob //Used to fire faster at more than one person. - var/tmp/told_cant_shoot = 0 //So that it doesn't spam them with the fact they cannot hit them. - var/tmp/lock_time = -100 - - var/dna_lock = 0 //whether or not the gun is locked to dna - var/obj/item/dnalockingchip/attached_lock - - var/last_shot = 0 //records the last shot fired - -//VOREStation Add - /tg/ icon system - var/charge_sections = 4 - var/shaded_charge = FALSE - var/ammo_x_offset = 2 - var/ammo_y_offset = 0 - var/can_flashlight = FALSE - var/gun_light = FALSE - var/light_state = "flight" - var/light_brightness = 4 - var/flight_x_offset = 0 - var/flight_y_offset = 0 - -/obj/item/weapon/gun/CtrlClick(mob/user) - if(can_flashlight && ishuman(user) && src.loc == usr && !user.incapacitated(INCAPACITATION_ALL)) - toggle_flashlight() - else - return ..() - -/obj/item/weapon/gun/proc/toggle_flashlight() - if(gun_light) - set_light(0) - gun_light = FALSE - else - set_light(light_brightness) - gun_light = TRUE - - playsound(src, 'sound/machines/button.ogg', 25) - update_icon() -//VOREStation Add End - -/obj/item/weapon/gun/New() - ..() - for(var/i in 1 to firemodes.len) - firemodes[i] = new /datum/firemode(src, firemodes[i]) - - if(isnull(scoped_accuracy)) - scoped_accuracy = accuracy - - if(dna_lock) - attached_lock = new /obj/item/dnalockingchip(src) - if(!dna_lock) - verbs -= /obj/item/weapon/gun/verb/remove_dna - verbs -= /obj/item/weapon/gun/verb/give_dna - verbs -= /obj/item/weapon/gun/verb/allow_dna - -/obj/item/weapon/gun/update_twohanding() - if(one_handed_penalty) - var/mob/living/M = loc - if(istype(M)) - if(M.can_wield_item(src) && src.is_held_twohanded(M)) - name = "[initial(name)] (wielded)" - else - name = initial(name) - else - name = initial(name) - update_icon() // In case item_state is set somewhere else. - ..() - -/obj/item/weapon/gun/update_held_icon() - if(wielded_item_state) - var/mob/living/M = loc - if(istype(M)) - if(M.can_wield_item(src) && src.is_held_twohanded(M)) - LAZYSET(item_state_slots, slot_l_hand_str, wielded_item_state) - LAZYSET(item_state_slots, slot_r_hand_str, wielded_item_state) - else - LAZYSET(item_state_slots, slot_l_hand_str, initial(item_state)) - LAZYSET(item_state_slots, slot_r_hand_str, initial(item_state)) - ..() - - -//Checks whether a given mob can use the gun -//Any checks that shouldn't result in handle_click_empty() being called if they fail should go here. -//Otherwise, if you want handle_click_empty() to be called, check in consume_next_projectile() and return null there. -/obj/item/weapon/gun/proc/special_check(var/mob/user) - - if(!istype(user, /mob/living)) - return 0 - if(!user.IsAdvancedToolUser()) - return 0 - if(isanimal(user)) - var/mob/living/simple_mob/S = user - if(!S.IsHumanoidToolUser(src)) - return 0 - - var/mob/living/M = user - if(dna_lock && attached_lock.stored_dna) - if(!authorized_user(user)) - if(attached_lock.safety_level == 0) - to_chat(M, "\The [src] buzzes in dissapointment and displays an invalid DNA symbol.") - return 0 - if(!attached_lock.exploding) - if(attached_lock.safety_level == 1) - to_chat(M, "\The [src] hisses in dissapointment.") - visible_message("\The [src] announces, \"Self-destruct occurring in ten seconds.\"", "\The [src] announces, \"Self-destruct occurring in ten seconds.\"") - attached_lock.exploding = 1 - spawn(100) - explosion(src, 0, 0, 3, 4) - sleep(1) - qdel(src) - return 0 - if(HULK in M.mutations) - to_chat(M, "Your fingers are much too large for the trigger guard!") - return 0 - if((CLUMSY in M.mutations) && prob(40)) //Clumsy handling - var/obj/P = consume_next_projectile() - if(P) - if(process_projectile(P, user, user, pick("l_foot", "r_foot"))) - handle_post_fire(user, user) - var/datum/gender/TU = gender_datums[user.get_visible_gender()] - user.visible_message( - "\The [user] shoots [TU.himself] in the foot with \the [src]!", - "You shoot yourself in the foot with \the [src]!" - ) - M.drop_item() - else - handle_click_empty(user) - return 0 - return 1 - -/obj/item/weapon/gun/emp_act(severity) - for(var/obj/O in contents) - O.emp_act(severity) - -/obj/item/weapon/gun/afterattack(atom/A, mob/living/user, adjacent, params) - if(adjacent) return //A is adjacent, is the user, or is on the user's person - - if(!user.aiming) - user.aiming = new(user) - - if(user && user.client && user.aiming && user.aiming.active && user.aiming.aiming_at != A) - PreFire(A,user,params) //They're using the new gun system, locate what they're aiming at. - return - - if(user && user.a_intent == I_HELP && user.is_preference_enabled(/datum/client_preference/safefiring)) //regardless of what happens, refuse to shoot if help intent is on - to_chat(user, "You refrain from firing your [src] as your intent is set to help.") - return - - else - Fire(A, user, params) //Otherwise, fire normally. - return - -/* //Commented out for quality control and testing - if(automatic == 1)//Are we are going to be using automatic shooting - //We check to make sure they can fire - if(!special_check(user)) - return - if(auto_target)//If they already have one then update it - auto_target.loc = get_turf(A) - auto_target.delay_del = 1//And reset the del so its like they got a new one and doesnt instantly vanish - to_chat(user, "You ready \the [src]! Click and drag the target around to shoot.") - else//Otherwise just make a new one - auto_target = new/obj/screen/auto_target(get_turf(A), src) - visible_message("\The [user] readies the [src]!") - playsound(src, 'sound/weapons/TargetOn.ogg', 50, 1) - to_chat(user, "You ready \the [src]! Click and drag the target around to shoot.") - return - Fire(A,user,params) //Otherwise, fire normally. -*/ - -/obj/item/weapon/gun/attack(atom/A, mob/living/user, def_zone) - if (A == user && user.zone_sel.selecting == O_MOUTH && !mouthshoot) - handle_suicide(user) - else if(user.a_intent == I_HURT) //point blank shooting - if(user && user.client && user.aiming && user.aiming.active && user.aiming.aiming_at != A && A != user) - PreFire(A,user) //They're using the new gun system, locate what they're aiming at. - return - else - Fire(A, user, pointblank=1) - else - return ..() //Pistolwhippin' - -/obj/item/weapon/gun/attackby(var/obj/item/A as obj, mob/user as mob) - if(istype(A, /obj/item/dnalockingchip)) - if(dna_lock) - to_chat(user, "\The [src] already has a [attached_lock].") - return - to_chat(user, "You insert \the [A] into \the [src].") - user.drop_item() - A.loc = src - attached_lock = A - dna_lock = 1 - verbs += /obj/item/weapon/gun/verb/remove_dna - verbs += /obj/item/weapon/gun/verb/give_dna - verbs += /obj/item/weapon/gun/verb/allow_dna - return - - if(A.is_screwdriver()) - if(dna_lock && attached_lock && !attached_lock.controller_lock) - to_chat(user, "You begin removing \the [attached_lock] from \the [src].") - playsound(src, A.usesound, 50, 1) - if(do_after(user, 25 * A.toolspeed)) - to_chat(user, "You remove \the [attached_lock] from \the [src].") - user.put_in_hands(attached_lock) - dna_lock = 0 - attached_lock = null - verbs -= /obj/item/weapon/gun/verb/remove_dna - verbs -= /obj/item/weapon/gun/verb/give_dna - verbs -= /obj/item/weapon/gun/verb/allow_dna - else - to_chat(user, "\The [src] is not accepting modifications at this time.") - ..() - -/obj/item/weapon/gun/emag_act(var/remaining_charges, var/mob/user) - if(dna_lock && attached_lock.controller_lock) - to_chat(user, "You short circuit the internal locking mechanisms of \the [src]!") - attached_lock.controller_dna = null - attached_lock.controller_lock = 0 - attached_lock.stored_dna = list() - return 1 - -/obj/item/weapon/gun/MouseDrop(obj/over_object as obj) - if(!canremove) - return - - if (ishuman(usr) || issmall(usr)) //so monkeys can take off their backpacks -- Urist - - if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech. why? - return - - if (!( istype(over_object, /obj/screen) )) - return ..() - - //makes sure that the thing is equipped, so that we can't drag it into our hand from miles away. - //there's got to be a better way of doing this. - if (!(src.loc == usr) || (src.loc && src.loc.loc == usr)) - return - - if (( usr.restrained() ) || ( usr.stat )) - return - - if ((src.loc == usr) && !(istype(over_object, /obj/screen)) && !usr.unEquip(src)) - return - - switch(over_object.name) - if("r_hand") - usr.u_equip(src) - usr.put_in_r_hand(src) - if("l_hand") - usr.u_equip(src) - usr.put_in_l_hand(src) - src.add_fingerprint(usr) - -/obj/item/weapon/gun/proc/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0) - if(!user || !target) return - if(target.z != user.z) return - - add_fingerprint(user) - - user.break_cloak() - - if(!special_check(user)) - return - - if(world.time < next_fire_time) - if (world.time % 3) //to prevent spam - to_chat(user, "[src] is not ready to fire again!") - return - - var/shoot_time = (burst - 1)* burst_delay - - //These should apparently be disabled to allow for the automatic system to function without causing near-permanant paralysis. Re-enabling them while we sort that out. - user.setClickCooldown(shoot_time) //no clicking on things while shooting - user.setMoveCooldown(shoot_time) //no moving while shooting either - - next_fire_time = world.time + shoot_time - - var/held_twohanded = (user.can_wield_item(src) && src.is_held_twohanded(user)) - - //actually attempt to shoot - var/turf/targloc = get_turf(target) //cache this in case target gets deleted during shooting, e.g. if it was a securitron that got destroyed. - -/* // Commented out for quality control and testing. - shooting = 1 - if(automatic == 1 && auto_target && auto_target.active)//When we are going to shoot and have an auto_target AND its active meaning we clicked on it we tell it to burstfire 1000 rounds - burst = 1000//Yes its not EXACTLY full auto but when are we shooting more than 1000 normally and it can easily be made higher -*/ - for(var/i in 1 to burst) - /* // Commented out for quality control and testing. - if(!reflex && automatic)//If we are shooting automatic then check our target, however if we are shooting reflex we dont use automatic - //extra sanity checking. - if(user.incapacitated()) - return - if(user.get_active_hand() != src) - break - if(!auto_target) break//Stopped shooting - else if(auto_target.loc) - target = auto_target.loc - //Lastly just update our dir if needed - if(user.dir != get_dir(user, auto_target)) - user.face_atom(auto_target) - */ - var/obj/projectile = consume_next_projectile(user) - if(!projectile) - handle_click_empty(user) - break - - if(i == 1) // So one burst only makes one message and not 3+ messages. - handle_firing_text(user, target, pointblank, reflex) - - process_accuracy(projectile, user, target, i, held_twohanded) - - if(pointblank) - process_point_blank(projectile, user, target) - - if(process_projectile(projectile, user, target, user.zone_sel.selecting, clickparams)) - handle_post_fire(user, target, pointblank, reflex) - update_icon() - - if(i < burst) - sleep(burst_delay) - - if(!(target && target.loc)) - target = targloc - pointblank = 0 - - last_shot = world.time - -/* - // Commented out for quality control and testing. - shooting = 0 -*/ - - // We do this down here, so we don't get the message if we fire an empty gun. - if(user.item_is_in_hands(src) && user.hands_are_full()) - if(one_handed_penalty >= 20) - to_chat(user, "You struggle to keep \the [src] pointed at the correct position with just one hand!") - - //update timing - user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) - user.setMoveCooldown(move_delay) - next_fire_time = world.time + fire_delay - - accuracy = initial(accuracy) //Reset the gun's accuracy - - if(muzzle_flash) - //VOREStation Edit - Flashlights - if(gun_light) - set_light(light_brightness) - else - set_light(0) - //VOREStation Edit End - user.hud_used.update_ammo_hud(user, src) - - //YAWNEDIT: Recoil knockdown for micros, ported from CHOMPStation - if(recoil_mode && iscarbon(user)) - var/mob/living/carbon/nerd = user - var/mysize = nerd.size_multiplier - if(recoil_mode > 0) - if(mysize <= 0.5) - nerd.Weaken(1*recoil_mode) - if(!istype(src,/obj/item/weapon/gun/energy)) - nerd.adjustBruteLoss((5-mysize*4)*recoil_mode) - to_chat(nerd, "You're so tiny that you drop the gun and hurt yourself from the recoil!") - else - to_chat(nerd, "You're so tiny that the pull of the trigger causes you to drop the gun!") - - //YAWNEDIT: Knockdown code end - -// Similar to the above proc, but does not require a user, which is ideal for things like turrets. -/obj/item/weapon/gun/proc/Fire_userless(atom/target) - if(!target) - return - - if(world.time < next_fire_time) - return - - var/shoot_time = (burst - 1)* burst_delay - next_fire_time = world.time + shoot_time - - var/turf/targloc = get_turf(target) //cache this in case target gets deleted during shooting, e.g. if it was a securitron that got destroyed. - for(var/i in 1 to burst) - var/obj/projectile = consume_next_projectile() - if(!projectile) - handle_click_empty() - break - - if(istype(projectile, /obj/item/projectile)) - var/obj/item/projectile/P = projectile - - var/acc = burst_accuracy[min(i, burst_accuracy.len)] - var/disp = dispersion[min(i, dispersion.len)] - - P.accuracy = accuracy + acc - P.dispersion = disp - - P.shot_from = src.name - P.silenced |= silenced // A silent bullet (e.g., BBs) can be fired quietly from any gun. - - P.old_style_target(target) - P.fire() - - last_shot = world.time - - play_fire_sound() - - if(muzzle_flash) - set_light(muzzle_flash) - update_icon() - - //process_accuracy(projectile, user, target, acc, disp) - - // if(pointblank) - // process_point_blank(projectile, user, target) - - // if(process_projectile(projectile, null, target, user.zone_sel.selecting, clickparams)) - // handle_post_fire(null, target, pointblank, reflex) - - // update_icon() - - if(i < burst) - sleep(burst_delay) - - if(!(target && target.loc)) - target = targloc - //pointblank = 0 - - var/target_for_log - if(ismob(target)) - target_for_log = target - else - target_for_log = "[target.name]" - - add_attack_logs("Unmanned",target_for_log,"Fired [src.name]") - - //update timing - next_fire_time = world.time + fire_delay - - accuracy = initial(accuracy) //Reset the gun's accuracy - - if(muzzle_flash) - set_light(0) - -//obtains the next projectile to fire -/obj/item/weapon/gun/proc/consume_next_projectile() - return null - -//used by aiming code -/obj/item/weapon/gun/proc/can_hit(atom/target as mob, var/mob/living/user as mob) - if(!special_check(user)) - return 2 - //just assume we can shoot through glass and stuff. No big deal, the player can just choose to not target someone - //on the other side of a window if it makes a difference. Or if they run behind a window, too bad. - if(check_trajectory(target, user)) - return 1 // Magic numbers are fun. - -//called if there was no projectile to shoot -/obj/item/weapon/gun/proc/handle_click_empty(mob/user) - if (user) - user.visible_message("*click click*", "*click*") - user.hud_used.update_ammo_hud(user, src) - else - src.visible_message("*click click*") - playsound(src, 'sound/weapons/empty.ogg', 100, 1) - -// Called when the user is about to fire. -// Moved from handle_post_fire() because if using a laser, the message for when someone got shot would show up before the firing message. -/obj/item/weapon/gun/proc/handle_firing_text(mob/user, atom/target, pointblank = FALSE, reflex = FALSE) - if(silenced) - to_chat(user, "You fire \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]") - for(var/mob/living/L in oview(2,user)) - if(L.stat) - continue - if(L.blinded) - to_chat(L, "You hear a [fire_sound_text]!") - continue - to_chat(L, "\The [user] fires \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]!") - else - user.visible_message( - "\The [user] fires \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]!", - "You fire \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]!", - "You hear a [fire_sound_text]!" - ) - - var/target_for_log - if(ismob(target)) - target_for_log = target - else - target_for_log = "[target.name]" - - add_attack_logs(user, target_for_log, "Fired gun '[src.name]' ([reflex ? "REFLEX" : "MANUAL"])") - -//called after successfully firing -/obj/item/weapon/gun/proc/handle_post_fire(mob/user, atom/target, var/pointblank=0, var/reflex=0) - if(fire_anim) - flick(fire_anim, src) - - if(muzzle_flash) - set_light(muzzle_flash) - - if(one_handed_penalty) - if(!src.is_held_twohanded(user)) - switch(one_handed_penalty) - if(1 to 15) - if(prob(50)) //don't need to tell them every single time - to_chat(user, "Your aim wavers slightly.") - if(16 to 30) - to_chat(user, "Your aim wavers as you fire \the [src] with just one hand.") - if(31 to 45) - to_chat(user, "You have trouble keeping \the [src] on target with just one hand.") - if(46 to INFINITY) - to_chat(user, "You struggle to keep \the [src] on target with just one hand!") - else if(!user.can_wield_item(src)) - switch(one_handed_penalty) - if(1 to 15) - if(prob(50)) //don't need to tell them every single time - to_chat(user, "Your aim wavers slightly.") - if(16 to 30) - to_chat(user, "Your aim wavers as you try to hold \the [src] steady.") - if(31 to 45) - to_chat(user, "You have trouble holding \the [src] steady.") - if(46 to INFINITY) - to_chat(user, "You struggle to hold \the [src] steady!") - - if(recoil) - spawn() - shake_camera(user, recoil+1, recoil) - update_icon() - -/obj/item/weapon/gun/proc/process_point_blank(obj/projectile, mob/user, atom/target) - var/obj/item/projectile/P = projectile - if(!istype(P)) - return //default behaviour only applies to true projectiles - - //default point blank multiplier - var/damage_mult = 1.3 - - //determine multiplier due to the target being grabbed - if(ismob(target)) - var/mob/M = target - if(M.grabbed_by.len) - var/grabstate = 0 - for(var/obj/item/weapon/grab/G in M.grabbed_by) - grabstate = max(grabstate, G.state) - if(grabstate >= GRAB_NECK) - damage_mult = 2.5 - else if(grabstate >= GRAB_AGGRESSIVE) - damage_mult = 1.5 - P.damage *= damage_mult - -/obj/item/weapon/gun/proc/process_accuracy(obj/projectile, mob/living/user, atom/target, var/burst, var/held_twohanded) - var/obj/item/projectile/P = projectile - if(!istype(P)) - return //default behaviour only applies to true projectiles - - var/acc_mod = burst_accuracy[min(burst, burst_accuracy.len)] - var/disp_mod = dispersion[min(burst, dispersion.len)] - - if(one_handed_penalty) - if(!held_twohanded) - acc_mod += -CEILING(one_handed_penalty/2, 1) - disp_mod += one_handed_penalty*0.5 //dispersion per point of two-handedness - - //Accuracy modifiers - P.accuracy = accuracy + acc_mod - P.dispersion = disp_mod - - P.accuracy -= user.get_accuracy_penalty() - - //accuracy bonus from aiming - if (aim_targets && (target in aim_targets)) - //If you aim at someone beforehead, it'll hit more often. - //Kinda balanced by fact you need like 2 seconds to aim - //As opposed to no-delay pew pew - P.accuracy += 30 - - // Some modifiers make it harder or easier to hit things. - for(var/datum/modifier/M in user.modifiers) - if(!isnull(M.accuracy)) - P.accuracy += M.accuracy - if(!isnull(M.accuracy_dispersion)) - P.dispersion = max(P.dispersion + M.accuracy_dispersion, 0) - -//does the actual launching of the projectile -/obj/item/weapon/gun/proc/process_projectile(obj/projectile, mob/user, atom/target, var/target_zone, var/params=null) - var/obj/item/projectile/P = projectile - if(!istype(P)) - return FALSE //default behaviour only applies to true projectiles - - //shooting while in shock - var/forcespread - if(istype(user, /mob/living/carbon)) - var/mob/living/carbon/mob = user - if(mob.shock_stage > 120) - forcespread = rand(50, 50) - else if(mob.shock_stage > 70) - forcespread = rand(-25, 25) - var/launched = !P.launch_from_gun(target, target_zone, user, params, null, forcespread, src) - - if(launched) - play_fire_sound(user, P) - - return launched - -/obj/item/weapon/gun/proc/play_fire_sound(var/mob/user, var/obj/item/projectile/P) - var/shot_sound = fire_sound - - if(!shot_sound && istype(P) && P.fire_sound) // If the gun didn't have a fire_sound, but the projectile exists, and has a sound... - shot_sound = P.fire_sound - if(!shot_sound) // If there's still no sound... - return - - if(silenced) - playsound(src, shot_sound, 10, 1) - else - playsound(src, shot_sound, 50, 1) - -//Suicide handling. -/obj/item/weapon/gun/var/mouthshoot = 0 //To stop people from suiciding twice... >.> - -/obj/item/weapon/gun/proc/handle_suicide(mob/living/user) - if(!ishuman(user)) - return - var/mob/living/carbon/human/M = user - - mouthshoot = 1 - M.visible_message("[user] sticks their gun in their mouth, ready to pull the trigger...") - if(!do_after(user, 40)) - M.visible_message("[user] decided life was worth living") - mouthshoot = 0 - return - var/obj/item/projectile/in_chamber = consume_next_projectile() - if (istype(in_chamber)) - user.visible_message("[user] pulls the trigger.") - play_fire_sound(M, in_chamber) - if(istype(in_chamber, /obj/item/projectile/beam/lasertag)) - user.show_message("You feel rather silly, trying to commit suicide with a toy.") - mouthshoot = 0 - return - - in_chamber.on_hit(M) - if(in_chamber.damage_type != HALLOSS && !in_chamber.nodamage) - log_and_message_admins("[key_name(user)] commited suicide using \a [src]") - user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp = TRUE) - user.death() - else if(in_chamber.damage_type == HALLOSS) - to_chat(user, "Ow...") - user.apply_effect(110,AGONY,0) - qdel(in_chamber) - mouthshoot = 0 - return - else - handle_click_empty(user) - mouthshoot = 0 - return - -/obj/item/weapon/gun/proc/toggle_scope(var/zoom_amount=2.0) - //looking through a scope limits your periphereal vision - //still, increase the view size by a tiny amount so that sniping isn't too restricted to NSEW - var/zoom_offset = round(world.view * zoom_amount) - var/view_size = round(world.view + zoom_amount) - var/scoped_accuracy_mod = zoom_offset - - zoom(zoom_offset, view_size) - if(zoom) - accuracy = scoped_accuracy + scoped_accuracy_mod - if(recoil) - recoil = round(recoil*zoom_amount+1) //recoil is worse when looking through a scope - -//make sure accuracy and recoil are reset regardless of how the item is unzoomed. -/obj/item/weapon/gun/zoom() - ..() - if(!zoom) - accuracy = initial(accuracy) - recoil = initial(recoil) - -/obj/item/weapon/gun/examine(mob/user) - . = ..() - if(firemodes.len > 1) - var/datum/firemode/current_mode = firemodes[sel_mode] - . += "The fire selector is set to [current_mode.name]." - -/obj/item/weapon/gun/proc/switch_firemodes(mob/user) - if(firemodes.len <= 1) - return null - - sel_mode++ - if(sel_mode > firemodes.len) - sel_mode = 1 - var/datum/firemode/new_mode = firemodes[sel_mode] - new_mode.apply_to(src) - to_chat(user, "\The [src] is now set to [new_mode.name].") - user.hud_used.update_ammo_hud(user, src) // TGMC Ammo HUD - - return new_mode - -/obj/item/weapon/gun/attack_self(mob/user) - switch_firemodes(user) - -/* TGMC Ammo HUD Port Begin */ -/obj/item/weapon/gun - var/hud_enabled = TRUE - -/obj/item/weapon/gun/proc/has_ammo_counter() - return FALSE - -/obj/item/weapon/gun/proc/get_ammo_type() - return FALSE - -/obj/item/weapon/gun/proc/get_ammo_count() - return FALSE - -/obj/item/weapon/gun/equipped(mob/living/user, slot) // When a gun is equipped to your hands, we'll add the HUD to the user. Pending porting over TGMC guncode where wielding is far more sensible. - if(slot == slot_l_hand || slot == slot_r_hand) - user.hud_used.add_ammo_hud(user, src) - else - user.hud_used.remove_ammo_hud(user, src) - - return ..() - -/obj/item/weapon/gun/dropped(mob/living/user) // Ditto as above, we remove the HUD. Pending porting TGMC code to clean up this fucking nightmare of spaghetti. - user.hud_used.remove_ammo_hud(user, src) - +/* + Defines a firing mode for a gun. + + A firemode is created from a list of fire mode settings. Each setting modifies the value of the gun var with the same name. + If the fire mode value for a setting is null, it will be replaced with the initial value of that gun's variable when the firemode is created. + Obviously not compatible with variables that take a null value. If a setting is not present, then the corresponding var will not be modified. +*/ +/datum/firemode + var/name = "default" + var/list/settings = list() + +/datum/firemode/New(obj/item/weapon/gun/gun, list/properties = null) + ..() + if(!properties) return + + for(var/propname in properties) + var/propvalue = properties[propname] + + if(propname == "mode_name") + name = propvalue + if(isnull(propvalue)) + settings[propname] = gun.vars[propname] //better than initial() as it handles list vars like burst_accuracy + else + settings[propname] = propvalue + +/datum/firemode/proc/apply_to(obj/item/weapon/gun/gun) + for(var/propname in settings) + gun.vars[propname] = settings[propname] + +//Parent gun type. Guns are weapons that can be aimed at mobs and act over a distance +/obj/item/weapon/gun + name = "gun" + desc = "Its a gun. It's pretty terrible, though." + icon = 'icons/obj/gun.dmi' + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi', + ) + icon_state = "detective" + item_state = "gun" + slot_flags = SLOT_BELT|SLOT_HOLSTER + matter = list(MAT_STEEL = 2000) + w_class = ITEMSIZE_NORMAL + throwforce = 5 + throw_speed = 4 + throw_range = 5 + force = 5 + preserve_item = 1 + origin_tech = list(TECH_COMBAT = 1) + attack_verb = list("struck", "hit", "bashed") + zoomdevicename = "scope" + drop_sound = 'sound/items/drop/gun.ogg' + pickup_sound = 'sound/items/pickup/gun.ogg' + + var/recoil_mode = 1 //0 = no micro recoil, 1 = regular, anything higher than 1 is a multiplier //YAWN Addition, ported from CHOMP + var/automatic = 0 + var/burst = 1 + var/fire_delay = 6 //delay after shooting before the gun can be used again + var/burst_delay = 2 //delay between shots, if firing in bursts + var/move_delay = 1 + var/fire_sound = null // This is handled by projectile.dm's fire_sound var now, but you can override the projectile's fire_sound with this one if you want to. + var/fire_sound_text = "gunshot" + var/fire_anim = null + var/recoil = 0 //screen shake + var/silenced = 0 + var/muzzle_flash = 3 + var/accuracy = 0 //Accuracy is measured in percents. +15 accuracy means that everything is effectively one tile closer for the purpose of miss chance, -15 means the opposite. launchers are not supported, at the moment. + var/scoped_accuracy = null + var/list/burst_accuracy = list(0) //allows for different accuracies for each shot in a burst. Applied on top of accuracy + var/list/dispersion = list(0) + var/mode_name = null + var/projectile_type = /obj/item/projectile //On ballistics, only used to check for the cham gun + + var/wielded_item_state + var/one_handed_penalty = 0 // Penalty applied if someone fires a two-handed gun with one hand. + var/obj/screen/auto_target/auto_target + var/shooting = 0 + var/next_fire_time = 0 + + var/sel_mode = 1 //index of the currently selected mode + var/list/firemodes = list() + + //aiming system stuff + var/keep_aim = 1 //1 for keep shooting until aim is lowered + //0 for one bullet after tarrget moves and aim is lowered + var/multi_aim = 0 //Used to determine if you can target multiple people. + var/tmp/list/mob/living/aim_targets //List of who yer targeting. + var/tmp/mob/living/last_moved_mob //Used to fire faster at more than one person. + var/tmp/told_cant_shoot = 0 //So that it doesn't spam them with the fact they cannot hit them. + var/tmp/lock_time = -100 + + var/dna_lock = 0 //whether or not the gun is locked to dna + var/obj/item/dnalockingchip/attached_lock + + var/last_shot = 0 //records the last shot fired + +//VOREStation Add - /tg/ icon system + var/charge_sections = 4 + var/shaded_charge = FALSE + var/ammo_x_offset = 2 + var/ammo_y_offset = 0 + var/can_flashlight = FALSE + var/gun_light = FALSE + var/light_state = "flight" + var/light_brightness = 4 + var/flight_x_offset = 0 + var/flight_y_offset = 0 + +/obj/item/weapon/gun/CtrlClick(mob/user) + if(can_flashlight && ishuman(user) && src.loc == usr && !user.incapacitated(INCAPACITATION_ALL)) + toggle_flashlight() + else + return ..() + +/obj/item/weapon/gun/proc/toggle_flashlight() + if(gun_light) + set_light(0) + gun_light = FALSE + else + set_light(light_brightness) + gun_light = TRUE + + playsound(src, 'sound/machines/button.ogg', 25) + update_icon() +//VOREStation Add End + +/obj/item/weapon/gun/New() + ..() + for(var/i in 1 to firemodes.len) + firemodes[i] = new /datum/firemode(src, firemodes[i]) + + if(isnull(scoped_accuracy)) + scoped_accuracy = accuracy + + if(dna_lock) + attached_lock = new /obj/item/dnalockingchip(src) + if(!dna_lock) + verbs -= /obj/item/weapon/gun/verb/remove_dna + verbs -= /obj/item/weapon/gun/verb/give_dna + verbs -= /obj/item/weapon/gun/verb/allow_dna + +/obj/item/weapon/gun/update_twohanding() + if(one_handed_penalty) + var/mob/living/M = loc + if(istype(M)) + if(M.can_wield_item(src) && src.is_held_twohanded(M)) + name = "[initial(name)] (wielded)" + else + name = initial(name) + else + name = initial(name) + update_icon() // In case item_state is set somewhere else. + ..() + +/obj/item/weapon/gun/update_held_icon() + if(wielded_item_state) + var/mob/living/M = loc + if(istype(M)) + if(M.can_wield_item(src) && src.is_held_twohanded(M)) + LAZYSET(item_state_slots, slot_l_hand_str, wielded_item_state) + LAZYSET(item_state_slots, slot_r_hand_str, wielded_item_state) + else + LAZYSET(item_state_slots, slot_l_hand_str, initial(item_state)) + LAZYSET(item_state_slots, slot_r_hand_str, initial(item_state)) + ..() + + +//Checks whether a given mob can use the gun +//Any checks that shouldn't result in handle_click_empty() being called if they fail should go here. +//Otherwise, if you want handle_click_empty() to be called, check in consume_next_projectile() and return null there. +/obj/item/weapon/gun/proc/special_check(var/mob/user) + + if(!istype(user, /mob/living)) + return 0 + if(!user.IsAdvancedToolUser()) + return 0 + if(isanimal(user)) + var/mob/living/simple_mob/S = user + if(!S.IsHumanoidToolUser(src)) + return 0 + + var/mob/living/M = user + if(dna_lock && attached_lock.stored_dna) + if(!authorized_user(user)) + if(attached_lock.safety_level == 0) + to_chat(M, "\The [src] buzzes in dissapointment and displays an invalid DNA symbol.") + return 0 + if(!attached_lock.exploding) + if(attached_lock.safety_level == 1) + to_chat(M, "\The [src] hisses in dissapointment.") + visible_message("\The [src] announces, \"Self-destruct occurring in ten seconds.\"", "\The [src] announces, \"Self-destruct occurring in ten seconds.\"") + attached_lock.exploding = 1 + spawn(100) + explosion(src, 0, 0, 3, 4) + sleep(1) + qdel(src) + return 0 + if(HULK in M.mutations) + to_chat(M, "Your fingers are much too large for the trigger guard!") + return 0 + if((CLUMSY in M.mutations) && prob(40)) //Clumsy handling + var/obj/P = consume_next_projectile() + if(P) + if(process_projectile(P, user, user, pick("l_foot", "r_foot"))) + handle_post_fire(user, user) + var/datum/gender/TU = gender_datums[user.get_visible_gender()] + user.visible_message( + "\The [user] shoots [TU.himself] in the foot with \the [src]!", + "You shoot yourself in the foot with \the [src]!" + ) + M.drop_item() + else + handle_click_empty(user) + return 0 + return 1 + +/obj/item/weapon/gun/emp_act(severity) + for(var/obj/O in contents) + O.emp_act(severity) + +/obj/item/weapon/gun/afterattack(atom/A, mob/living/user, adjacent, params) + if(adjacent) return //A is adjacent, is the user, or is on the user's person + + if(!user.aiming) + user.aiming = new(user) + + if(user && user.client && user.aiming && user.aiming.active && user.aiming.aiming_at != A) + PreFire(A,user,params) //They're using the new gun system, locate what they're aiming at. + return + + if(user && user.a_intent == I_HELP && user.is_preference_enabled(/datum/client_preference/safefiring)) //regardless of what happens, refuse to shoot if help intent is on + to_chat(user, "You refrain from firing your [src] as your intent is set to help.") + return + + else + Fire(A, user, params) //Otherwise, fire normally. + return + +/* //Commented out for quality control and testing + if(automatic == 1)//Are we are going to be using automatic shooting + //We check to make sure they can fire + if(!special_check(user)) + return + if(auto_target)//If they already have one then update it + auto_target.loc = get_turf(A) + auto_target.delay_del = 1//And reset the del so its like they got a new one and doesnt instantly vanish + to_chat(user, "You ready \the [src]! Click and drag the target around to shoot.") + else//Otherwise just make a new one + auto_target = new/obj/screen/auto_target(get_turf(A), src) + visible_message("\The [user] readies the [src]!") + playsound(src, 'sound/weapons/TargetOn.ogg', 50, 1) + to_chat(user, "You ready \the [src]! Click and drag the target around to shoot.") + return + Fire(A,user,params) //Otherwise, fire normally. +*/ + +/obj/item/weapon/gun/attack(atom/A, mob/living/user, def_zone) + if (A == user && user.zone_sel.selecting == O_MOUTH && !mouthshoot) + handle_suicide(user) + else if(user.a_intent == I_HURT) //point blank shooting + if(user && user.client && user.aiming && user.aiming.active && user.aiming.aiming_at != A && A != user) + PreFire(A,user) //They're using the new gun system, locate what they're aiming at. + return + else + Fire(A, user, pointblank=1) + else + return ..() //Pistolwhippin' + +/obj/item/weapon/gun/attackby(var/obj/item/A as obj, mob/user as mob) + if(istype(A, /obj/item/dnalockingchip)) + if(dna_lock) + to_chat(user, "\The [src] already has a [attached_lock].") + return + to_chat(user, "You insert \the [A] into \the [src].") + user.drop_item() + A.loc = src + attached_lock = A + dna_lock = 1 + verbs += /obj/item/weapon/gun/verb/remove_dna + verbs += /obj/item/weapon/gun/verb/give_dna + verbs += /obj/item/weapon/gun/verb/allow_dna + return + + if(A.is_screwdriver()) + if(dna_lock && attached_lock && !attached_lock.controller_lock) + to_chat(user, "You begin removing \the [attached_lock] from \the [src].") + playsound(src, A.usesound, 50, 1) + if(do_after(user, 25 * A.toolspeed)) + to_chat(user, "You remove \the [attached_lock] from \the [src].") + user.put_in_hands(attached_lock) + dna_lock = 0 + attached_lock = null + verbs -= /obj/item/weapon/gun/verb/remove_dna + verbs -= /obj/item/weapon/gun/verb/give_dna + verbs -= /obj/item/weapon/gun/verb/allow_dna + else + to_chat(user, "\The [src] is not accepting modifications at this time.") + ..() + +/obj/item/weapon/gun/emag_act(var/remaining_charges, var/mob/user) + if(dna_lock && attached_lock.controller_lock) + to_chat(user, "You short circuit the internal locking mechanisms of \the [src]!") + attached_lock.controller_dna = null + attached_lock.controller_lock = 0 + attached_lock.stored_dna = list() + return 1 + +/obj/item/weapon/gun/MouseDrop(obj/over_object as obj) + if(!canremove) + return + + if (ishuman(usr) || issmall(usr)) //so monkeys can take off their backpacks -- Urist + + if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech. why? + return + + if (!( istype(over_object, /obj/screen) )) + return ..() + + //makes sure that the thing is equipped, so that we can't drag it into our hand from miles away. + //there's got to be a better way of doing this. + if (!(src.loc == usr) || (src.loc && src.loc.loc == usr)) + return + + if (( usr.restrained() ) || ( usr.stat )) + return + + if ((src.loc == usr) && !(istype(over_object, /obj/screen)) && !usr.unEquip(src)) + return + + switch(over_object.name) + if("r_hand") + usr.u_equip(src) + usr.put_in_r_hand(src) + if("l_hand") + usr.u_equip(src) + usr.put_in_l_hand(src) + src.add_fingerprint(usr) + +/obj/item/weapon/gun/proc/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0) + if(!user || !target) return + if(target.z != user.z) return + + add_fingerprint(user) + + user.break_cloak() + + if(!special_check(user)) + return + + if(world.time < next_fire_time) + if (world.time % 3) //to prevent spam + to_chat(user, "[src] is not ready to fire again!") + return + + var/shoot_time = (burst - 1)* burst_delay + + //These should apparently be disabled to allow for the automatic system to function without causing near-permanant paralysis. Re-enabling them while we sort that out. + user.setClickCooldown(shoot_time) //no clicking on things while shooting + user.setMoveCooldown(shoot_time) //no moving while shooting either + + next_fire_time = world.time + shoot_time + + var/held_twohanded = (user.can_wield_item(src) && src.is_held_twohanded(user)) + + //actually attempt to shoot + var/turf/targloc = get_turf(target) //cache this in case target gets deleted during shooting, e.g. if it was a securitron that got destroyed. + +/* // Commented out for quality control and testing. + shooting = 1 + if(automatic == 1 && auto_target && auto_target.active)//When we are going to shoot and have an auto_target AND its active meaning we clicked on it we tell it to burstfire 1000 rounds + burst = 1000//Yes its not EXACTLY full auto but when are we shooting more than 1000 normally and it can easily be made higher +*/ + for(var/i in 1 to burst) + /* // Commented out for quality control and testing. + if(!reflex && automatic)//If we are shooting automatic then check our target, however if we are shooting reflex we dont use automatic + //extra sanity checking. + if(user.incapacitated()) + return + if(user.get_active_hand() != src) + break + if(!auto_target) break//Stopped shooting + else if(auto_target.loc) + target = auto_target.loc + //Lastly just update our dir if needed + if(user.dir != get_dir(user, auto_target)) + user.face_atom(auto_target) + */ + var/obj/projectile = consume_next_projectile(user) + if(!projectile) + handle_click_empty(user) + break + + if(i == 1) // So one burst only makes one message and not 3+ messages. + handle_firing_text(user, target, pointblank, reflex) + + process_accuracy(projectile, user, target, i, held_twohanded) + + if(pointblank) + process_point_blank(projectile, user, target) + + if(process_projectile(projectile, user, target, user.zone_sel.selecting, clickparams)) + handle_post_fire(user, target, pointblank, reflex) + update_icon() + + if(i < burst) + sleep(burst_delay) + + if(!(target && target.loc)) + target = targloc + pointblank = 0 + + last_shot = world.time + +/* + // Commented out for quality control and testing. + shooting = 0 +*/ + + // We do this down here, so we don't get the message if we fire an empty gun. + if(user.item_is_in_hands(src) && user.hands_are_full()) + if(one_handed_penalty >= 20) + to_chat(user, "You struggle to keep \the [src] pointed at the correct position with just one hand!") + + //update timing + user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) + user.setMoveCooldown(move_delay) + next_fire_time = world.time + fire_delay + + accuracy = initial(accuracy) //Reset the gun's accuracy + + if(muzzle_flash) + //VOREStation Edit - Flashlights + if(gun_light) + set_light(light_brightness) + else + set_light(0) + //VOREStation Edit End + user.hud_used.update_ammo_hud(user, src) + + //YAWNEDIT: Recoil knockdown for micros, ported from CHOMPStation + if(recoil_mode && iscarbon(user)) + var/mob/living/carbon/nerd = user + var/mysize = nerd.size_multiplier + if(recoil_mode > 0) + if(mysize <= 0.5) + nerd.Weaken(1*recoil_mode) + if(!istype(src,/obj/item/weapon/gun/energy)) + nerd.adjustBruteLoss((5-mysize*4)*recoil_mode) + to_chat(nerd, "You're so tiny that you drop the gun and hurt yourself from the recoil!") + else + to_chat(nerd, "You're so tiny that the pull of the trigger causes you to drop the gun!") + + //YAWNEDIT: Knockdown code end + +// Similar to the above proc, but does not require a user, which is ideal for things like turrets. +/obj/item/weapon/gun/proc/Fire_userless(atom/target) + if(!target) + return + + if(world.time < next_fire_time) + return + + var/shoot_time = (burst - 1)* burst_delay + next_fire_time = world.time + shoot_time + + var/turf/targloc = get_turf(target) //cache this in case target gets deleted during shooting, e.g. if it was a securitron that got destroyed. + for(var/i in 1 to burst) + var/obj/projectile = consume_next_projectile() + if(!projectile) + handle_click_empty() + break + + if(istype(projectile, /obj/item/projectile)) + var/obj/item/projectile/P = projectile + + var/acc = burst_accuracy[min(i, burst_accuracy.len)] + var/disp = dispersion[min(i, dispersion.len)] + + P.accuracy = accuracy + acc + P.dispersion = disp + + P.shot_from = src.name + P.silenced |= silenced // A silent bullet (e.g., BBs) can be fired quietly from any gun. + + P.old_style_target(target) + P.fire() + + last_shot = world.time + + play_fire_sound() + + if(muzzle_flash) + set_light(muzzle_flash) + update_icon() + + //process_accuracy(projectile, user, target, acc, disp) + + // if(pointblank) + // process_point_blank(projectile, user, target) + + // if(process_projectile(projectile, null, target, user.zone_sel.selecting, clickparams)) + // handle_post_fire(null, target, pointblank, reflex) + + // update_icon() + + if(i < burst) + sleep(burst_delay) + + if(!(target && target.loc)) + target = targloc + //pointblank = 0 + + var/target_for_log + if(ismob(target)) + target_for_log = target + else + target_for_log = "[target.name]" + + add_attack_logs("Unmanned",target_for_log,"Fired [src.name]") + + //update timing + next_fire_time = world.time + fire_delay + + accuracy = initial(accuracy) //Reset the gun's accuracy + + if(muzzle_flash) + set_light(0) + +//obtains the next projectile to fire +/obj/item/weapon/gun/proc/consume_next_projectile() + return null + +//used by aiming code +/obj/item/weapon/gun/proc/can_hit(atom/target as mob, var/mob/living/user as mob) + if(!special_check(user)) + return 2 + //just assume we can shoot through glass and stuff. No big deal, the player can just choose to not target someone + //on the other side of a window if it makes a difference. Or if they run behind a window, too bad. + if(check_trajectory(target, user)) + return 1 // Magic numbers are fun. + +//called if there was no projectile to shoot +/obj/item/weapon/gun/proc/handle_click_empty(mob/user) + if (user) + user.visible_message("*click click*", "*click*") + user.hud_used.update_ammo_hud(user, src) + else + src.visible_message("*click click*") + playsound(src, 'sound/weapons/empty.ogg', 100, 1) + +// Called when the user is about to fire. +// Moved from handle_post_fire() because if using a laser, the message for when someone got shot would show up before the firing message. +/obj/item/weapon/gun/proc/handle_firing_text(mob/user, atom/target, pointblank = FALSE, reflex = FALSE) + if(silenced) + to_chat(user, "You fire \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]") + for(var/mob/living/L in oview(2,user)) + if(L.stat) + continue + if(L.blinded) + to_chat(L, "You hear a [fire_sound_text]!") + continue + to_chat(L, "\The [user] fires \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]!") + else + user.visible_message( + "\The [user] fires \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]!", + "You fire \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]!", + "You hear a [fire_sound_text]!" + ) + + var/target_for_log + if(ismob(target)) + target_for_log = target + else + target_for_log = "[target.name]" + + add_attack_logs(user, target_for_log, "Fired gun '[src.name]' ([reflex ? "REFLEX" : "MANUAL"])") + +//called after successfully firing +/obj/item/weapon/gun/proc/handle_post_fire(mob/user, atom/target, var/pointblank=0, var/reflex=0) + if(fire_anim) + flick(fire_anim, src) + + if(muzzle_flash) + set_light(muzzle_flash) + + if(one_handed_penalty) + if(!src.is_held_twohanded(user)) + switch(one_handed_penalty) + if(1 to 15) + if(prob(50)) //don't need to tell them every single time + to_chat(user, "Your aim wavers slightly.") + if(16 to 30) + to_chat(user, "Your aim wavers as you fire \the [src] with just one hand.") + if(31 to 45) + to_chat(user, "You have trouble keeping \the [src] on target with just one hand.") + if(46 to INFINITY) + to_chat(user, "You struggle to keep \the [src] on target with just one hand!") + else if(!user.can_wield_item(src)) + switch(one_handed_penalty) + if(1 to 15) + if(prob(50)) //don't need to tell them every single time + to_chat(user, "Your aim wavers slightly.") + if(16 to 30) + to_chat(user, "Your aim wavers as you try to hold \the [src] steady.") + if(31 to 45) + to_chat(user, "You have trouble holding \the [src] steady.") + if(46 to INFINITY) + to_chat(user, "You struggle to hold \the [src] steady!") + + if(recoil) + spawn() + shake_camera(user, recoil+1, recoil) + update_icon() + +/obj/item/weapon/gun/proc/process_point_blank(obj/projectile, mob/user, atom/target) + var/obj/item/projectile/P = projectile + if(!istype(P)) + return //default behaviour only applies to true projectiles + + //default point blank multiplier + var/damage_mult = 1.3 + + //determine multiplier due to the target being grabbed + if(ismob(target)) + var/mob/M = target + if(M.grabbed_by.len) + var/grabstate = 0 + for(var/obj/item/weapon/grab/G in M.grabbed_by) + grabstate = max(grabstate, G.state) + if(grabstate >= GRAB_NECK) + damage_mult = 2.5 + else if(grabstate >= GRAB_AGGRESSIVE) + damage_mult = 1.5 + P.damage *= damage_mult + +/obj/item/weapon/gun/proc/process_accuracy(obj/projectile, mob/living/user, atom/target, var/burst, var/held_twohanded) + var/obj/item/projectile/P = projectile + if(!istype(P)) + return //default behaviour only applies to true projectiles + + var/acc_mod = burst_accuracy[min(burst, burst_accuracy.len)] + var/disp_mod = dispersion[min(burst, dispersion.len)] + + if(one_handed_penalty) + if(!held_twohanded) + acc_mod += -CEILING(one_handed_penalty/2, 1) + disp_mod += one_handed_penalty*0.5 //dispersion per point of two-handedness + + //Accuracy modifiers + P.accuracy = accuracy + acc_mod + P.dispersion = disp_mod + + P.accuracy -= user.get_accuracy_penalty() + + //accuracy bonus from aiming + if (aim_targets && (target in aim_targets)) + //If you aim at someone beforehead, it'll hit more often. + //Kinda balanced by fact you need like 2 seconds to aim + //As opposed to no-delay pew pew + P.accuracy += 30 + + // Some modifiers make it harder or easier to hit things. + for(var/datum/modifier/M in user.modifiers) + if(!isnull(M.accuracy)) + P.accuracy += M.accuracy + if(!isnull(M.accuracy_dispersion)) + P.dispersion = max(P.dispersion + M.accuracy_dispersion, 0) + + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(H.species) + P.accuracy += H.species.gun_accuracy_mod + P.dispersion = max(P.dispersion + H.species.gun_accuracy_dispersion_mod, 0) + +//does the actual launching of the projectile +/obj/item/weapon/gun/proc/process_projectile(obj/projectile, mob/user, atom/target, var/target_zone, var/params=null) + var/obj/item/projectile/P = projectile + if(!istype(P)) + return FALSE //default behaviour only applies to true projectiles + + //shooting while in shock + var/forcespread + if(istype(user, /mob/living/carbon)) + var/mob/living/carbon/mob = user + if(mob.shock_stage > 120) + forcespread = rand(50, 50) + else if(mob.shock_stage > 70) + forcespread = rand(-25, 25) + var/launched = !P.launch_from_gun(target, target_zone, user, params, null, forcespread, src) + + if(launched) + play_fire_sound(user, P) + + return launched + +/obj/item/weapon/gun/proc/play_fire_sound(var/mob/user, var/obj/item/projectile/P) + var/shot_sound = fire_sound + + if(!shot_sound && istype(P) && P.fire_sound) // If the gun didn't have a fire_sound, but the projectile exists, and has a sound... + shot_sound = P.fire_sound + if(!shot_sound) // If there's still no sound... + return + + if(silenced) + playsound(src, shot_sound, 10, 1) + else + playsound(src, shot_sound, 50, 1) + +//Suicide handling. +/obj/item/weapon/gun/var/mouthshoot = 0 //To stop people from suiciding twice... >.> + +/obj/item/weapon/gun/proc/handle_suicide(mob/living/user) + if(!ishuman(user)) + return + var/mob/living/carbon/human/M = user + + mouthshoot = 1 + M.visible_message("[user] sticks their gun in their mouth, ready to pull the trigger...") + if(!do_after(user, 40)) + M.visible_message("[user] decided life was worth living") + mouthshoot = 0 + return + var/obj/item/projectile/in_chamber = consume_next_projectile() + if (istype(in_chamber)) + user.visible_message("[user] pulls the trigger.") + play_fire_sound(M, in_chamber) + if(istype(in_chamber, /obj/item/projectile/beam/lasertag)) + user.show_message("You feel rather silly, trying to commit suicide with a toy.") + mouthshoot = 0 + return + + in_chamber.on_hit(M) + if(in_chamber.damage_type != HALLOSS && !in_chamber.nodamage) + log_and_message_admins("[key_name(user)] commited suicide using \a [src]") + user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp = TRUE) + user.death() + else if(in_chamber.damage_type == HALLOSS) + to_chat(user, "Ow...") + user.apply_effect(110,AGONY,0) + qdel(in_chamber) + mouthshoot = 0 + return + else + handle_click_empty(user) + mouthshoot = 0 + return + +/obj/item/weapon/gun/proc/toggle_scope(var/zoom_amount=2.0) + //looking through a scope limits your periphereal vision + //still, increase the view size by a tiny amount so that sniping isn't too restricted to NSEW + var/zoom_offset = round(world.view * zoom_amount) + var/view_size = round(world.view + zoom_amount) + var/scoped_accuracy_mod = zoom_offset + + zoom(zoom_offset, view_size) + if(zoom) + accuracy = scoped_accuracy + scoped_accuracy_mod + if(recoil) + recoil = round(recoil*zoom_amount+1) //recoil is worse when looking through a scope + +//make sure accuracy and recoil are reset regardless of how the item is unzoomed. +/obj/item/weapon/gun/zoom() + ..() + if(!zoom) + accuracy = initial(accuracy) + recoil = initial(recoil) + +/obj/item/weapon/gun/examine(mob/user) + . = ..() + if(firemodes.len > 1) + var/datum/firemode/current_mode = firemodes[sel_mode] + . += "The fire selector is set to [current_mode.name]." + +/obj/item/weapon/gun/proc/switch_firemodes(mob/user) + if(firemodes.len <= 1) + return null + + sel_mode++ + if(sel_mode > firemodes.len) + sel_mode = 1 + var/datum/firemode/new_mode = firemodes[sel_mode] + new_mode.apply_to(src) + to_chat(user, "\The [src] is now set to [new_mode.name].") + user.hud_used.update_ammo_hud(user, src) // TGMC Ammo HUD + + return new_mode + +/obj/item/weapon/gun/attack_self(mob/user) + switch_firemodes(user) + +/* TGMC Ammo HUD Port Begin */ +/obj/item/weapon/gun + var/hud_enabled = TRUE + +/obj/item/weapon/gun/proc/has_ammo_counter() + return FALSE + +/obj/item/weapon/gun/proc/get_ammo_type() + return FALSE + +/obj/item/weapon/gun/proc/get_ammo_count() + return FALSE + +/obj/item/weapon/gun/equipped(mob/living/user, slot) // When a gun is equipped to your hands, we'll add the HUD to the user. Pending porting over TGMC guncode where wielding is far more sensible. + if(slot == slot_l_hand || slot == slot_r_hand) + user.hud_used.add_ammo_hud(user, src) + else + user.hud_used.remove_ammo_hud(user, src) + + return ..() + +/obj/item/weapon/gun/dropped(mob/living/user) // Ditto as above, we remove the HUD. Pending porting TGMC code to clean up this fucking nightmare of spaghetti. + user.hud_used.remove_ammo_hud(user, src) + ..() \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm index d3ce24149f..faaec5795c 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm @@ -17,6 +17,8 @@ combustion = FALSE + can_miss = FALSE + muzzle_type = /obj/effect/projectile/muzzle/medigun tracer_type = /obj/effect/projectile/tracer/medigun impact_type = /obj/effect/projectile/impact/medigun diff --git a/code/modules/projectiles/guns/energy/stun_vr.dm b/code/modules/projectiles/guns/energy/stun_vr.dm index b0bfd53e46..3ddc43986c 100644 --- a/code/modules/projectiles/guns/energy/stun_vr.dm +++ b/code/modules/projectiles/guns/energy/stun_vr.dm @@ -3,4 +3,7 @@ fire_delay = 4 /obj/item/weapon/gun/energy/stunrevolver - charge_cost = 400 \ No newline at end of file + charge_cost = 400 + +/obj/item/weapon/gun/energy/taser/mounted/cyborg + charge_cost = 160 \ No newline at end of file diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 8ed8d98ffd..049992dfac 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -40,6 +40,7 @@ var/ricochets = 0 var/ricochets_max = 2 var/ricochet_chance = 30 + var/can_miss = TRUE //Hitscan var/hitscan = FALSE //Whether this is hitscan. If it is, speed is basically ignored. @@ -139,7 +140,7 @@ var/impact_effect_type = null var/list/impacted_mobs = list() - + // TGMC Ammo HUD Port var/hud_state = "unknown" // What HUD state we use when we have ammunition. var/hud_state_empty = "unknown" // The empty state. DON'T USE _FLASH IN THE NAME OF THE EMPTY STATE STRING, THAT IS ADDED BY THE CODE. @@ -655,7 +656,7 @@ //roll to-hit miss_modifier = max(15*(distance-2) - accuracy + miss_modifier + target_mob.get_evasion(), -100) - var/hit_zone = get_zone_with_miss_chance(def_zone, target_mob, miss_modifier, ranged_attack=(distance > 1 || original != target_mob)) //if the projectile hits a target we weren't originally aiming at then retain the chance to miss + var/hit_zone = get_zone_with_miss_chance(def_zone, target_mob, miss_modifier, ranged_attack=(distance > 1 || original != target_mob), force_hit = !can_miss) //if the projectile hits a target we weren't originally aiming at then retain the chance to miss var/result = PROJECTILE_FORCE_MISS if(hit_zone) diff --git a/code/modules/random_map/drop/droppod.dm b/code/modules/random_map/drop/droppod.dm index 2b1cda09a8..e842772f4a 100644 --- a/code/modules/random_map/drop/droppod.dm +++ b/code/modules/random_map/drop/droppod.dm @@ -164,7 +164,7 @@ return if(tgui_alert(usr, "Do you wish the mob to have a player?","Assign Player?",list("No","Yes")) == "No") - var/spawn_count = input(usr, "How many mobs do you wish the pod to contain?", "Drop Pod Selection", null) as num + var/spawn_count = tgui_input_number(usr, "How many mobs do you wish the pod to contain?", "Drop Pod Selection", null) if(spawn_count <= 0) return for(var/i=0;i
" + var/savefile/S=new("data/player_notes.sav") + var/list/note_keys + S >> note_keys + if(!note_keys) + dat += "No notes found." + else + dat += "
| No keys found. |
| [t] |
" + + // Display a footer to select different pages + for(var/index = 1, index <= number_pages, index++) + if(index == page) + dat += "" + dat += "[index] " + if(index == page) + dat += "" + + usr << browse(dat, "window=player_notes;size=400x400") + +/datum/admins/proc/player_has_info_legacy(var/key as text) + var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav") + var/list/infos + info >> infos + if(!infos || !infos.len) return 0 + else return 1 + +/datum/admins/proc/show_player_info_legacy(var/key as text) + if (!istype(src,/datum/admins)) + src = usr.client.holder + if (!istype(src,/datum/admins)) + to_chat(usr, "Error: you are not an admin!") + return + var/dat = "
" + + var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav") + var/list/infos + info >> infos + if(!infos) + dat += "No information found on the given key.
" + else + var/update_file = 0 + var/i = 0 + for(var/datum/player_info/I in infos) + i += 1 + if(!I.timestamp) + I.timestamp = "Pre-4/3/2012" + update_file = 1 + if(!I.rank) + I.rank = "N/A" + update_file = 1 + dat += "[I.content] by [I.author] ([I.rank]) on [I.timestamp] " + if(I.author == usr.key || I.author == "Adminbot" || ishost(usr)) + dat += "Remove" + dat += "
" + if(update_file) info << infos + + dat += "
" + dat += "Add Comment
" + + dat += "" + usr << browse(dat, "window=adminplayerinfo;size=480x480") + +/datum/admins/Topic(href, href_list) + ..() + + if(href_list["add_player_info_legacy"]) + var/key = href_list["add_player_info_legacy"] + var/add = sanitize(input(usr, "Add Player Info (Legacy)")) + if(!add) return + + notes_add(key,add,usr) + show_player_info_legacy(key) + + if(href_list["remove_player_info_legacy"]) + var/key = href_list["remove_player_info_legacy"] + var/index = text2num(href_list["remove_index"]) + + notes_del(key, index) + show_player_info_legacy(key) + + if(href_list["notes_legacy"]) + var/ckey = href_list["ckey"] + if(!ckey) + var/mob/M = locate(href_list["mob"]) + if(ismob(M)) + ckey = M.ckey + + switch(href_list["notes_legacy"]) + if("show") + show_player_info_legacy(ckey) + if("list") + var/filter + if(href_list["filter"] && href_list["filter"] != "0") + filter = url_decode(href_list["filter"]) + PlayerNotesPageLegacy(text2num(href_list["index"]), filter) + if("filter") + PlayerNotesFilterLegacy() + return diff --git a/code/modules/tgui/modules/agentcard.dm b/code/modules/tgui/modules/agentcard.dm index 3046021436..0bdbd967ce 100644 --- a/code/modules/tgui/modules/agentcard.dm +++ b/code/modules/tgui/modules/agentcard.dm @@ -45,7 +45,7 @@ to_chat(usr, "Electronic warfare [S.electronic_warfare ? "enabled" : "disabled"].") . = TRUE if("age") - var/new_age = input(usr,"What age would you like to put on this card?","Agent Card Age", S.age) as null|num + var/new_age = tgui_input_number(usr,"What age would you like to put on this card?","Agent Card Age", S.age) if(!isnull(new_age) && tgui_status(usr, state) == STATUS_INTERACTIVE) if(new_age < 0) S.age = initial(S.age) @@ -63,7 +63,7 @@ to_chat(usr, "Appearance changed to [choice].") . = TRUE if("assignment") - var/new_job = sanitize(input(usr,"What assignment would you like to put on this card?\nChanging assignment will not grant or remove any access levels.","Agent Card Assignment", S.assignment) as null|text) + var/new_job = sanitize(tgui_input_text(usr,"What assignment would you like to put on this card?\nChanging assignment will not grant or remove any access levels.","Agent Card Assignment", S.assignment)) if(!isnull(new_job) && tgui_status(usr, state) == STATUS_INTERACTIVE) S.assignment = new_job to_chat(usr, "Occupation changed to '[new_job]'.") @@ -75,7 +75,7 @@ var/mob/living/carbon/human/H = usr if(H.dna) default = H.dna.b_type - var/new_blood_type = sanitize(input(usr,"What blood type would you like to be written on this card?","Agent Card Blood Type",default) as null|text) + var/new_blood_type = sanitize(tgui_input_text(usr,"What blood type would you like to be written on this card?","Agent Card Blood Type",default)) if(!isnull(new_blood_type) && tgui_status(usr, state) == STATUS_INTERACTIVE) S.blood_type = new_blood_type to_chat(usr, "Blood type changed to '[new_blood_type]'.") @@ -86,7 +86,7 @@ var/mob/living/carbon/human/H = usr if(H.dna) default = H.dna.unique_enzymes - var/new_dna_hash = sanitize(input(usr,"What DNA hash would you like to be written on this card?","Agent Card DNA Hash",default) as null|text) + var/new_dna_hash = sanitize(tgui_input_text(usr,"What DNA hash would you like to be written on this card?","Agent Card DNA Hash",default)) if(!isnull(new_dna_hash) && tgui_status(usr, state) == STATUS_INTERACTIVE) S.dna_hash = new_dna_hash to_chat(usr, "DNA hash changed to '[new_dna_hash]'.") @@ -97,13 +97,13 @@ var/mob/living/carbon/human/H = usr if(H.dna) default = md5(H.dna.uni_identity) - var/new_fingerprint_hash = sanitize(input(usr,"What fingerprint hash would you like to be written on this card?","Agent Card Fingerprint Hash",default) as null|text) + var/new_fingerprint_hash = sanitize(tgui_input_text(usr,"What fingerprint hash would you like to be written on this card?","Agent Card Fingerprint Hash",default)) if(!isnull(new_fingerprint_hash) && tgui_status(usr, state) == STATUS_INTERACTIVE) S.fingerprint_hash = new_fingerprint_hash to_chat(usr, "Fingerprint hash changed to '[new_fingerprint_hash]'.") . = TRUE if("name") - var/new_name = sanitizeName(input(usr,"What name would you like to put on this card?","Agent Card Name", S.registered_name) as null|text) + var/new_name = sanitizeName(tgui_input_text(usr,"What name would you like to put on this card?","Agent Card Name", S.registered_name)) if(!isnull(new_name) && tgui_status(usr, state) == STATUS_INTERACTIVE) S.registered_name = new_name S.update_name() @@ -114,7 +114,7 @@ to_chat(usr, "Photo changed.") . = TRUE if("sex") - var/new_sex = sanitize(input(usr,"What sex would you like to put on this card?","Agent Card Sex", S.sex) as null|text) + var/new_sex = sanitize(tgui_input_text(usr,"What sex would you like to put on this card?","Agent Card Sex", S.sex)) if(!isnull(new_sex) && tgui_status(usr, state) == STATUS_INTERACTIVE) S.sex = new_sex to_chat(usr, "Sex changed to '[new_sex]'.") diff --git a/code/modules/tgui/modules/appearance_changer.dm b/code/modules/tgui/modules/appearance_changer.dm index 37a7231b97..d6d7e5f386 100644 --- a/code/modules/tgui/modules/appearance_changer.dm +++ b/code/modules/tgui/modules/appearance_changer.dm @@ -93,8 +93,8 @@ if(can_change(APPEARANCE_RACE) && (params["race"] in valid_species)) if(target.change_species(params["race"])) if(params["race"] == "Custom Species") - target.custom_species = sanitize(input(usr, "Input custom species name:", - "Custom Species Name") as null|text, MAX_NAME_LEN) + target.custom_species = sanitize(tgui_input_text(usr, "Input custom species name:", + "Custom Species Name", null, MAX_NAME_LEN), MAX_NAME_LEN) cut_data() generate_data(usr) changed_hook(APPEARANCECHANGER_CHANGED_RACE) @@ -113,7 +113,7 @@ return 1 if("skin_tone") if(can_change_skin_tone()) - var/new_s_tone = input(usr, "Choose your character's skin-tone:\n(Light 1 - 220 Dark)", "Skin Tone", -target.s_tone + 35) as num|null + var/new_s_tone = tgui_input_number(usr, "Choose your character's skin-tone:\n(Light 1 - 220 Dark)", "Skin Tone", -target.s_tone + 35, 220, 1) if(isnum(new_s_tone) && can_still_topic(usr, state)) new_s_tone = 35 - max(min( round(new_s_tone), 220),1) changed_hook(APPEARANCECHANGER_CHANGED_SKINTONE) diff --git a/code/modules/tgui/modules/communications.dm b/code/modules/tgui/modules/communications.dm index 1a2ae082ef..10429d53cc 100644 --- a/code/modules/tgui/modules/communications.dm +++ b/code/modules/tgui/modules/communications.dm @@ -260,7 +260,7 @@ if(message_cooldown > world.time) to_chat(usr, "Please allow at least one minute to pass between announcements.") return - var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") as null|message + var/input = tgui_input_text(usr, "Please write a message to announce to the station crew.", "Priority Announcement", multiline = TRUE, prevent_enter = TRUE) if(!input || message_cooldown > world.time || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) return if(length(input) < COMM_MSGLEN_MINIMUM) @@ -324,11 +324,11 @@ post_status(src, params["statdisp"], user = usr) if("setmsg1") - stat_msg1 = reject_bad_text(sanitize(input(usr, "Line 1", "Enter Message Text", stat_msg1) as text|null, 40), 40) + stat_msg1 = reject_bad_text(sanitize(tgui_input_text(usr, "Line 1", "Enter Message Text", stat_msg1, 40), 40), 40) setMenuState(usr, COMM_SCREEN_STAT) if("setmsg2") - stat_msg2 = reject_bad_text(sanitize(input(usr, "Line 2", "Enter Message Text", stat_msg2) as text|null, 40), 40) + stat_msg2 = reject_bad_text(sanitize(tgui_input_text(usr, "Line 2", "Enter Message Text", stat_msg2, 40), 40), 40) setMenuState(usr, COMM_SCREEN_STAT) // OMG CENTCOMM LETTERHEAD @@ -337,10 +337,10 @@ if(centcomm_message_cooldown > world.time) to_chat(usr, "Arrays recycling. Please stand by.") return - var/input = sanitize(input(usr, "Please choose a message to transmit to [using_map.boss_short] via quantum entanglement. \ + var/input = sanitize(tgui_input_text(usr, "Please choose a message to transmit to [using_map.boss_short] via quantum entanglement. \ Please be aware that this process is very expensive, and abuse will lead to... termination. \ Transmission does not guarantee a response. \ - There is a 30 second delay before you may send another message, be clear, full and concise.", "Central Command Quantum Messaging") as null|message) + There is a 30 second delay before you may send another message, be clear, full and concise.", "Central Command Quantum Messaging", multiline = TRUE, prevent_enter = TRUE)) if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) return if(length(input) < COMM_CCMSGLEN_MINIMUM) @@ -358,7 +358,7 @@ if(centcomm_message_cooldown > world.time) to_chat(usr, "Arrays recycling. Please stand by.") return - var/input = sanitize(input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) + var/input = sanitize(tgui_input_text(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) return if(length(input) < COMM_CCMSGLEN_MINIMUM) diff --git a/code/modules/tgui/modules/gyrotron_control.dm b/code/modules/tgui/modules/gyrotron_control.dm index ee6f5af9b6..e0c4775849 100644 --- a/code/modules/tgui/modules/gyrotron_control.dm +++ b/code/modules/tgui/modules/gyrotron_control.dm @@ -18,7 +18,7 @@ switch(action) if("set_tag") - var/new_ident = sanitize_text(input(usr, "Enter a new ident tag.", "Gyrotron Control", gyro_tag) as null|text) + var/new_ident = sanitize_text(tgui_input_text(usr, "Enter a new ident tag.", "Gyrotron Control", gyro_tag)) if(new_ident) gyro_tag = new_ident return TRUE diff --git a/code/modules/tgui/modules/law_manager.dm b/code/modules/tgui/modules/law_manager.dm index 3a9ca9cf88..847281a554 100644 --- a/code/modules/tgui/modules/law_manager.dm +++ b/code/modules/tgui/modules/law_manager.dm @@ -89,7 +89,7 @@ return TRUE if("change_supplied_law_position") - var/new_position = input(usr, "Enter new supplied law position between 1 and [MAX_SUPPLIED_LAW_NUMBER], inclusive. Inherent laws at the same index as a supplied law will not be stated.", "Law Position", supplied_law_position) as num|null + var/new_position = tgui_input_number(usr, "Enter new supplied law position between 1 and [MAX_SUPPLIED_LAW_NUMBER], inclusive. Inherent laws at the same index as a supplied law will not be stated.", "Law Position", supplied_law_position) if(isnum(new_position) && can_still_topic(usr, state)) supplied_law_position = CLAMP(new_position, 1, MAX_SUPPLIED_LAW_NUMBER) return TRUE @@ -98,7 +98,7 @@ if(is_malf(usr)) var/datum/ai_law/AL = locate(params["edit_law"]) in owner.laws.all_laws() if(AL) - var/new_law = sanitize(input(usr, "Enter new law. Leaving the field blank will cancel the edit.", "Edit Law", AL.law)) + var/new_law = sanitize(tgui_input_text(usr, "Enter new law. Leaving the field blank will cancel the edit.", "Edit Law", AL.law)) if(new_law && new_law != AL.law && is_malf(usr) && can_still_topic(usr, state)) log_and_message_admins("has changed a law of [owner] from '[AL.law]' to '[new_law]'") AL.law = new_law diff --git a/code/modules/tgui/modules/ntos-only/cardmod.dm b/code/modules/tgui/modules/ntos-only/cardmod.dm index 8a8ace688f..b6e4a8063b 100644 --- a/code/modules/tgui/modules/ntos-only/cardmod.dm +++ b/code/modules/tgui/modules/ntos-only/cardmod.dm @@ -192,7 +192,7 @@ if(computer && program.can_run(usr, 1) && id_card) var/t1 = params["assign_target"] if(t1 == "Custom") - var/temp_t = sanitize(input(usr, "Enter a custom job assignment.","Assignment", id_card.assignment), 45) + var/temp_t = sanitize(tgui_input_text(usr, "Enter a custom job assignment.","Assignment", id_card.assignment, 45), 45) //let custom jobs function as an impromptu alt title, mainly for sechuds if(temp_t) id_card.assignment = temp_t diff --git a/code/modules/tgui/modules/ntos-only/email.dm b/code/modules/tgui/modules/ntos-only/email.dm index 746582ae7f..45317a9aee 100644 --- a/code/modules/tgui/modules/ntos-only/email.dm +++ b/code/modules/tgui/modules/ntos-only/email.dm @@ -231,10 +231,10 @@ /datum/tgui_module/email_client/tgui_act(action, params) if(..()) return TRUE - + var/mob/living/user = usr check_for_new_messages(1) // Any actual interaction (button pressing) is considered as acknowledging received message, for the purpose of notification icons. - + switch(action) if("login") log_in() @@ -279,7 +279,7 @@ var/oldtext = html_decode(msg_body) oldtext = replacetext(oldtext, "\[editorbr\]", "\n") - var/newtext = sanitize(replacetext(input(usr, "Enter your message. You may use most tags from paper formatting", "Message Editor", oldtext) as message|null, "\n", "\[editorbr\]"), 20000) + var/newtext = sanitize(replacetext(tgui_input_text(usr, "Enter your message. You may use most tags from paper formatting", "Message Editor", oldtext, 20000, TRUE, prevent_enter = TRUE), "\n", "\[editorbr\]"), 20000) if(newtext) msg_body = newtext return 1 @@ -362,13 +362,13 @@ return 1 if("changepassword") - var/oldpassword = sanitize(input(user,"Please enter your old password:", "Password Change"), 100) + var/oldpassword = sanitize(tgui_input_text(user,"Please enter your old password:", "Password Change", null, 100), 100) if(!oldpassword) return 1 - var/newpassword1 = sanitize(input(user,"Please enter your new password:", "Password Change"), 100) + var/newpassword1 = sanitize(tgui_input_text(user,"Please enter your new password:", "Password Change", null, 100), 100) if(!newpassword1) return 1 - var/newpassword2 = sanitize(input(user,"Please re-enter your new password:", "Password Change"), 100) + var/newpassword2 = sanitize(tgui_input_text(user,"Please re-enter your new password:", "Password Change", null, 100), 100) if(!newpassword2) return 1 @@ -399,7 +399,7 @@ error = "Error exporting file. Are you using a functional and NTOS-compliant device?" return 1 - var/filename = sanitize(input(user,"Please specify file name:", "Message export"), 100) + var/filename = sanitize(tgui_input_text(user,"Please specify file name:", "Message export", null, 100), 100) if(!filename) return 1 @@ -473,4 +473,4 @@ if("remove_attachment") msg_attachment = null - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/tgui/modules/overmap.dm b/code/modules/tgui/modules/overmap.dm index 5aac12d7c1..a9fff0e6d4 100644 --- a/code/modules/tgui/modules/overmap.dm +++ b/code/modules/tgui/modules/overmap.dm @@ -307,7 +307,7 @@ /* HELM */ if("add") var/datum/computer_file/data/waypoint/R = new() - var/sec_name = input(usr, "Input navigation entry name", "New navigation entry", "Sector #[known_sectors.len]") as text + var/sec_name = tgui_input_text(usr, "Input navigation entry name", "New navigation entry", "Sector #[known_sectors.len]") if(!sec_name) sec_name = "Sector #[known_sectors.len]" R.fields["name"] = sec_name @@ -319,8 +319,8 @@ R.fields["x"] = linked.x R.fields["y"] = linked.y if("new") - var/newx = input(usr, "Input new entry x coordinate", "Coordinate input", linked.x) as num - var/newy = input(usr, "Input new entry y coordinate", "Coordinate input", linked.y) as num + var/newx = tgui_input_number(usr, "Input new entry x coordinate", "Coordinate input", linked.x) + var/newy = tgui_input_number(usr, "Input new entry y coordinate", "Coordinate input", linked.y) R.fields["x"] = CLAMP(newx, 1, world.maxx) R.fields["y"] = CLAMP(newy, 1, world.maxy) known_sectors[sec_name] = R @@ -335,12 +335,12 @@ if("setcoord") if(params["setx"]) - var/newx = input(usr, "Input new destiniation x coordinate", "Coordinate input", dx) as num|null + var/newx = tgui_input_number(usr, "Input new destiniation x coordinate", "Coordinate input", dx) if(newx) dx = CLAMP(newx, 1, world.maxx) if(params["sety"]) - var/newy = input(usr, "Input new destiniation y coordinate", "Coordinate input", dy) as num|null + var/newy = tgui_input_number(usr, "Input new destiniation y coordinate", "Coordinate input", dy) if(newy) dy = CLAMP(newy, 1, world.maxy) . = TRUE @@ -356,13 +356,13 @@ . = TRUE if("speedlimit") - var/newlimit = input(usr, "Input new speed limit for autopilot (0 to brake)", "Autopilot speed limit", speedlimit*1000) as num|null + var/newlimit = tgui_input_number(usr, "Input new speed limit for autopilot (0 to brake)", "Autopilot speed limit", speedlimit*1000) if(newlimit) speedlimit = CLAMP(newlimit/1000, 0, 100) . = TRUE if("accellimit") - var/newlimit = input(usr, "Input new acceleration limit", "Acceleration limit", accellimit*1000) as num|null + var/newlimit = tgui_input_number(usr, "Input new acceleration limit", "Acceleration limit", accellimit*1000) if(newlimit) accellimit = max(newlimit/1000, 0) . = TRUE @@ -402,7 +402,7 @@ . = TRUE if("set_global_limit") - var/newlim = input(usr, "Input new thrust limit (0..100%)", "Thrust limit", linked.thrust_limit*100) as num + var/newlim = tgui_input_number(usr, "Input new thrust limit (0..100%)", "Thrust limit", linked.thrust_limit*100, 100, 0) linked.thrust_limit = clamp(newlim/100, 0, 1) for(var/datum/ship_engine/E in linked.engines) E.set_thrust_limit(linked.thrust_limit) @@ -416,7 +416,7 @@ if("set_limit") var/datum/ship_engine/E = locate(params["engine"]) - var/newlim = input(usr, "Input new thrust limit (0..100)", "Thrust limit", E.get_thrust_limit()) as num + var/newlim = tgui_input_number(usr, "Input new thrust limit (0..100)", "Thrust limit", E.get_thrust_limit(), 100, 0) var/limit = clamp(newlim/100, 0, 1) if(istype(E)) E.set_thrust_limit(limit) @@ -437,7 +437,7 @@ /* END ENGINES */ /* SENSORS */ if("range") - var/nrange = input(usr, "Set new sensors range", "Sensor range", sensors.range) as num|null + var/nrange = tgui_input_number(usr, "Set new sensors range", "Sensor range", sensors.range) if(nrange) sensors.set_range(CLAMP(nrange, 1, world.view)) . = TRUE diff --git a/code/modules/tgui/modules/rcon.dm b/code/modules/tgui/modules/rcon.dm index 01ba355248..0a29153d76 100644 --- a/code/modules/tgui/modules/rcon.dm +++ b/code/modules/tgui/modules/rcon.dm @@ -1,3 +1,5 @@ +#define SMES_PER_PAGE 4 + /datum/tgui_module/rcon name = "Power RCON" tgui_id = "RCON" @@ -5,17 +7,41 @@ var/list/known_SMESs = null var/list/known_breakers = null + var/filtered_smeslist = list() + + var/current_page = 1 + var/number_pages = 0 + +/datum/tgui_module/rcon/proc/filter_smeslist(var/page) + number_pages = known_SMESs.len / SMES_PER_PAGE + + if(number_pages != round(number_pages)) + number_pages = round(number_pages) + 1 + var/page_index = page - 1 + + var/lower_bound = page_index * SMES_PER_PAGE + 1 + var/upper_bound = (page_index + 1) * SMES_PER_PAGE + upper_bound = min(upper_bound, known_SMESs.len) + filtered_smeslist = list() + + for(var/index = lower_bound, index <= upper_bound, index++) + filtered_smeslist += known_SMESs[index] + /datum/tgui_module/rcon/tgui_data(mob/user) FindDevices() // Update our devices list var/list/data = ..() + filter_smeslist(current_page) + // SMES DATA (simplified view) var/list/smeslist[0] - for(var/obj/machinery/power/smes/buildable/SMES in known_SMESs) + for(var/obj/machinery/power/smes/buildable/SMES in filtered_smeslist) var/list/smes_data = SMES.tgui_data() smes_data["RCON_tag"] = SMES.RCon_tag smeslist.Add(list(smes_data)) + data["pages"] = number_pages + 1 + data["current_page"] = current_page data["smes_info"] = sortByKey(smeslist, "RCON_tag") // BREAKER DATA (simplified view) @@ -34,6 +60,10 @@ return TRUE switch(action) + if("set_smes_page") + var/page = params["index"] + current_page = page + . = TRUE if("smes_in_toggle") var/obj/machinery/power/smes/buildable/SMES = GetSMESByTag(params["smes"]) if(SMES) diff --git a/code/modules/tgui/modules/rustcore_monitor.dm b/code/modules/tgui/modules/rustcore_monitor.dm index 553363a963..a7ce6edbbb 100644 --- a/code/modules/tgui/modules/rustcore_monitor.dm +++ b/code/modules/tgui/modules/rustcore_monitor.dm @@ -25,7 +25,7 @@ return TRUE if("set_tag") - var/new_ident = sanitize_text(input(usr, "Enter a new ident tag.", "Core Control", core_tag) as null|text) + var/new_ident = sanitize_text(tgui_input_text(usr, "Enter a new ident tag.", "Core Control", core_tag)) if(new_ident) core_tag = new_ident return TRUE diff --git a/code/modules/tgui/modules/rustfuel_control.dm b/code/modules/tgui/modules/rustfuel_control.dm index b7c43b521d..820a937b99 100644 --- a/code/modules/tgui/modules/rustfuel_control.dm +++ b/code/modules/tgui/modules/rustfuel_control.dm @@ -22,7 +22,7 @@ return TRUE if("set_tag") - var/new_ident = sanitize_text(input(usr, "Enter a new ident tag.", "Gyrotron Control", fuel_tag) as null|text) + var/new_ident = sanitize_text(tgui_input_text(usr, "Enter a new ident tag.", "Gyrotron Control", fuel_tag)) if(new_ident) fuel_tag = new_ident diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index c34ccf63d7..b09b5ec759 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -32,8 +32,12 @@ var/closing = FALSE /// The status/visibility of the UI. var/status = STATUS_INTERACTIVE + /// Timed refreshing state + var/refreshing = FALSE /// Topic state used to determine status/interactability. var/datum/tgui_state/state = null + /// Rate limit client refreshes to prevent DoS. + COOLDOWN_DECLARE(refresh_cooldown) /// The map z-level to display. var/map_z_level = 1 /// The Parent UI @@ -176,11 +180,17 @@ /datum/tgui/proc/send_full_update(custom_data, force) if(!user.client || !initialized || closing) return + //if(!COOLDOWN_FINISHED(src, refresh_cooldown)) + //refreshing = TRUE + //addtimer(CALLBACK(src, .proc/send_full_update), TGUI_REFRESH_FULL_UPDATE_COOLDOWN, TIMER_UNIQUE) + //return + //refreshing = FALSE var/should_update_data = force || status >= STATUS_UPDATE window.send_message("update", get_payload( custom_data, with_data = should_update_data, with_static_data = TRUE)) + //COOLDOWN_START(src, refresh_cooldown, TGUI_REFRESH_FULL_UPDATE_COOLDOWN) /** * public @@ -211,6 +221,8 @@ "title" = title, "status" = status, "interface" = interface, + //"refreshing" = refreshing, + "refreshing" = FALSE, "map" = (using_map && using_map.path) ? using_map.path : "Unknown", "mapZLevel" = map_z_level, "window" = list( @@ -312,6 +324,9 @@ return FALSE switch(type) if("ready") + // Send a full update when the user manually refreshes the UI + if(initialized) + send_full_update() initialized = TRUE if("pingReply") initialized = TRUE @@ -327,4 +342,9 @@ return LAZYINITLIST(src_object.tgui_shared_states) src_object.tgui_shared_states[href_list["key"]] = href_list["value"] - SStgui.update_uis(src_object) \ No newline at end of file + SStgui.update_uis(src_object) + if("fallback") + #ifdef TGUI_DEBUGGING + log_tgui(user, "Fallback Triggered: [href_list["payload"]], Window: [window.id], Source: [src_object]") + #endif + src_object.tgui_fallback(payload) \ No newline at end of file diff --git a/code/modules/tgui/tgui_input_text.dm b/code/modules/tgui/tgui_input_text.dm deleted file mode 100644 index e2247a32ce..0000000000 --- a/code/modules/tgui/tgui_input_text.dm +++ /dev/null @@ -1,299 +0,0 @@ -/** - * Creates a TGUI input text window and returns the user's response. - * - * This proc should be used to create alerts that the caller will wait for a response from. - * Arguments: - * * user - The user to show the input box to. - * * message - The content of the input box, shown in the body of the TGUI window. - * * title - The title of the input box, shown on the top of the TGUI window. - * * default - The default value pre-populated in the input box. - * * timeout - The timeout of the input box, after which the input box will close and qdel itself. Set to zero for no timeout. - */ -/proc/tgui_input_text(mob/user, message, title, default, timeout = 0) - if (istext(user)) - stack_trace("tgui_input_text() received text for user instead of mob") - return - if (!user) - user = usr - if (!istype(user)) - if (istype(user, /client)) - var/client/client = user - user = client.mob - else - return - var/datum/tgui_input_dialog/input = new(user, message, title, default, timeout) - input.input_type = "text" - input.tgui_interact(user) - input.wait() - if (input) - . = input.choice - qdel(input) - -/** - * Creates a TGUI input message window and returns the user's response. - * - * This proc should be used to create alerts that the caller will wait for a response from. - * Arguments: - * * user - The user to show the input box to. - * * message - The content of the input box, shown in the body of the TGUI window. - * * title - The title of the input box, shown on the top of the TGUI window. - * * default - The default value pre-populated in the input box. - * * timeout - The timeout of the input box, after which the input box will close and qdel itself. Set to zero for no timeout. - */ -/proc/tgui_input_message(mob/user, message, title, default, timeout = 0) - if (istext(user)) - stack_trace("tgui_input_message() received text for user instead of mob") - return - if (!user) - user = usr - if (!istype(user)) - if (istype(user, /client)) - var/client/client = user - user = client.mob - else - return - var/datum/tgui_input_dialog/input = new(user, message, title, default, timeout) - input.input_type = "message" - input.tgui_interact(user) - input.wait() - if (input) - . = input.choice - qdel(input) - -/** - * Creates a TGUI input num window and returns the user's response. - * - * This proc should be used to create alerts that the caller will wait for a response from. - * Arguments: - * * user - The user to show the input box to. - * * message - The content of the input box, shown in the body of the TGUI window. - * * title - The title of the input box, shown on the top of the TGUI window. - * * default - The default value pre-populated in the input box. - * * timeout - The timeout of the input box, after which the input box will close and qdel itself. Set to zero for no timeout. - */ -/proc/tgui_input_num(mob/user, message, title, default, timeout = 0) - if (istext(user)) - stack_trace("tgui_input_num() received text for user instead of mob") - return - if (!user) - user = usr - if (!istype(user)) - if (istype(user, /client)) - var/client/client = user - user = client.mob - else - return - var/datum/tgui_input_dialog/input = new(user, message, title, default, timeout) - input.input_type = "num" - input.tgui_interact(user) - input.wait() - if (input) - . = input.choice - qdel(input) - -/** - * Creates an asynchronous TGUI input text window with an associated callback. - * - * This proc should be used to create inputs that invoke a callback with the user's chosen option. - * Arguments: - * * user - The user to show the input box to. - * * message - The content of the input box, shown in the body of the TGUI window. - * * title - The title of the input box, shown on the top of the TGUI window. - * * default - The default value pre-populated in the input box. - * * callback - The callback to be invoked when a choice is made. - * * timeout - The timeout of the input box, after which the menu will close and qdel itself. Set to zero for no timeout. - */ -/proc/tgui_input_text_async(mob/user, message, title, default, datum/callback/callback, timeout = 60 SECONDS) - if (istext(user)) - stack_trace("tgui_input_text_async() received text for user instead of mob") - return - if (!user) - user = usr - if (!istype(user)) - if (istype(user, /client)) - var/client/client = user - user = client.mob - else - return - var/datum/tgui_input_dialog/async/input = new(user, message, title, default, callback, timeout) - input.input_type = "text" - input.tgui_interact(user) - -/** - * Creates an asynchronous TGUI input message window with an associated callback. - * - * This proc should be used to create inputs that invoke a callback with the user's chosen option. - * Arguments: - * * user - The user to show the input box to. - * * message - The content of the input box, shown in the body of the TGUI window. - * * title - The title of the input box, shown on the top of the TGUI window. - * * default - The default value pre-populated in the input box. - * * callback - The callback to be invoked when a choice is made. - * * timeout - The timeout of the input box, after which the menu will close and qdel itself. Set to zero for no timeout. - */ -/proc/tgui_input_message_async(mob/user, message, title, default, datum/callback/callback, timeout = 60 SECONDS) - if (istext(user)) - stack_trace("tgui_input_message_async() received text for user instead of mob") - return - if (!user) - user = usr - if (!istype(user)) - if (istype(user, /client)) - var/client/client = user - user = client.mob - else - return - var/datum/tgui_input_dialog/async/input = new(user, message, title, default, callback, timeout) - input.input_type = "message" - input.tgui_interact(user) - -/** - * Creates an asynchronous TGUI input num window with an associated callback. - * - * This proc should be used to create inputs that invoke a callback with the user's chosen option. - * Arguments: - * * user - The user to show the input box to. - * * message - The content of the input box, shown in the body of the TGUI window. - * * title - The title of the input box, shown on the top of the TGUI window. - * * default - The default value pre-populated in the input box. - * * callback - The callback to be invoked when a choice is made. - * * timeout - The timeout of the input box, after which the menu will close and qdel itself. Set to zero for no timeout. - */ -/proc/tgui_input_num_async(mob/user, message, title, default, datum/callback/callback, timeout = 60 SECONDS) - if (istext(user)) - stack_trace("tgui_input_num_async() received text for user instead of mob") - return - if (!user) - user = usr - if (!istype(user)) - if (istype(user, /client)) - var/client/client = user - user = client.mob - else - return - var/datum/tgui_input_dialog/async/input = new(user, message, title, default, callback, timeout) - input.input_type = "num" - input.tgui_interact(user) - -/** - * # tgui_input_dialog - * - * Datum used for instantiating and using a TGUI-controlled input that prompts the user with - * a message and a box for accepting text/message/num input. - */ -/datum/tgui_input_dialog - /// The title of the TGUI window - var/title - /// The textual body of the TGUI window - var/message - /// The default value to initially populate the input box. - var/initial - /// The value that the user input into the input box, null if cancelled. - var/choice - /// The time at which the tgui_text_input was created, for displaying timeout progress. - var/start_time - /// The lifespan of the tgui_text_input, after which the window will close and delete itself. - var/timeout - /// Boolean field describing if the tgui_text_input was closed by the user. - var/closed - /// Indicates the data type we want to collect ("text", "message", "num") - var/input_type = "text" - -/datum/tgui_input_dialog/New(mob/user, message, title, default, timeout) - src.title = title - src.message = message - // TODO - Do we need to sanitize the initial value for illegal characters? - src.initial = default - if (timeout) - src.timeout = timeout - start_time = world.time - QDEL_IN(src, timeout) - -/datum/tgui_input_dialog/Destroy(force, ...) - SStgui.close_uis(src) - . = ..() - -/** - * Waits for a user's response to the tgui_text_input's prompt before returning. Returns early if - * the window was closed by the user. - */ -/datum/tgui_input_dialog/proc/wait() - while (!choice && !closed) - stoplag(1) - -/datum/tgui_input_dialog/tgui_interact(mob/user, datum/tgui/ui) - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "InputModal") - ui.open() - -/datum/tgui_input_dialog/tgui_close(mob/user) - . = ..() - closed = TRUE - -/datum/tgui_input_dialog/tgui_state(mob/user) - return GLOB.tgui_always_state - -/datum/tgui_input_dialog/tgui_static_data(mob/user) - . = list( - "title" = title, - "message" = message, - "initial" = initial, - "input_type" = input_type - ) - -/datum/tgui_input_dialog/tgui_data(mob/user) - . = list() - if(timeout) - .["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1) - -/datum/tgui_input_dialog/tgui_act(action, list/params) - . = ..() - if (.) - return - switch(action) - if("choose") - set_choice(params["choice"]) - if(isnull(src.choice)) - return - SStgui.close_uis(src) - return TRUE - if("cancel") - SStgui.close_uis(src) - closed = TRUE - return TRUE - -/datum/tgui_input_dialog/proc/set_choice(choice) - if(input_type == "num") - src.choice = text2num(choice) - return - src.choice = choice - -/** - * # async tgui_text_input - * - * An asynchronous version of tgui_text_input to be used with callbacks instead of waiting on user responses. - */ -/datum/tgui_input_dialog/async - /// The callback to be invoked by the tgui_text_input upon having a choice made. - var/datum/callback/callback - -/datum/tgui_input_dialog/async/New(mob/user, message, title, default, callback, timeout) - ..(user, title, message, default, timeout) - src.callback = callback - -/datum/tgui_input_dialog/async/Destroy(force, ...) - QDEL_NULL(callback) - . = ..() - -/datum/tgui_input_dialog/async/tgui_close(mob/user) - . = ..() - qdel(src) - -/datum/tgui_input_dialog/async/set_choice(choice) - . = ..() - if(!isnull(src.choice)) - callback?.InvokeAsync(src.choice) - -/datum/tgui_input_dialog/async/wait() - return diff --git a/code/modules/tgui/tgui_alert.dm b/code/modules/tgui_input/alert.dm similarity index 72% rename from code/modules/tgui/tgui_alert.dm rename to code/modules/tgui_input/alert.dm index 4ae15da886..9b658090b9 100644 --- a/code/modules/tgui/tgui_alert.dm +++ b/code/modules/tgui_input/alert.dm @@ -8,8 +8,9 @@ * * title - The of the alert modal, shown on the top of the TGUI window. * * buttons - The options that can be chosen by the user, each string is assigned a button on the UI. * * timeout - The timeout of the alert, after which the modal will close and qdel itself. Set to zero for no timeout. + * * autofocus - The bool that controls if this alert should grab window focus. */ -/proc/tgui_alert(mob/user, message = null, title = null, list/buttons = list("Ok"), timeout = 0) +/proc/tgui_alert(mob/user, message = "", title, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE, strict_byond = FALSE) if (istext(buttons)) stack_trace("tgui_alert() received text for buttons instead of list") return @@ -24,7 +25,19 @@ user = client.mob else return - var/datum/tgui_alert/alert = new(user, message, title, buttons, timeout) + // A gentle nudge - you should not be using TGUI alert for anything other than a simple message. + //if(length(buttons) > 3) + // log_tgui(user, "Error: TGUI Alert initiated with too many buttons. Use a list.", "TguiAlert") + // return tgui_input_list(user, message, title, buttons, timeout, autofocus) + + // Client does NOT have tgui_input on: Returns regular input + if(!user.client.prefs.tgui_input_mode || strict_byond) + if(length(buttons) == 2) + return alert(user, message, title, buttons[1], buttons[2]) + if(length(buttons) == 3) + return alert(user, message, title, buttons[1], buttons[2], buttons[3]) + + var/datum/tgui_alert/alert = new(user, message, title, buttons, timeout, autofocus) alert.tgui_interact(user) alert.wait() if (alert) @@ -32,37 +45,7 @@ qdel(alert) /** - * Creates an asynchronous TGUI alert window with an associated callback. - * - * This proc should be used to create alerts that invoke a callback with the user's chosen option. - * Arguments: - * * user - The user to show the alert to. - * * message - The content of the alert, shown in the body of the TGUI window. - * * title - The of the alert modal, shown on the top of the TGUI window. - * * buttons - The options that can be chosen by the user, each string is assigned a button on the UI. - * * callback - The callback to be invoked when a choice is made. - * * timeout - The timeout of the alert, after which the modal will close and qdel itself. Disabled by default, can be set to seconds otherwise. - */ -/proc/tgui_alert_async(mob/user, message = null, title = null, list/buttons = list("Ok"), datum/callback/callback, timeout = 0) - if (istext(buttons)) - stack_trace("tgui_alert() received text for buttons instead of list") - return - if (istext(user)) - stack_trace("tgui_alert() received text for user instead of list") - return - if (!user) - user = usr - if (!istype(user)) - if (istype(user, /client)) - var/client/client = user - user = client.mob - else - return - var/datum/tgui_alert/async/alert = new(user, message, title, buttons, callback, timeout) - alert.tgui_interact(user) - -/** - * # tgui_modal + * # tgui_alert * * Datum used for instantiating and using a TGUI-controlled modal that prompts the user with * a message and has buttons for responses. @@ -80,13 +63,16 @@ var/start_time /// The lifespan of the tgui_modal, after which the window will close and delete itself. var/timeout + /// The bool that controls if this modal should grab window focus + var/autofocus /// Boolean field describing if the tgui_modal was closed by the user. var/closed -/datum/tgui_alert/New(mob/user, message, title, list/buttons, timeout) - src.title = title - src.message = message +/datum/tgui_alert/New(mob/user, message, title, list/buttons, timeout, autofocus) + src.autofocus = autofocus src.buttons = buttons.Copy() + src.message = message + src.title = title if (timeout) src.timeout = timeout start_time = world.time @@ -118,15 +104,21 @@ /datum/tgui_alert/tgui_state(mob/user) return GLOB.tgui_always_state -/datum/tgui_alert/tgui_data(mob/user) - . = list( - "title" = title, - "message" = message, - "buttons" = buttons - ) +/datum/tgui_alert/tgui_static_data(mob/user) + var/list/data = list() + data["autofocus"] = autofocus + data["buttons"] = buttons + data["message"] = message + data["large_buttons"] = user.client.prefs.tgui_large_buttons + data["swapped_buttons"] = !user.client.prefs.tgui_swapped_buttons + data["title"] = title + return data +/datum/tgui_alert/tgui_data(mob/user) + var/list/data = list() if(timeout) - .["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) + data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) + return data /datum/tgui_alert/tgui_act(action, list/params) . = ..() @@ -139,10 +131,44 @@ set_choice(params["choice"]) SStgui.close_uis(src) return TRUE + if("cancel") + closed = TRUE + SStgui.close_uis(src) + return TRUE /datum/tgui_alert/proc/set_choice(choice) src.choice = choice +/** + * Creates an asynchronous TGUI alert window with an associated callback. + * + * This proc should be used to create alerts that invoke a callback with the user's chosen option. + * Arguments: + * * user - The user to show the alert to. + * * message - The content of the alert, shown in the body of the TGUI window. + * * title - The of the alert modal, shown on the top of the TGUI window. + * * buttons - The options that can be chosen by the user, each string is assigned a button on the UI. + * * callback - The callback to be invoked when a choice is made. + * * timeout - The timeout of the alert, after which the modal will close and qdel itself. Disabled by default, can be set to seconds otherwise. + */ +/proc/tgui_alert_async(mob/user, message = "", title, list/buttons = list("Ok"), datum/callback/callback, timeout = 0, autofocus = TRUE) + if (istext(buttons)) + stack_trace("tgui_alert() received text for buttons instead of list") + return + if (istext(user)) + stack_trace("tgui_alert() received text for user instead of list") + return + if (!user) + user = usr + if (!istype(user)) + if (istype(user, /client)) + var/client/client = user + user = client.mob + else + return + var/datum/tgui_alert/async/alert = new(user, message, title, buttons, callback, timeout, autofocus) + alert.tgui_interact(user) + /** * # async tgui_modal * @@ -152,8 +178,8 @@ /// The callback to be invoked by the tgui_modal upon having a choice made. var/datum/callback/callback -/datum/tgui_alert/async/New(mob/user, message, title, list/buttons, callback, timeout) - ..(user, message, title, buttons, timeout) +/datum/tgui_alert/async/New(mob/user, message, title, list/buttons, callback, timeout, autofocus) + ..(user, message, title, buttons, timeout, autofocus) src.callback = callback /datum/tgui_alert/async/Destroy(force, ...) diff --git a/code/modules/tgui/tgui_input_list.dm b/code/modules/tgui_input/list.dm similarity index 68% rename from code/modules/tgui/tgui_input_list.dm rename to code/modules/tgui_input/list.dm index 8b1af90196..c079f0be74 100644 --- a/code/modules/tgui/tgui_input_list.dm +++ b/code/modules/tgui_input/list.dm @@ -6,17 +6,18 @@ * * user - The user to show the input box to. * * message - The content of the input box, shown in the body of the TGUI window. * * title - The title of the input box, shown on the top of the TGUI window. - * * buttons - The options that can be chosen by the user, each string is assigned a button on the UI. + * * items - The options that can be chosen by the user, each string is assigned a button on the UI. * * default - The option with this value will be selected on first paint of the TGUI window. * * timeout - The timeout of the input box, after which the input box will close and qdel itself. Set to zero for no timeout. + * * strict_modern - Disabled the preference check of the input box, only allowing the TGUI window to show. */ -/proc/tgui_input_list(mob/user, message, title, list/buttons, default, timeout = 0) +/proc/tgui_input_list(mob/user, message, title = "Select", list/items, default, timeout = 0, strict_modern = FALSE) if (istext(user)) stack_trace("tgui_alert() received text for user instead of mob") return if (!user) user = usr - if(!length(buttons)) + if(!length(items)) return if (!istype(user)) if (istype(user, /client)) @@ -24,43 +25,16 @@ user = client.mob else return - var/datum/tgui_list_input/input = new(user, message, title, buttons, default, timeout) + /// Client does NOT have tgui_input on: Returns regular input + if(!user.client.prefs.tgui_input_mode && !strict_modern) + return input(user, message, title, default) as null|anything in items + var/datum/tgui_list_input/input = new(user, message, title, items, default, timeout) input.tgui_interact(user) input.wait() if (input) . = input.choice qdel(input) -/** - * Creates an asynchronous TGUI input list window with an associated callback. - * - * This proc should be used to create inputs that invoke a callback with the user's chosen option. - * Arguments: - * * user - The user to show the input box to. - * * message - The content of the input box, shown in the body of the TGUI window. - * * title - The title of the input box, shown on the top of the TGUI window. - * * buttons - The options that can be chosen by the user, each string is assigned a button on the UI. - * * default - The option with this value will be selected on first paint of the TGUI window. - * * callback - The callback to be invoked when a choice is made. - * * timeout - The timeout of the input box, after which the menu will close and qdel itself. Set to zero for no timeout. - */ -/proc/tgui_input_list_async(mob/user, message, title, list/buttons, default, datum/callback/callback, timeout = 60 SECONDS) - if (istext(user)) - stack_trace("tgui_alert() received text for user instead of mob") - return - if (!user) - user = usr - if(!length(buttons)) - return - if (!istype(user)) - if (istype(user, /client)) - var/client/client = user - user = client.mob - else - return - var/datum/tgui_list_input/async/input = new(user, message, title, buttons, default, callback, timeout) - input.tgui_interact(user) - /** * # tgui_list_input * @@ -72,14 +46,14 @@ var/title /// The textual body of the TGUI window var/message - /// The list of buttons (responses) provided on the TGUI window - var/list/buttons - /// Buttons (strings specifically) mapped to the actual value (e.g. a mob or a verb) - var/list/buttons_map - /// Value of the button that should be pre-selected on first paint. - var/initial + /// The list of items (responses) provided on the TGUI window + var/list/items + /// Items (strings specifically) mapped to the actual value (e.g. a mob or a verb) + var/list/items_map /// The button that the user has pressed, null if no selection has been made var/choice + /// The default item to be selected + var/default /// The time at which the tgui_list_input was created, for displaying timeout progress. var/start_time /// The lifespan of the tgui_list_input, after which the window will close and delete itself. @@ -87,29 +61,29 @@ /// Boolean field describing if the tgui_list_input was closed by the user. var/closed -/datum/tgui_list_input/New(mob/user, message, title, list/buttons, default, timeout) +/datum/tgui_list_input/New(mob/user, message, title, list/items, default, timeout) src.title = title src.message = message - src.buttons = list() - src.buttons_map = list() - src.initial = default - var/list/repeat_buttons = list() + src.items = list() + src.items_map = list() + src.default = default + var/list/repeat_items = list() // Gets rid of illegal characters var/static/regex/whitelistedWords = regex(@{"([^\u0020-\u8000]+)"}) - for(var/i in buttons) + for(var/i in items) if(isnull(i)) - stack_trace("Null in a tgui_input_list() buttons") + stack_trace("Null in a tgui_input_list() items") continue var/string_key = whitelistedWords.Replace("[i]", "") //avoids duplicated keys E.g: when areas have the same name - string_key = avoid_assoc_duplicate_keys(string_key, repeat_buttons) + string_key = avoid_assoc_duplicate_keys(string_key, repeat_items) - src.buttons += string_key - src.buttons_map[string_key] = i + src.items += string_key + src.items_map[string_key] = i if (timeout) @@ -119,7 +93,7 @@ /datum/tgui_list_input/Destroy(force, ...) SStgui.close_uis(src) - QDEL_NULL(buttons) + QDEL_NULL(items) . = ..() /** @@ -133,7 +107,7 @@ /datum/tgui_list_input/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "ListInput") + ui = new(user, src, "ListInputModal") ui.open() /datum/tgui_list_input/tgui_close(mob/user) @@ -144,27 +118,31 @@ return GLOB.tgui_always_state /datum/tgui_list_input/tgui_static_data(mob/user) - . = list( - "title" = title, - "message" = message, - "buttons" = buttons, - "initial" = initial - ) + var/list/data = list() + data["init_value"] = default || items[1] + data["items"] = items + data["large_buttons"] = user.client.prefs.tgui_large_buttons + data["message"] = message + data["swapped_buttons"] = !user.client.prefs.tgui_swapped_buttons + data["title"] = title + return data /datum/tgui_list_input/tgui_data(mob/user) - . = list() + var/list/data = list() if(timeout) - .["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1) + data["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1) + return data /datum/tgui_list_input/tgui_act(action, list/params) . = ..() if (.) return switch(action) - if("choose") - if (!(params["choice"] in buttons)) + if("submit") + if (!(params["entry"] in items)) return - set_choice(buttons_map[params["choice"]]) + set_choice(items_map[params["entry"]]) + closed = TRUE SStgui.close_uis(src) return TRUE if("cancel") @@ -175,6 +153,36 @@ /datum/tgui_list_input/proc/set_choice(choice) src.choice = choice +/** + * Creates an asynchronous TGUI input list window with an associated callback. + * + * This proc should be used to create inputs that invoke a callback with the user's chosen option. + * Arguments: + * * user - The user to show the input box to. + * * message - The content of the input box, shown in the body of the TGUI window. + * * title - The title of the input box, shown on the top of the TGUI window. + * * items - The options that can be chosen by the user, each string is assigned a button on the UI. + * * default - The option with this value will be selected on first paint of the TGUI window. + * * callback - The callback to be invoked when a choice is made. + * * timeout - The timeout of the input box, after which the menu will close and qdel itself. Set to zero for no timeout. + */ +/proc/tgui_input_list_async(mob/user, message, title, list/items, default, datum/callback/callback, timeout = 60 SECONDS) + if (istext(user)) + stack_trace("tgui_alert() received text for user instead of mob") + return + if (!user) + user = usr + if(!length(items)) + return + if (!istype(user)) + if (istype(user, /client)) + var/client/client = user + user = client.mob + else + return + var/datum/tgui_list_input/async/input = new(user, message, title, items, default, callback, timeout) + input.tgui_interact(user) + /** * # async tgui_list_input * @@ -184,8 +192,8 @@ /// The callback to be invoked by the tgui_list_input upon having a choice made. var/datum/callback/callback -/datum/tgui_list_input/async/New(mob/user, message, title, list/buttons, default, callback, timeout) - ..(user, title, message, buttons, default, timeout) +/datum/tgui_list_input/async/New(mob/user, message, title, list/items, default, callback, timeout) + ..(user, title, message, items, default, timeout) src.callback = callback /datum/tgui_list_input/async/Destroy(force, ...) diff --git a/code/modules/tgui_input/number.dm b/code/modules/tgui_input/number.dm new file mode 100644 index 0000000000..4aadb5edc1 --- /dev/null +++ b/code/modules/tgui_input/number.dm @@ -0,0 +1,211 @@ +/** + * Creates a TGUI window with a number input. Returns the user's response as num | null. + * + * This proc should be used to create windows for number entry that the caller will wait for a response from. + * If tgui fancy chat is turned off: Will return a normal input. If a max or min value is specified, will + * validate the input inside the UI and ui_act. + * + * Arguments: + * * user - The user to show the number input to. + * * message - The content of the number input, shown in the body of the TGUI window. + * * title - The title of the number input modal, shown on the top of the TGUI window. + * * default - The default (or current) value, shown as a placeholder. Users can press refresh with this. + * * max_value - Specifies a maximum value. If none is set, any number can be entered. Pressing "max" defaults to 1000. + * * min_value - Specifies a minimum value. Often 0. + * * timeout - The timeout of the number input, after which the modal will close and qdel itself. Set to zero for no timeout. + * * round_value - whether the inputted number is rounded down into an integer. + */ +/proc/tgui_input_number(mob/user, message, title = "Number Input", default = 0, max_value = INFINITY, min_value = -INFINITY, timeout = 0, round_value = FALSE) + if (!user) + user = usr + if (!istype(user)) + if (istype(user, /client)) + var/client/client = user + user = client.mob + else + return + // Client does NOT have tgui_input on: Returns regular input + if(!user.client.prefs.tgui_input_mode) + var/input_number = input(user, message, title, default) as null|num + return clamp(round_value ? round(input_number) : input_number, min_value, max_value) + var/datum/tgui_input_number/number_input = new(user, message, title, default, max_value, min_value, timeout, round_value) + number_input.tgui_interact(user) + number_input.wait() + if (number_input) + . = number_input.entry + qdel(number_input) + +/** + * # tgui_input_number + * + * Datum used for instantiating and using a TGUI-controlled number input that prompts the user with + * a message and has an input for number entry. + */ +/datum/tgui_input_number + /// Boolean field describing if the tgui_input_number was closed by the user. + var/closed + /// The default (or current) value, shown as a default. Users can press reset with this. + var/default + /// The entry that the user has return_typed in. + var/entry + /// The maximum value that can be entered. + var/max_value + /// The prompt's body, if any, of the TGUI window. + var/message + /// The minimum value that can be entered. + var/min_value + /// Whether the submitted number is rounded down into an integer. + var/round_value + /// The time at which the number input was created, for displaying timeout progress. + var/start_time + /// The lifespan of the number input, after which the window will close and delete itself. + var/timeout + /// The title of the TGUI window + var/title + +/datum/tgui_input_number/New(mob/user, message, title, default, max_value, min_value, timeout, round_value) + src.default = default + src.max_value = max_value + src.message = message + src.min_value = min_value + src.title = title + src.round_value = round_value + if (timeout) + src.timeout = timeout + start_time = world.time + QDEL_IN(src, timeout) + /// Checks for empty numbers - bank accounts, etc. + if(max_value == 0) + src.min_value = 0 + if(default) + src.default = 0 + /// Sanity check + if(default < min_value) + src.default = min_value + if(default > max_value) + CRASH("Default value is greater than max value.") + +/datum/tgui_input_number/Destroy(force, ...) + SStgui.close_uis(src) + return ..() + +/** + * Waits for a user's response to the tgui_input_number's prompt before returning. Returns early if + * the window was closed by the user. + */ +/datum/tgui_input_number/proc/wait() + while (!entry && !closed && !QDELETED(src)) + stoplag(1) + +/datum/tgui_input_number/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "NumberInputModal") + ui.open() + +/datum/tgui_input_number/tgui_close(mob/user) + . = ..() + closed = TRUE + +/datum/tgui_input_number/tgui_state(mob/user) + return GLOB.tgui_always_state + +/datum/tgui_input_number/tgui_static_data(mob/user) + var/list/data = list() + data["init_value"] = default // Default is a reserved keyword + data["large_buttons"] = user.client.prefs.tgui_large_buttons + data["max_value"] = max_value + data["message"] = message + data["min_value"] = min_value + data["swapped_buttons"] = !user.client.prefs.tgui_swapped_buttons + data["title"] = title + return data + +/datum/tgui_input_number/tgui_data(mob/user) + var/list/data = list() + if(timeout) + data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) + return data + +/datum/tgui_input_number/tgui_act(action, list/params) + . = ..() + if (.) + return + switch(action) + if("submit") + if(!isnum(params["entry"])) + CRASH("A non number was input into tgui input number by [usr]") + //var/choice = round_value ? round(params["entry"]) : params["entry"] + var/choice = params["entry"] + if(choice > max_value) + CRASH("A number greater than the max value was input into tgui input number by [usr]") + if(choice < min_value) + CRASH("A number less than the min value was input into tgui input number by [usr]") + set_entry(choice) + closed = TRUE + SStgui.close_uis(src) + return TRUE + if("cancel") + closed = TRUE + SStgui.close_uis(src) + return TRUE + +/datum/tgui_input_number/proc/set_entry(entry) + src.entry = entry + +/** + * Creates an asynchronous TGUI input num window with an associated callback. + * + * This proc should be used to create inputs that invoke a callback with the user's chosen option. + * Arguments: + * * user - The user to show the input box to. + * * message - The content of the input box, shown in the body of the TGUI window. + * * title - The title of the input box, shown on the top of the TGUI window. + * * default - The default value pre-populated in the input box. + * * callback - The callback to be invoked when a choice is made. + * * timeout - The timeout of the input box, after which the menu will close and qdel itself. Set to zero for no timeout. + * * round_value - whether the inputted number is rounded down into an integer. + */ +/proc/tgui_input_number_async(mob/user, message, title, default, datum/callback/callback, timeout = 60 SECONDS, round_value = FALSE) + if (istext(user)) + stack_trace("tgui_input_num_async() received text for user instead of mob") + return + if (!user) + user = usr + if (!istype(user)) + if (istype(user, /client)) + var/client/client = user + user = client.mob + else + return + var/datum/tgui_input_number/async/input = new(user, message, title, default, callback, timeout, round_value) + input.tgui_interact(user) + +/** + * # async tgui_text_input + * + * An asynchronous version of tgui_text_input to be used with callbacks instead of waiting on user responses. + */ +/datum/tgui_input_number/async + /// The callback to be invoked by the tgui_text_input upon having a choice made. + var/datum/callback/callback + +/datum/tgui_input_number/async/New(mob/user, message, title, default, callback, timeout, round_value) + ..(user, title, message, default, timeout, round_value) + src.callback = callback + +/datum/tgui_input_number/async/Destroy(force, ...) + QDEL_NULL(callback) + . = ..() + +/datum/tgui_input_number/async/tgui_close(mob/user) + . = ..() + qdel(src) + +/datum/tgui_input_number/async/set_entry(entry) + . = ..() + if(!isnull(src.entry)) + callback?.InvokeAsync(src.entry) + +/datum/tgui_input_number/async/wait() + return \ No newline at end of file diff --git a/code/modules/tgui_input/text.dm b/code/modules/tgui_input/text.dm new file mode 100644 index 0000000000..f115fdde63 --- /dev/null +++ b/code/modules/tgui_input/text.dm @@ -0,0 +1,214 @@ +/** + * Creates a TGUI window with a text input. Returns the user's response. + * + * This proc should be used to create windows for text entry that the caller will wait for a response from. + * If tgui fancy chat is turned off: Will return a normal input. If max_length is specified, will return + * stripped_multiline_input. + * + * Arguments: + * * user - The user to show the text input to. + * * message - The content of the text input, shown in the body of the TGUI window. + * * title - The title of the text input modal, shown on the top of the TGUI window. + * * default - The default (or current) value, shown as a placeholder. + * * max_length - Specifies a max length for input. MAX_MESSAGE_LEN is default (4096) + * * multiline - Bool that determines if the input box is much larger. Good for large messages, laws, etc. + * * encode - Toggling this determines if input is filtered via html_encode. Setting this to FALSE gives raw input. + * * timeout - The timeout of the textbox, after which the modal will close and qdel itself. Set to zero for no timeout. + */ +/proc/tgui_input_text(mob/user, message = "", title = "Text Input", default, max_length = INFINITY, multiline = FALSE, encode = FALSE, timeout = 0, prevent_enter = FALSE) + if (istext(user)) + stack_trace("tgui_input_text() received text for user instead of mob") + return + if (!user) + user = usr + if (!istype(user)) + if (istype(user, /client)) + var/client/client = user + user = client.mob + else + return + // Client does NOT have tgui_input on: Returns regular input + if(!user.client.prefs.tgui_input_mode) + if(encode) + if(multiline) + return stripped_multiline_input(user, message, title, default, max_length) + else + return stripped_input(user, message, title, default, max_length) + else + if(multiline) + return input(user, message, title, default) as message|null + else + return input(user, message, title, default) as text|null + var/datum/tgui_input_text/text_input = new(user, message, title, default, max_length, multiline, encode, timeout, prevent_enter) + text_input.tgui_interact(user) + text_input.wait() + if (text_input) + . = text_input.entry + qdel(text_input) + +/** + * tgui_input_text + * + * Datum used for instantiating and using a TGUI-controlled text input that prompts the user with + * a message and has an input for text entry. + */ +/datum/tgui_input_text + /// Boolean field describing if the tgui_input_text was closed by the user. + var/closed + /// The default (or current) value, shown as a default. + var/default + /// Whether the input should be stripped using html_encode + var/encode + /// The entry that the user has return_typed in. + var/entry + /// The maximum length for text entry + var/max_length + /// The prompt's body, if any, of the TGUI window. + var/message + /// Multiline input for larger input boxes. + var/multiline + /// The time at which the text input was created, for displaying timeout progress. + var/start_time + /// The lifespan of the text input, after which the window will close and delete itself. + var/timeout + /// The title of the TGUI window + var/title + + var/prevent_enter + +/datum/tgui_input_text/New(mob/user, message, title, default, max_length, multiline, encode, timeout, prevent_enter) + src.default = default + src.encode = encode + src.max_length = max_length + src.message = message + src.multiline = multiline + src.title = title + if (timeout) + src.timeout = timeout + start_time = world.time + QDEL_IN(src, timeout) + src.prevent_enter = prevent_enter + +/datum/tgui_input_text/Destroy(force, ...) + SStgui.close_uis(src) + . = ..() + +/** + * Waits for a user's response to the tgui_text_input's prompt before returning. Returns early if + * the window was closed by the user. + */ +/datum/tgui_input_text/proc/wait() + while (!entry && !closed) + stoplag(1) + +/datum/tgui_input_text/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "TextInputModal") + ui.open() + +/datum/tgui_input_text/tgui_close(mob/user) + . = ..() + closed = TRUE + +/datum/tgui_input_text/tgui_state(mob/user) + return GLOB.tgui_always_state + +/datum/tgui_input_text/tgui_static_data(mob/user) + var/list/data = list() + data["large_buttons"] = user.client.prefs.tgui_large_buttons + data["max_length"] = max_length + data["message"] = message + data["multiline"] = multiline + data["placeholder"] = default // Default is a reserved keyword + data["swapped_buttons"] = !user.client.prefs.tgui_swapped_buttons + data["title"] = title + data["prevent_enter"] = prevent_enter + return data + +/datum/tgui_input_text/tgui_data(mob/user) + var/list/data = list() + if(timeout) + data["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1) + return data + +/datum/tgui_input_text/tgui_act(action, list/params) + . = ..() + if (.) + return + switch(action) + if("submit") + if(length(params["entry"]) > max_length) + return + if(encode && (length(html_encode(params["entry"])) > max_length)) + to_chat(usr, span_notice("Your message was clipped due to special character usage.")) + set_entry(params["entry"]) + closed = TRUE + SStgui.close_uis(src) + return TRUE + if("cancel") + SStgui.close_uis(src) + closed = TRUE + return TRUE + +/datum/tgui_input_text/proc/set_entry(entry) + if(!isnull(entry)) + var/converted_entry = encode ? html_encode(entry) : entry + //converted_entry = readd_quotes(converted_entry) + src.entry = trim(converted_entry, max_length) + +/** + * Creates an asynchronous TGUI input text window with an associated callback. + * + * This proc should be used to create inputs that invoke a callback with the user's chosen option. + * Arguments: + * * user - The user to show the input box to. + * * message - The content of the input box, shown in the body of the TGUI window. + * * title - The title of the input box, shown on the top of the TGUI window. + * * default - The default value pre-populated in the input box. + * * callback - The callback to be invoked when a choice is made. + * * timeout - The timeout of the input box, after which the menu will close and qdel itself. Set to zero for no timeout. + */ +/proc/tgui_input_text_async(mob/user, message, title, default, datum/callback/callback, max_length, multiline, encode, timeout = 60 SECONDS) + if (istext(user)) + stack_trace("tgui_input_text_async() received text for user instead of mob") + return + if (!user) + user = usr + if (!istype(user)) + if (istype(user, /client)) + var/client/client = user + user = client.mob + else + return + var/datum/tgui_input_text/async/input = new(user, message, title, default, callback, max_length, multiline, encode, timeout) + input.tgui_interact(user) + +/** + * # async tgui_text_input + * + * An asynchronous version of tgui_text_input to be used with callbacks instead of waiting on user responses. + */ +/datum/tgui_input_text/async + /// The callback to be invoked by the tgui_text_input upon having a choice made. + var/datum/callback/callback + +/datum/tgui_input_text/async/New(mob/user, message, title, default, callback, max_length, multiline, encode, timeout) + ..(user, title, message, default, max_length, multiline, encode, timeout) + src.callback = callback + +/datum/tgui_input_text/async/Destroy(force, ...) + QDEL_NULL(callback) + . = ..() + +/datum/tgui_input_text/async/tgui_close(mob/user) + . = ..() + qdel(src) + +/datum/tgui_input_text/async/set_entry(entry) + . = ..() + if(!isnull(src.entry)) + callback?.InvokeAsync(src.entry) + +/datum/tgui_input_text/async/wait() + return diff --git a/code/modules/vchat/vchat_client.dm b/code/modules/vchat/vchat_client.dm index a918c94cde..7520b41abb 100644 --- a/code/modules/vchat/vchat_client.dm +++ b/code/modules/vchat/vchat_client.dm @@ -161,6 +161,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic update_vis() spawn() + if(owner.is_preference_enabled(/datum/client_preference/vchat_enable)) tgui_alert_async(owner,"VChat didn't load after some time. Switching to use oldchat as a fallback. Try using 'Reload VChat' verb in OOC verbs, or reconnecting to try again.") //Provide the JS with who we are diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm index d436198017..effd283c13 100644 --- a/code/modules/ventcrawl/ventcrawl.dm +++ b/code/modules/ventcrawl/ventcrawl.dm @@ -38,6 +38,15 @@ var/list/ventcrawl_machinery = list( if(buckled) to_chat(src, "You cannot ventcrawl while buckled!") return FALSE + if(restrict_vore_ventcrawl) + var/foundstuff = FALSE + for(var/obj/belly/B in vore_organs) + if(B.contents.len) + foundstuff = TRUE + break + if(foundstuff) + to_chat(src, "You cannot ventcrawl while full!") + return FALSE return ventcrawl_carry() /mob/living/Login() diff --git a/code/modules/virus2/admin.dm b/code/modules/virus2/admin.dm index dd9ae7ead7..5ca289bd2a 100644 --- a/code/modules/virus2/admin.dm +++ b/code/modules/virus2/admin.dm @@ -129,12 +129,12 @@ s_multiplier[stage] = max(1, round(initial(E.maxm)/2)) else if(href_list["chance"]) var/datum/disease2/effect/Eff = s[stage] - var/I = input(usr, "Chance, per tick, of this effect happening (min 0, max [initial(Eff.chance_maxm)])", "Effect Chance", s_chance[stage]) as null|num + var/I = tgui_input_number(usr, "Chance, per tick, of this effect happening (min 0, max [initial(Eff.chance_maxm)])", "Effect Chance", s_chance[stage], initial(Eff.chance_maxm), 0) if(I == null || I < 0 || I > initial(Eff.chance_maxm)) return s_chance[stage] = I else if(href_list["multiplier"]) var/datum/disease2/effect/Eff = s[stage] - var/I = input(usr, "Multiplier for this effect (min 1, max [initial(Eff.maxm)])", "Effect Multiplier", s_multiplier[stage]) as null|num + var/I = tgui_input_number(usr, "Multiplier for this effect (min 1, max [initial(Eff.maxm)])", "Effect Multiplier", s_multiplier[stage], initial(Eff.maxm), 1) if(I == null || I < 1 || I > initial(Eff.maxm)) return s_multiplier[stage] = I if("species") @@ -150,7 +150,7 @@ if(!infectee.species || !(infectee.species.get_bodytype() in species)) infectee = null if("ichance") - var/I = input(usr, "Input infection chance", "Infection Chance", infectionchance) as null|num + var/I = tgui_input_number(usr, "Input infection chance", "Infection Chance", infectionchance) if(!I) return infectionchance = I if("stype") @@ -158,7 +158,7 @@ if(!S) return spreadtype = S if("speed") - var/S = input(usr, "Input speed", "Speed", speed) as null|num + var/S = tgui_input_number(usr, "Input speed", "Speed", speed) if(!S) return speed = S if("antigen") @@ -172,7 +172,7 @@ else if(href_list["reset"]) antigens = list() if("resistance") - var/S = input(usr, "Input % resistance to antibiotics", "Resistance", resistance) as null|num + var/S = tgui_input_number(usr, "Input % resistance to antibiotics", "Resistance", resistance) if(!S) return resistance = S if("infectee") diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 4054caa54e..6ffdd0cca5 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -342,7 +342,7 @@ owner.update_icons() //Print notifications/sound if necessary - if(!silent) + if(!silent && count) owner.visible_message("[owner] expels everything from their [lowertext(name)]!") var/soundfile if(!fancy_vore) @@ -378,6 +378,9 @@ slip.slip_protect = world.time + 25 // This is to prevent slipping back into your pred if they stand on soap or something. //Place them into our drop_location M.forceMove(drop_location()) + if(ismob(M)) + var/mob/ourmob = M + ourmob.reset_view(null) items_preserved -= M //Special treatment for absorbed prey @@ -416,6 +419,10 @@ soundfile = fancy_release_sounds[release_sound] if(soundfile) playsound(src, soundfile, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF, preference = /datum/client_preference/eating_noises, volume_channel = VOLUME_CHANNEL_VORE) + //Should fix your view not following you out of mobs sometimes! + if(ismob(M)) + var/mob/ourmob = M + ourmob.reset_view(null) return 1 @@ -429,6 +436,9 @@ prey.buckled.unbuckle_mob() prey.forceMove(src) + if(ismob(prey)) + var/mob/ourmob = prey + ourmob.reset_view(owner) owner.updateVRPanel() if(isanimal(owner)) owner.update_icon() @@ -571,6 +581,9 @@ else if((type == "im_digest" || type == "im_hold" || type == "im_holdabsorbed" || type == "im_absorb" || type == "im_heal" || type == "im_drain" || type == "im_steal" || type == "im_egg" || type == "im_shrink" || type == "im_grow" || type == "im_unabsorb") && (length(raw_list[i]) > 510 || length(raw_list[i]) < 10)) raw_list.Cut(i,i) log_debug("[owner] tried to set [lowertext(name)] idle message with >501 or <10 char message") + else if((type == "em" || type == "ema") && (length(raw_list[i]) > 260 || length(raw_list[i]) < 10)) + raw_list.Cut(i,i) + log_debug("[owner] tried to set [lowertext(name)] examine message with >260 or <10 char message") else raw_list[i] = readd_quotes(raw_list[i]) //Also fix % sign for var replacement @@ -723,6 +736,10 @@ if(M.loc != src) M.forceMove(src) + if(ismob(M)) + var/mob/ourmob = M + ourmob.reset_view(owner) + //Seek out absorbed prey of the prey, absorb them too. //This in particular will recurse oddly because if there is absorbed prey of prey of prey... //it will just move them up one belly. This should never happen though since... when they were @@ -1033,6 +1050,9 @@ if(!(content in src) || !istype(target)) return content.forceMove(target) + if(ismob(content)) + var/mob/ourmob = content + ourmob.reset_view(owner) if(isitem(content)) var/obj/item/I = content if(istype(I,/obj/item/weapon/card/id)) diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 5a92072756..3435541f19 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -124,7 +124,8 @@ formatted_message = replacetext(formatted_message, "%pred", owner) formatted_message = replacetext(formatted_message, "%prey", M) formatted_message = replacetext(formatted_message, "%countprey", absorbed_count) - to_chat(M, "[formatted_message]") + if(formatted_message) + to_chat(M, "[formatted_message]") else if(digest_mode == DM_DIGEST && !M.digestable) EL = emote_lists[DM_HOLD] // Use Hold's emote list if we're indigestible @@ -136,7 +137,8 @@ formatted_message = replacetext(formatted_message, "%prey", M) formatted_message = replacetext(formatted_message, "%countprey", living_count) formatted_message = replacetext(formatted_message, "%count", contents.len) - to_chat(M, "[formatted_message]") + if(formatted_message) + to_chat(M, "[formatted_message]") if(to_update) updateVRPanels() diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index ca2fcf3fa4..d1435cbfbf 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -26,6 +26,7 @@ var/vore_taste = null // What the character tastes like var/vore_smell = null // What the character smells like var/no_vore = FALSE // If the character/mob can vore. + var/restrict_vore_ventcrawl = FALSE // Self explanatory var/noisy = FALSE // Toggle audible hunger. var/absorbing_prey = 0 // Determines if the person is using the succubus drain or not. See station_special_abilities_vr. var/drain_finalized = 0 // Determines if the succubus drain will be KO'd/absorbed. Can be toggled on at any time. @@ -50,6 +51,31 @@ 'sound/effects/mob_effects/xenochimera/regen_5.ogg' ) + var/nutrition_message_visible = TRUE + var/list/nutrition_messages = list( + "They are starving! You can hear their stomach snarling from across the room!" = 1, + "They are extremely hungry. A deep growl occasionally rumbles from their empty stomach." = 2, + "", + "They have a stuffed belly, bloated fat and round from eating too much.", + "They have a rotund, thick gut. It bulges from their body obscenely, close to sagging under its own weight.", + "They are sporting a large, round, sagging stomach. It contains at least their body weight worth of glorping slush.", + "They are engorged with a huge stomach that sags and wobbles as they move. They must have consumed at least twice their body weight. It looks incredibly soft.", + "Their stomach is firmly packed with digesting slop. They must have eaten at least a few times worth their body weight! It looks hard for them to stand, and their gut jiggles when they move.", + "They are so absolutely stuffed that you aren't sure how it's possible for them to move. They can't seem to swell any bigger. The surface of their belly looks sorely strained!", + "They are utterly filled to the point where it's hard to even imagine them moving, much less comprehend it when they do. Their gut is swollen to monumental sizes and amount of food they consumed must be insane.") + var/weight_message_visible = TRUE + var/list/weight_messages = list( + "They are terribly lithe and frail!", + "They have a very slender frame.", + "They have a lightweight, athletic build.", + "They have a healthy, average body.", + "They have a thick, curvy physique.", + "They have a plush, chubby figure.", + "They have an especially plump body with a round potbelly and large hips.", + "They have a very fat frame with a bulging potbelly, squishy rolls of pudge, very wide hips, and plump set of jiggling thighs.", + "They are incredibly obese. Their massive potbelly sags over their waistline while their fat ass would probably require two chairs to sit down comfortably!", + "They are so morbidly obese, you wonder how they can even stand, let alone waddle around the station. They can't get any fatter without being immobilized.") + // // Hook for generic creation of stuff on new creatures // @@ -246,6 +272,11 @@ P.slip_vore = src.slip_vore P.stumble_vore = src.stumble_vore + P.nutrition_message_visible = src.nutrition_message_visible + P.nutrition_messages = src.nutrition_messages + P.weight_message_visible = src.weight_message_visible + P.weight_messages = src.weight_messages + var/list/serialized = list() for(var/obj/belly/B as anything in src.vore_organs) serialized += list(B.serialize()) //Can't add a list as an object to another list in Byond. Thanks. @@ -286,6 +317,11 @@ slip_vore = P.slip_vore stumble_vore = P.stumble_vore + nutrition_message_visible = P.nutrition_message_visible + nutrition_messages = P.nutrition_messages + weight_message_visible = P.weight_message_visible + weight_messages = P.weight_messages + if(bellies) release_vore_contents(silent = TRUE) vore_organs.Cut() @@ -470,6 +506,9 @@ crystal.bound_mob = null crystal.bound_mob = capture_crystal = 0 log_and_message_admins("[key_name(src)] used the OOC escape button to get out of [crystal] owned by [crystal.owner]. [ADMIN_FLW(src)]") + else if(tf_mob_holder) + log_and_message_admins("[key_name(src)] used the OOC escape button to revert back to their original form from being TFed into another mob. [ADMIN_FLW(src)]") + revert_mob_tf() //Don't appear to be in a vore situation else to_chat(src,"You aren't inside anyone, though, is the thing.") @@ -662,6 +701,9 @@ if(new_color) glow_color = new_color +/obj/item + var/trash_eatable = TRUE + /mob/living/proc/eat_trash() set name = "Eat Trash" set category = "Abilities" @@ -680,6 +722,10 @@ to_chat(src, "You are not allowed to eat this.") return + if(!I.trash_eatable) + to_chat(src, "You can't eat that so casually!") + return + if(istype(I, /obj/item/device/paicard)) var/obj/item/device/paicard/palcard = I var/mob/living/silicon/pai/pocketpal = palcard.pai @@ -767,9 +813,16 @@ else if(istype(I,/obj/item/weapon/bikehorn/tinytether)) to_chat(src, "You feel a rush of power swallowing such a large, err, tiny structure.") visible_message("[src] demonstrates their voracious capabilities by swallowing [I] whole!") - else if(istype(I,/obj/item/device/paicard) || istype(I,/obj/item/device/mmi/digital/posibrain) || istype(I,/obj/item/device/aicard)) + else if(istype(I,/obj/item/device/mmi/digital/posibrain) || istype(I,/obj/item/device/aicard)) visible_message("[src] demonstrates their voracious capabilities by swallowing [I] whole!") to_chat(src, "You can taste the sweet flavor of digital friendship. Or maybe it is something else.") + else if(istype(I,/obj/item/device/paicard)) + visible_message("[src] demonstrates their voracious capabilities by swallowing [I] whole!") + to_chat(src, "You can taste the sweet flavor of digital friendship.") + var/obj/item/device/paicard/ourcard = I + if(ourcard.pai && ourcard.pai.client && isbelly(ourcard.loc)) + var/obj/belly/B = ourcard.loc + to_chat(ourcard.pai, "[B.desc]") else if(istype(I,/obj/item/weapon/reagent_containers/food)) var/obj/item/weapon/reagent_containers/food/F = I if(!F.reagents.total_volume) @@ -1062,9 +1115,13 @@ if(!screen_icon) screen_icon = new() RegisterSignal(screen_icon, COMSIG_CLICK, .proc/vore_panel_click) - screen_icon.icon = HUD.ui_style - screen_icon.color = HUD.ui_color - screen_icon.alpha = HUD.ui_alpha + if(ispAI(user)) + screen_icon.icon = 'icons/mob/pai_hud.dmi' + screen_icon.screen_loc = ui_acti + else + screen_icon.icon = HUD.ui_style + screen_icon.color = HUD.ui_color + screen_icon.alpha = HUD.ui_alpha LAZYADD(HUD.other_important, screen_icon) user.client?.screen += screen_icon diff --git a/code/modules/vore/eating/stumblevore_vr.dm b/code/modules/vore/eating/stumblevore_vr.dm index 0928dcccff..7c17c604b3 100644 --- a/code/modules/vore/eating/stumblevore_vr.dm +++ b/code/modules/vore/eating/stumblevore_vr.dm @@ -37,7 +37,7 @@ else if(M.CanStumbleVore(src)) visible_message("[M] flops carlessly into [src]!") perform_the_nom(M,src,M,M.vore_selected,1) - else if(S.species.lightweight == 1) + else if(istype(S) && S.species.lightweight == 1) visible_message("[M] carelessly bowls [src] over!") M.forceMove(get_turf(src)) M.apply_damage(0.5, BRUTE) diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index a1668e0482..b4d4ef8c7b 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -70,6 +70,32 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE var/vore_taste = "nothing in particular" var/vore_smell = "nothing in particular" + + var/nutrition_message_visible = TRUE + var/list/nutrition_messages = list( + "They are starving! You can hear their stomach snarling from across the room!" = 1, + "They are extremely hungry. A deep growl occasionally rumbles from their empty stomach." = 2, + "", + "They have a stuffed belly, bloated fat and round from eating too much.", + "They have a rotund, thick gut. It bulges from their body obscenely, close to sagging under its own weight.", + "They are sporting a large, round, sagging stomach. It contains at least their body weight worth of glorping slush.", + "They are engorged with a huge stomach that sags and wobbles as they move. They must have consumed at least twice their body weight. It looks incredibly soft.", + "Their stomach is firmly packed with digesting slop. They must have eaten at least a few times worth their body weight! It looks hard for them to stand, and their gut jiggles when they move.", + "They are so absolutely stuffed that you aren't sure how it's possible for them to move. They can't seem to swell any bigger. The surface of their belly looks sorely strained!", + "They are utterly filled to the point where it's hard to even imagine them moving, much less comprehend it when they do. Their gut is swollen to monumental sizes and amount of food they consumed must be insane.") + var/weight_message_visible = TRUE + var/list/weight_messages = list( + "They are terribly lithe and frail!", + "They have a very slender frame.", + "They have a lightweight, athletic build.", + "They have a healthy, average body.", + "They have a thick, curvy physique.", + "They have a plush, chubby figure.", + "They have an especially plump body with a round potbelly and large hips.", + "They have a very fat frame with a bulging potbelly, squishy rolls of pudge, very wide hips, and plump set of jiggling thighs.", + "They are incredibly obese. Their massive potbelly sags over their waistline while their fat ass would probably require two chairs to sit down comfortably!", + "They are so morbidly obese, you wonder how they can even stand, let alone waddle around the station. They can't get any fatter without being immobilized.") + //Mechanically required var/path var/slot @@ -153,6 +179,10 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE drop_vore = json_from_file["drop_vore"] slip_vore = json_from_file["slip_vore"] stumble_vore = json_from_file["stumble_vore"] + nutrition_message_visible = json_from_file["nutrition_message_visible"] + nutrition_messages = json_from_file["nutrition_messages"] + weight_message_visible = json_from_file["weight_message_visible"] + weight_messages = json_from_file["weight_messages"] //Quick sanitize if(isnull(digestable)) @@ -195,6 +225,34 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE slip_vore = TRUE if(isnull(stumble_vore)) stumble_vore = TRUE + if(isnull(nutrition_message_visible)) + nutrition_message_visible = TRUE + if(isnull(weight_message_visible)) + weight_message_visible = TRUE + if(isnull(nutrition_messages)) + nutrition_messages = list( + "They are starving! You can hear their stomach snarling from across the room!" = 1, + "They are extremely hungry. A deep growl occasionally rumbles from their empty stomach." = 2, + "", + "They have a stuffed belly, bloated fat and round from eating too much.", + "They have a rotund, thick gut. It bulges from their body obscenely, close to sagging under its own weight.", + "They are sporting a large, round, sagging stomach. It contains at least their body weight worth of glorping slush.", + "They are engorged with a huge stomach that sags and wobbles as they move. They must have consumed at least twice their body weight. It looks incredibly soft.", + "Their stomach is firmly packed with digesting slop. They must have eaten at least a few times worth their body weight! It looks hard for them to stand, and their gut jiggles when they move.", + "They are so absolutely stuffed that you aren't sure how it's possible for them to move. They can't seem to swell any bigger. The surface of their belly looks sorely strained!", + "They are utterly filled to the point where it's hard to even imagine them moving, much less comprehend it when they do. Their gut is swollen to monumental sizes and amount of food they consumed must be insane.") + if(isnull(weight_messages)) + weight_messages = list( + "They are terribly lithe and frail!", + "They have a very slender frame.", + "They have a lightweight, athletic build.", + "They have a healthy, average body.", + "They have a thick, curvy physique.", + "They have a plush, chubby figure.", + "They have an especially plump body with a round potbelly and large hips.", + "They have a very fat frame with a bulging potbelly, squishy rolls of pudge, very wide hips, and plump set of jiggling thighs.", + "They are incredibly obese. Their massive potbelly sags over their waistline while their fat ass would probably require two chairs to sit down comfortably!", + "They are so morbidly obese, you wonder how they can even stand, let alone waddle around the station. They can't get any fatter without being immobilized.") return TRUE @@ -227,6 +285,10 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE "drop_vore" = drop_vore, "slip_vore" = slip_vore, "stumble_vore" = stumble_vore, + "nutrition_message_visible" = nutrition_message_visible, + "nutrition_messages" = nutrition_messages, + "weight_message_visible" = weight_message_visible, + "weight_messages" = weight_messages, ) //List to JSON diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 471d2fca03..19ca08a71c 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -181,6 +181,8 @@ "shrink_grow_size" = selected.shrink_grow_size, "emote_time" = selected.emote_time, "emote_active" = selected.emote_active, + "nutrition_ex" = host.nutrition_message_visible, + "weight_ex" = host.weight_message_visible, "belly_fullscreen" = selected.belly_fullscreen, ) @@ -253,6 +255,10 @@ "drop_vore" = host.drop_vore, "slip_vore" = host.slip_vore, "stumble_vore" = host.stumble_vore, + "nutrition_message_visible" = host.nutrition_message_visible, + "nutrition_messages" = host.nutrition_messages, + "weight_message_visible" = host.weight_message_visible, + "weight_messages" = host.weight_messages ) return data @@ -285,7 +291,7 @@ if(host.vore_organs.len >= BELLIES_MAX) return FALSE - var/new_name = html_encode(input(usr,"New belly's name:","New Belly") as text|null) + var/new_name = html_encode(tgui_input_text(usr,"New belly's name:","New Belly")) var/failure_msg if(length(new_name) > BELLIES_NAME_MAX || length(new_name) < BELLIES_NAME_MIN) @@ -348,7 +354,7 @@ unsaved_changes = FALSE return TRUE if("setflavor") - var/new_flavor = html_encode(input(usr,"What your character tastes like (400ch limit). This text will be printed to the pred after 'X tastes of...' so just put something like 'strawberries and cream':","Character Flavor",host.vore_taste) as text|null) + var/new_flavor = html_encode(tgui_input_text(usr,"What your character tastes like (400ch limit). This text will be printed to the pred after 'X tastes of...' so just put something like 'strawberries and cream':","Character Flavor",host.vore_taste)) if(!new_flavor) return FALSE @@ -360,7 +366,7 @@ unsaved_changes = TRUE return TRUE if("setsmell") - var/new_smell = html_encode(input(usr,"What your character smells like (400ch limit). This text will be printed to the pred after 'X smells of...' so just put something like 'strawberries and cream':","Character Smell",host.vore_smell) as text|null) + var/new_smell = html_encode(tgui_input_text(usr,"What your character smells like (400ch limit). This text will be printed to the pred after 'X smells of...' so just put something like 'strawberries and cream':","Character Smell",host.vore_smell)) if(!new_smell) return FALSE @@ -481,6 +487,14 @@ host.stumble_vore = !host.stumble_vore unsaved_changes = TRUE return TRUE + if("toggle_nutrition_ex") + host.nutrition_message_visible = !host.nutrition_message_visible + unsaved_changes = TRUE + return TRUE + if("toggle_weight_ex") + host.weight_message_visible = !host.weight_message_visible + unsaved_changes = TRUE + return TRUE /datum/vore_look/proc/pick_from_inside(mob/user, params) var/atom/movable/target = locate(params["pick"]) @@ -600,7 +614,7 @@ var/list/available_options = list("Examine", "Eject", "Move") if(ishuman(target)) available_options += "Transform" - intent = tgui_alert(user, "What would you like to do with [target]?", "Vore Pick", available_options) + intent = tgui_alert(user, "What would you like to do with [target]?", "Vore Pick", available_options, strict_byond = TRUE) switch(intent) if("Examine") var/list/results = target.examine(host) @@ -651,7 +665,7 @@ var/attr = params["attribute"] switch(attr) if("b_name") - var/new_name = html_encode(input(usr,"Belly's new name:","New Name") as text|null) + var/new_name = html_encode(tgui_input_text(usr,"Belly's new name:","New Name")) var/failure_msg if(length(new_name) > BELLIES_NAME_MAX || length(new_name) < BELLIES_NAME_MIN) @@ -728,7 +742,7 @@ host.vore_selected.egg_type = new_egg_type . = TRUE if("b_desc") - var/new_desc = html_encode(input(usr,"Belly Description, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.desc) as message|null) + var/new_desc = html_encode(tgui_input_text(usr,"Belly Description, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.desc, multiline = TRUE, prevent_enter = TRUE)) if(new_desc) new_desc = readd_quotes(new_desc) @@ -738,7 +752,7 @@ host.vore_selected.desc = new_desc . = TRUE if("b_absorbed_desc") - var/new_desc = html_encode(input(usr,"Belly Description for absorbed prey, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.absorbed_desc) as message|null) + var/new_desc = html_encode(tgui_input_text(usr,"Belly Description for absorbed prey, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.absorbed_desc, multiline = TRUE, prevent_enter = TRUE)) if(new_desc) new_desc = readd_quotes(new_desc) @@ -748,121 +762,147 @@ host.vore_selected.absorbed_desc = new_desc . = TRUE if("b_msgs") - tgui_alert(user,"Setting abusive or deceptive messages will result in a ban. Consider this your warning. Max 150 characters per message (500 for idle messages), max 10 messages per topic.","Really, don't.") // Should remain tgui_alert() (blocking) + tgui_alert(user,"Setting abusive or deceptive messages will result in a ban. Consider this your warning. Max 150 characters per message (250 for examines, 500 for idle messages), max 10 messages per topic.","Really, don't.") // Should remain tgui_alert() (blocking) var/help = " Press enter twice to separate messages. '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. '%count' will be replaced with the number of anything in your belly. '%countprey' will be replaced with the number of living prey in your belly." switch(params["msgtype"]) if("dmp") - var/new_message = input(user,"These are sent to prey when they expire. Write them in 2nd person ('you feel X'). Avoid using %prey in this type."+help,"Digest Message (to prey)",host.vore_selected.get_messages("dmp")) as message + var/new_message = tgui_input_text(user,"These are sent to prey when they expire. Write them in 2nd person ('you feel X'). Avoid using %prey in this type."+help,"Digest Message (to prey)",host.vore_selected.get_messages("dmp"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"dmp") if("dmo") - var/new_message = input(user,"These are sent to you when prey expires in you. Write them in 2nd person ('you feel X'). Avoid using %pred in this type."+help,"Digest Message (to you)",host.vore_selected.get_messages("dmo")) as message + var/new_message = tgui_input_text(user,"These are sent to you when prey expires in you. Write them in 2nd person ('you feel X'). Avoid using %pred in this type."+help,"Digest Message (to you)",host.vore_selected.get_messages("dmo"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"dmo") if("amp") - var/new_message = input(user,"These are sent to prey when their absorption finishes. Write them in 2nd person ('you feel X'). Avoid using %prey in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Digest Message (to prey)",host.vore_selected.get_messages("amp")) as message + var/new_message = tgui_input_text(user,"These are sent to prey when their absorption finishes. Write them in 2nd person ('you feel X'). Avoid using %prey in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Digest Message (to prey)",host.vore_selected.get_messages("amp"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"amp") if("amo") - var/new_message = input(user,"These are sent to you when prey's absorption finishes. Write them in 2nd person ('you feel X'). Avoid using %pred in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Digest Message (to you)",host.vore_selected.get_messages("amo")) as message + var/new_message = tgui_input_text(user,"These are sent to you when prey's absorption finishes. Write them in 2nd person ('you feel X'). Avoid using %pred in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Digest Message (to you)",host.vore_selected.get_messages("amo"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"amo") if("uamp") - var/new_message = input(user,"These are sent to prey when their unnabsorption finishes. Write them in 2nd person ('you feel X'). Avoid using %prey in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Digest Message (to prey)",host.vore_selected.get_messages("uamp")) as message + var/new_message = tgui_input_text(user,"These are sent to prey when their unnabsorption finishes. Write them in 2nd person ('you feel X'). Avoid using %prey in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Digest Message (to prey)",host.vore_selected.get_messages("uamp"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"uamp") if("uamo") - var/new_message = input(user,"These are sent to you when prey's unabsorption finishes. Write them in 2nd person ('you feel X'). Avoid using %pred in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Digest Message (to you)",host.vore_selected.get_messages("uamo")) as message + var/new_message = tgui_input_text(user,"These are sent to you when prey's unabsorption finishes. Write them in 2nd person ('you feel X'). Avoid using %pred in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Digest Message (to you)",host.vore_selected.get_messages("uamo"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"uamo") if("smo") - var/new_message = input(user,"These are sent to those nearby when prey struggles. Write them in 3rd person ('X's Y bulges')."+help,"Struggle Message (outside)",host.vore_selected.get_messages("smo")) as message + var/new_message = tgui_input_text(user,"These are sent to those nearby when prey struggles. Write them in 3rd person ('X's Y bulges')."+help,"Struggle Message (outside)",host.vore_selected.get_messages("smo"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"smo") if("smi") - var/new_message = input(user,"These are sent to prey when they struggle. Write them in 2nd person ('you feel X'). Avoid using %prey in this type."+help,"Struggle Message (inside)",host.vore_selected.get_messages("smi")) as message + var/new_message = tgui_input_text(user,"These are sent to prey when they struggle. Write them in 2nd person ('you feel X'). Avoid using %prey in this type."+help,"Struggle Message (inside)",host.vore_selected.get_messages("smi"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"smi") if("asmo") - var/new_message = input(user,"These are sent to those nearby when absorbed prey struggles. Write them in 3rd person ('X's Y bulges'). %count will not work for this type, and %countprey will only count absorbed victims."+help,"Struggle Message (outside)",host.vore_selected.get_messages("asmo")) as message + var/new_message = tgui_input_text(user,"These are sent to those nearby when absorbed prey struggles. Write them in 3rd person ('X's Y bulges'). %count will not work for this type, and %countprey will only count absorbed victims."+help,"Struggle Message (outside)",host.vore_selected.get_messages("asmo"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"asmo") if("asmi") - var/new_message = input(user,"These are sent to absorbed prey when they struggle. Write them in 2nd person ('you feel X'). Avoid using %prey in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Struggle Message (inside)",host.vore_selected.get_messages("asmi")) as message + var/new_message = tgui_input_text(user,"These are sent to absorbed prey when they struggle. Write them in 2nd person ('you feel X'). Avoid using %prey in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Struggle Message (inside)",host.vore_selected.get_messages("asmi"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"asmi") if("em") - var/new_message = input(user,"These are sent to people who examine you when this belly has contents. Write them in 3rd person ('Their %belly is bulging')."+help,"Examine Message (when full)",host.vore_selected.get_messages("em")) as message + var/new_message = tgui_input_text(user,"These are sent to people who examine you when this belly has contents. Write them in 3rd person ('Their %belly is bulging')."+help,"Examine Message (when full)",host.vore_selected.get_messages("em"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"em") if("ema") - var/new_message = input(user,"These are sent to people who examine you when this belly has absorbed victims. Write them in 3rd person ('Their %belly is larger'). %count will not work for this type, and %countprey will only count absorbed victims."+help,"Examine Message (with absorbed victims)",host.vore_selected.get_messages("ema")) as message + var/new_message = tgui_input_text(user,"These are sent to people who examine you when this belly has absorbed victims. Write them in 3rd person ('Their %belly is larger'). %count will not work for this type, and %countprey will only count absorbed victims."+help,"Examine Message (with absorbed victims)",host.vore_selected.get_messages("ema"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"ema") + if("en") + var/list/indices = list(1,2,3,4,5,6,7,8,9,10) + var/index = tgui_input_list(user,"Select a message to edit:","Select Message", indices) + if(index && index <= 10) + var/alert = tgui_alert(user, "What do you wish to do with this message?","Selection",list("Edit","Clear","Cancel")) + switch(alert) + if("Clear") + host.nutrition_messages[index] = "" + if("Edit") + var/new_message = tgui_input_text(user, "Input a message", "Input", host.nutrition_messages[index], multiline = TRUE, prevent_enter = TRUE) + if(new_message) + host.nutrition_messages[index] = new_message + + if("ew") + var/list/indices = list(1,2,3,4,5,6,7,8,9,10) + var/index = tgui_input_list(user,"Select a message to edit:","Select Message", indices) + if(index && index <= 10) + var/alert = tgui_alert(user, "What do you wish to do with this message?","Selection",list("Edit","Clear","Cancel")) + switch(alert) + if("Clear") + host.weight_messages[index] = "" + if("Edit") + var/new_message = tgui_input_text(user, "Input a message", "Input", host.weight_messages[index], multiline = TRUE, prevent_enter = TRUE) + if(new_message) + host.weight_messages[index] = new_message + if("im_digest") - var/new_message = input(user,"These are sent to prey every minute when you are on Digest mode. Write them in 2nd person ('%pred's %belly squishes down on you.')."+help,"Idle Message (Digest)",host.vore_selected.get_messages("im_digest")) as message + var/new_message = tgui_input_text(user,"These are sent to prey every minute when you are on Digest mode. Write them in 2nd person ('%pred's %belly squishes down on you.')."+help,"Idle Message (Digest)",host.vore_selected.get_messages("im_digest"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"im_digest") if("im_hold") - var/new_message = input(user,"These are sent to prey every minute when you are on Hold mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Hold)",host.vore_selected.get_messages("im_hold")) as message + var/new_message = tgui_input_text(user,"These are sent to prey every minute when you are on Hold mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Hold)",host.vore_selected.get_messages("im_hold"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"im_hold") if("im_holdabsorbed") - var/new_message = input(user,"These are sent to prey every minute when you are absorbed. Write them in 2nd person ('%pred's %belly squishes down on you.') %count will not work for this type, and %countprey will only count absorbed victims."+help,"Idle Message (Hold Absorbed)",host.vore_selected.get_messages("im_holdabsorbed")) as message + var/new_message = tgui_input_text(user,"These are sent to prey every minute when you are absorbed. Write them in 2nd person ('%pred's %belly squishes down on you.') %count will not work for this type, and %countprey will only count absorbed victims."+help,"Idle Message (Hold Absorbed)",host.vore_selected.get_messages("im_holdabsorbed"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"im_holdabsorbed") if("im_absorb") - var/new_message = input(user,"These are sent to prey every minute when you are on Absorb mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Absorb)",host.vore_selected.get_messages("im_absorb")) as message + var/new_message = tgui_input_text(user,"These are sent to prey every minute when you are on Absorb mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Absorb)",host.vore_selected.get_messages("im_absorb"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"im_absorb") if("im_heal") - var/new_message = input(user,"These are sent to prey every minute when you are on Heal mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Heal)",host.vore_selected.get_messages("im_heal")) as message + var/new_message = tgui_input_text(user,"These are sent to prey every minute when you are on Heal mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Heal)",host.vore_selected.get_messages("im_heal"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"im_heal") if("im_drain") - var/new_message = input(user,"These are sent to prey every minute when you are on Drain mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Drain)",host.vore_selected.get_messages("im_drain")) as message + var/new_message = tgui_input_text(user,"These are sent to prey every minute when you are on Drain mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Drain)",host.vore_selected.get_messages("im_drain"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"im_drain") if("im_steal") - var/new_message = input(user,"These are sent to prey every minute when you are on Size Steal mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Size Steal)",host.vore_selected.get_messages("im_steal")) as message + var/new_message = tgui_input_text(user,"These are sent to prey every minute when you are on Size Steal mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Size Steal)",host.vore_selected.get_messages("im_steal"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"im_steal") if("im_egg") - var/new_message = input(user,"These are sent to prey every minute when you are on Encase In Egg mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Encase In Egg)",host.vore_selected.get_messages("im_egg")) as message + var/new_message = tgui_input_text(user,"These are sent to prey every minute when you are on Encase In Egg mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Encase In Egg)",host.vore_selected.get_messages("im_egg"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"im_egg") if("im_shrink") - var/new_message = input(user,"These are sent to prey every minute when you are on Shrink mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Shrink)",host.vore_selected.get_messages("im_shrink")) as message + var/new_message = tgui_input_text(user,"These are sent to prey every minute when you are on Shrink mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Shrink)",host.vore_selected.get_messages("im_shrink"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"im_shrink") if("im_grow") - var/new_message = input(user,"These are sent to prey every minute when you are on Grow mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Grow)",host.vore_selected.get_messages("im_grow")) as message + var/new_message = tgui_input_text(user,"These are sent to prey every minute when you are on Grow mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Grow)",host.vore_selected.get_messages("im_grow"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"im_grow") if("im_unabsorb") - var/new_message = input(user,"These are sent to prey every minute when you are on Unabsorb mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Unabsorb)",host.vore_selected.get_messages("im_unabsorb")) as message + var/new_message = tgui_input_text(user,"These are sent to prey every minute when you are on Unabsorb mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Unabsorb)",host.vore_selected.get_messages("im_unabsorb"), multiline = TRUE, prevent_enter = TRUE) if(new_message) host.vore_selected.set_messages(new_message,"im_unabsorb") @@ -884,7 +924,7 @@ host.vore_selected.emote_lists = initial(host.vore_selected.emote_lists) . = TRUE if("b_verb") - var/new_verb = html_encode(input(usr,"New verb when eating (infinitive tense, e.g. nom or swallow):","New Verb") as text|null) + var/new_verb = html_encode(tgui_input_text(usr,"New verb when eating (infinitive tense, e.g. nom or swallow):","New Verb")) if(length(new_verb) > BELLIES_NAME_MAX || length(new_verb) < BELLIES_NAME_MIN) tgui_alert_async(usr, "Entered verb length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error") @@ -945,7 +985,7 @@ host.vore_selected.can_taste = !host.vore_selected.can_taste . = TRUE if("b_bulge_size") - var/new_bulge = input(user, "Choose the required size prey must be to show up on examine, ranging from 25% to 200% Set this to 0 for no text on examine.", "Set Belly Examine Size.") as num|null + var/new_bulge = tgui_input_number(user, "Choose the required size prey must be to show up on examine, ranging from 25% to 200% Set this to 0 for no text on examine.", "Set Belly Examine Size.", max_value = 200, min_value = 0) if(new_bulge == null) return FALSE if(new_bulge == 0) //Disable. @@ -961,7 +1001,7 @@ host.vore_selected.display_absorbed_examine = !host.vore_selected.display_absorbed_examine . = TRUE if("b_grow_shrink") - var/new_grow = input(user, "Choose the size that prey will be grown/shrunk to, ranging from 25% to 200%", "Set Growth Shrink Size.", host.vore_selected.shrink_grow_size) as num|null + var/new_grow = tgui_input_number(user, "Choose the size that prey will be grown/shrunk to, ranging from 25% to 200%", "Set Growth Shrink Size.", host.vore_selected.shrink_grow_size, 200, 25) if (new_grow == null) return FALSE if (!ISINRANGE(new_grow,25,200)) @@ -971,28 +1011,28 @@ host.vore_selected.shrink_grow_size = (new_grow*0.01) . = TRUE if("b_nutritionpercent") - var/new_nutrition = input(user, "Choose the nutrition gain percentage you will recieve per tick from prey. Ranges from 0.01 to 100.", "Set Nutrition Gain Percentage.", host.vore_selected.nutrition_percent) as num|null + var/new_nutrition = tgui_input_number(user, "Choose the nutrition gain percentage you will recieve per tick from prey. Ranges from 0.01 to 100.", "Set Nutrition Gain Percentage.", host.vore_selected.nutrition_percent, 100, 0.01) if(new_nutrition == null) return FALSE var/new_new_nutrition = CLAMP(new_nutrition, 0.01, 100) host.vore_selected.nutrition_percent = new_new_nutrition . = TRUE if("b_burn_dmg") - var/new_damage = input(user, "Choose the amount of burn damage prey will take per tick. Ranges from 0 to 6.", "Set Belly Burn Damage.", host.vore_selected.digest_burn) as num|null + var/new_damage = tgui_input_number(user, "Choose the amount of burn damage prey will take per tick. Ranges from 0 to 6.", "Set Belly Burn Damage.", host.vore_selected.digest_burn, 6, 0) if(new_damage == null) return FALSE var/new_new_damage = CLAMP(new_damage, 0, 6) host.vore_selected.digest_burn = new_new_damage . = TRUE if("b_brute_dmg") - var/new_damage = input(user, "Choose the amount of brute damage prey will take per tick. Ranges from 0 to 6", "Set Belly Brute Damage.", host.vore_selected.digest_brute) as num|null + var/new_damage = tgui_input_number(user, "Choose the amount of brute damage prey will take per tick. Ranges from 0 to 6", "Set Belly Brute Damage.", host.vore_selected.digest_brute, 6, 0) if(new_damage == null) return FALSE var/new_new_damage = CLAMP(new_damage, 0, 6) host.vore_selected.digest_brute = new_new_damage . = TRUE if("b_oxy_dmg") - var/new_damage = input(user, "Choose the amount of suffocation damage prey will take per tick. Ranges from 0 to 12.", "Set Belly Suffocation Damage.", host.vore_selected.digest_oxy) as num|null + var/new_damage = tgui_input_number(user, "Choose the amount of suffocation damage prey will take per tick. Ranges from 0 to 12.", "Set Belly Suffocation Damage.", host.vore_selected.digest_oxy, 12, 0) if(new_damage == null) return FALSE var/new_new_damage = CLAMP(new_damage, 0, 12) @@ -1002,7 +1042,7 @@ host.vore_selected.emote_active = !host.vore_selected.emote_active . = TRUE if("b_emotetime") - var/new_time = input(user, "Choose the period it takes for idle belly emotes to be shown to prey. Measured in seconds, Minimum 1 minute, Maximum 10 minutes.", "Set Belly Emote Delay.", host.vore_selected.digest_brute) + var/new_time = tgui_input_number(user, "Choose the period it takes for idle belly emotes to be shown to prey. Measured in seconds, Minimum 1 minute, Maximum 10 minutes.", "Set Belly Emote Delay.", host.vore_selected.digest_brute, 600, 60) if(new_time == null) return FALSE var/new_new_time = CLAMP(new_time, 60, 600) @@ -1020,17 +1060,17 @@ host.vore_selected.escapable = 0 . = TRUE if("b_escapechance") - var/escape_chance_input = input(user, "Set prey escape chance on resist (as %)", "Prey Escape Chance") as num|null + var/escape_chance_input = tgui_input_number(user, "Set prey escape chance on resist (as %)", "Prey Escape Chance", null, 100, 0) if(!isnull(escape_chance_input)) //These have to be 'null' because both cancel and 0 are valid, separate options host.vore_selected.escapechance = sanitize_integer(escape_chance_input, 0, 100, initial(host.vore_selected.escapechance)) . = TRUE if("b_escapetime") - var/escape_time_input = input(user, "Set number of seconds for prey to escape on resist (1-60)", "Prey Escape Time") as num|null + var/escape_time_input = tgui_input_number(user, "Set number of seconds for prey to escape on resist (1-60)", "Prey Escape Time", null, 60, 1) if(!isnull(escape_time_input)) host.vore_selected.escapetime = sanitize_integer(escape_time_input*10, 10, 600, initial(host.vore_selected.escapetime)) . = TRUE if("b_transferchance") - var/transfer_chance_input = input(user, "Set belly transfer chance on resist (as %). You must also set the location for this to have any effect.", "Prey Escape Time") as num|null + var/transfer_chance_input = tgui_input_number(user, "Set belly transfer chance on resist (as %). You must also set the location for this to have any effect.", "Prey Escape Time", null, 100, 0) if(!isnull(transfer_chance_input)) host.vore_selected.transferchance = sanitize_integer(transfer_chance_input, 0, 100, initial(host.vore_selected.transferchance)) . = TRUE @@ -1045,7 +1085,7 @@ host.vore_selected.transferlocation = choice.name . = TRUE if("b_transferchance_secondary") - var/transfer_secondary_chance_input = input(user, "Set secondary belly transfer chance on resist (as %). You must also set the location for this to have any effect.", "Prey Escape Time") as num|null + var/transfer_secondary_chance_input = tgui_input_number(user, "Set secondary belly transfer chance on resist (as %). You must also set the location for this to have any effect.", "Prey Escape Time", null, 100, 0) if(!isnull(transfer_secondary_chance_input)) host.vore_selected.transferchance_secondary = sanitize_integer(transfer_secondary_chance_input, 0, 100, initial(host.vore_selected.transferchance_secondary)) . = TRUE @@ -1060,12 +1100,12 @@ host.vore_selected.transferlocation_secondary = choice_secondary.name . = TRUE if("b_absorbchance") - var/absorb_chance_input = input(user, "Set belly absorb mode chance on resist (as %)", "Prey Absorb Chance") as num|null + var/absorb_chance_input = tgui_input_number(user, "Set belly absorb mode chance on resist (as %)", "Prey Absorb Chance", null, 100, 0) if(!isnull(absorb_chance_input)) host.vore_selected.absorbchance = sanitize_integer(absorb_chance_input, 0, 100, initial(host.vore_selected.absorbchance)) . = TRUE if("b_digestchance") - var/digest_chance_input = input(user, "Set belly digest mode chance on resist (as %)", "Prey Digest Chance") as num|null + var/digest_chance_input = tgui_input_number(user, "Set belly digest mode chance on resist (as %)", "Prey Digest Chance", null, 100, 0) if(!isnull(digest_chance_input)) host.vore_selected.digestchance = sanitize_integer(digest_chance_input, 0, 100, initial(host.vore_selected.digestchance)) . = TRUE diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index a5c32f85ef..cc16c796c9 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -345,17 +345,24 @@ icon = 'icons/vore/custom_items_vr.dmi' icon_override = 'icons/vore/custom_items_vr.dmi' -//zodiacshadow: ? +//zodiacshadow: Nehi Maximus /obj/item/device/radio/headset/fluff/zodiacshadow name = "Nehi's 'phones" desc = "A pair of old-fashioned purple headphones for listening to music that also double as an NT-approved headset; they connect nicely to any standard PDA. One side is engraved with the letters NEHI, the other having an elaborate inscription of the words \"My voice is my weapon of choice\" in a fancy font. A modern polymer allows switching between modes to either allow one to hear one's surroundings or to completely block them out." icon = 'icons/vore/custom_items_vr.dmi' - icon_state = "headphones" + icon_state = "nehiphones" - icon_override = 'icons/vore/custom_items_vr.dmi' - item_state = "headphones_mob" + icon_override = 'icons/vore/custom_onmob_vr.dmi' + item_state = "nehiphones" +//zodiacshadow: Nehi Maximus +/obj/item/clothing/accessory/medal/silver/fluff/zodiacshadow + name = "Health Service Achievement medal" + desc = "A small silver medal with the inscription \"For going above and beyond in the field.\" on it, along with the name Nehi Maximus." + + icon = 'icons/inventory/accessory/item.dmi' + icon_state = "silver" // OrbisA: Richard D'angelo /obj/item/weapon/melee/fluff/holochain diff --git a/code/modules/vore/mouseray.dm b/code/modules/vore/mouseray.dm new file mode 100644 index 0000000000..dc9e503cd1 --- /dev/null +++ b/code/modules/vore/mouseray.dm @@ -0,0 +1,499 @@ +/obj/item/weapon/gun/energy/mouseray + name = "mouse ray" + desc = "A mysterious looking ray gun..." + icon = 'icons/obj/mouseray.dmi' + icon_state = "mouseray" + item_state = "mouseray" + item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi') + fire_sound = 'sound/weapons/wave.ogg' + charge_cost = 240 + projectile_type = /obj/item/projectile/beam/mouselaser + origin_tech = list(TECH_BLUESPACE = 4) + battery_lock = 1 + firemodes = list() + var/tf_type = /mob/living/simple_mob/animal/passive/mouse //This type is what kind of mob it will try to turn people into! + var/cooldown = 0 //automatically set when used + var/cooldown_time = 15 SECONDS //the amount of time between shots + var/tf_admin_pref_override = FALSE //Overrides pref checks + var/tf_allow_select = FALSE //Toggles if the gun is able to pick between things in the 'tf_possible_types' variable + var/tf_possible_types = list( //The different types of mob the gun can pick between + "mouse" = /mob/living/simple_mob/animal/passive/mouse, + "rat" = /mob/living/simple_mob/animal/passive/mouse/rat, + "dust jumper" = /mob/living/simple_mob/vore/alienanimals/dustjumper + ) + +/obj/item/weapon/gun/energy/mouseray/attack_self(mob/user) + . = ..() + if(tf_allow_select) + pick_type() + +/obj/item/weapon/gun/energy/mouseray/proc/pick_type() + var/choice = tgui_input_list(usr, "Select a type to turn things into.", "[src.name]", tf_possible_types) + if(!choice) + return + tf_type = tf_possible_types[choice] + to_chat(usr, "You selected [choice].") + +/obj/item/weapon/gun/energy/mouseray/Fire(atom/target, mob/living/user, clickparams, pointblank, reflex) + if(world.time < cooldown) + to_chat(usr, "\The [src] isn't ready yet.") + return + . = ..() + +/obj/item/weapon/gun/energy/mouseray/Fire_userless(atom/target) + if(world.time < cooldown) + return + . = ..() + +/obj/item/weapon/gun/energy/mouseray/consume_next_projectile() + . = ..() + var/obj/item/projectile/beam/mouselaser/G = . + cooldown = world.time + cooldown_time + if(tf_type) + G.tf_type = tf_type + if(tf_admin_pref_override) + G.tf_admin_pref_override = tf_admin_pref_override + +/obj/item/weapon/gun/energy/mouseray/update_icon() + if(charge_meter) + var/ratio = power_supply.charge / power_supply.maxcharge + + //make sure that rounding down will not give us the empty state even if we have charge for a shot left. + if(power_supply.charge < charge_cost) + ratio = 0 + else + ratio = max(round(ratio, 0.25) * 100, 25) + + icon_state = "[initial(icon_state)][ratio]" + +/obj/item/projectile/beam/mouselaser + name = "metamorphosis beam" + icon_state = "xray" + nodamage = 1 + damage = 0 + range = 7 + check_armour = "laser" + can_miss = FALSE + var/tf_type = /mob/living/simple_mob/animal/passive/mouse + var/tf_admin_pref_override = FALSE + + muzzle_type = /obj/effect/projectile/muzzle/laser_omni + tracer_type = /obj/effect/projectile/tracer/laser_omni + impact_type = /obj/effect/projectile/impact/laser_omni + +/obj/item/projectile/beam/mouselaser/on_hit(var/atom/target) + var/mob/living/M = target + if(!istype(M)) + return + if(target != firer) //If you shot yourself, you probably want to be TFed so don't bother with prefs. + if(!M.allow_spontaneous_tf && !tf_admin_pref_override) + return + if(M.tf_mob_holder) + var/mob/living/ourmob = M.tf_mob_holder + if(ourmob.ai_holder) + var/datum/ai_holder/our_AI = ourmob.ai_holder + our_AI.set_stance(STANCE_IDLE) + M.tf_mob_holder = null + ourmob.ckey = M.ckey + var/turf/get_dat_turf = get_turf(target) + ourmob.loc = get_dat_turf + ourmob.forceMove(get_dat_turf) + ourmob.vore_selected = M.vore_selected + M.vore_selected = null + for(var/obj/belly/B as anything in M.vore_organs) + B.loc = ourmob + B.forceMove(ourmob) + B.owner = ourmob + M.vore_organs -= B + ourmob.vore_organs += B + + ourmob.Life(1) + if(ishuman(M)) + for(var/obj/item/W in M) + if(istype(W, /obj/item/weapon/implant/backup) || istype(W, /obj/item/device/nif)) + continue + M.drop_from_inventory(W) + + qdel(target) + return + else + if(M.stat == DEAD) //We can let it undo the TF, because the person will be dead, but otherwise things get weird. + return + var/mob/living/new_mob = spawn_mob(M) + new_mob.faction = M.faction + + if(new_mob && isliving(new_mob)) + for(var/obj/belly/B as anything in new_mob.vore_organs) + new_mob.vore_organs -= B + qdel(B) + new_mob.vore_organs = list() + new_mob.name = M.name + new_mob.real_name = M.real_name + for(var/lang in M.languages) + new_mob.languages |= lang + M.copy_vore_prefs_to_mob(new_mob) + new_mob.vore_selected = M.vore_selected + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(ishuman(new_mob)) + var/mob/living/carbon/human/N = new_mob + N.gender = H.gender + N.identifying_gender = H.identifying_gender + else + new_mob.gender = H.identifying_gender + else + new_mob.gender = M.gender + if(ishuman(new_mob)) + var/mob/living/carbon/human/N = new_mob + N.identifying_gender = M.gender + + for(var/obj/belly/B as anything in M.vore_organs) + B.loc = new_mob + B.forceMove(new_mob) + B.owner = new_mob + M.vore_organs -= B + new_mob.vore_organs += B + + new_mob.ckey = M.ckey + if(M.ai_holder && new_mob.ai_holder) + var/datum/ai_holder/old_AI = M.ai_holder + old_AI.set_stance(STANCE_SLEEP) + var/datum/ai_holder/new_AI = new_mob.ai_holder + new_AI.hostile = old_AI.hostile + new_AI.retaliate = old_AI.retaliate + M.loc = new_mob + M.forceMove(new_mob) + new_mob.tf_mob_holder = M + +/obj/item/projectile/beam/mouselaser/proc/spawn_mob(var/mob/living/target) + if(!ispath(tf_type)) + return + var/new_mob = new tf_type(get_turf(target)) + return new_mob + +/mob/living + var/mob/living/tf_mob_holder = null + +/mob/living/proc/revert_mob_tf() + if(!tf_mob_holder) + return + var/mob/living/ourmob = tf_mob_holder + if(ourmob.ai_holder) + var/datum/ai_holder/our_AI = ourmob.ai_holder + our_AI.set_stance(STANCE_IDLE) + tf_mob_holder = null + ourmob.ckey = ckey + var/turf/get_dat_turf = get_turf(src) + ourmob.loc = get_dat_turf + ourmob.forceMove(get_dat_turf) + ourmob.vore_selected = vore_selected + vore_selected = null + for(var/obj/belly/B as anything in vore_organs) + B.loc = ourmob + B.forceMove(ourmob) + B.owner = ourmob + vore_organs -= B + ourmob.vore_organs += B + + ourmob.Life(1) + + if(ishuman(src)) + for(var/obj/item/W in src) + if(istype(W, /obj/item/weapon/implant/backup) || istype(W, /obj/item/device/nif)) + continue + src.drop_from_inventory(W) + + qdel(src) + + +/mob/living/proc/handle_tf_holder() + if(!tf_mob_holder) + return + if(stat != tf_mob_holder.stat) + if(stat == DEAD) + tf_mob_holder.death(FALSE, null) + if(tf_mob_holder.stat == DEAD) + death() + +/mob/living/proc/copy_vore_prefs_to_mob(var/mob/living/new_mob) + //For primarily copying vore preference settings from a carbon mob to a simplemob + //It can be used for other things, but be advised, if you're using it to put a simplemob into a carbon mob, you're gonna be overriding a bunch of prefs + new_mob.ooc_notes = ooc_notes + new_mob.digestable = digestable + new_mob.devourable = devourable + new_mob.absorbable = absorbable + new_mob.feeding = feeding + new_mob.can_be_drop_prey = can_be_drop_prey + new_mob.can_be_drop_pred = can_be_drop_pred + new_mob.allow_inbelly_spawning = allow_inbelly_spawning + new_mob.digest_leave_remains = digest_leave_remains + new_mob.allowmobvore = allowmobvore + new_mob.permit_healbelly = permit_healbelly + new_mob.noisy = noisy + new_mob.drop_vore = drop_vore + new_mob.stumble_vore = stumble_vore + new_mob.slip_vore = slip_vore + new_mob.resizable = resizable + new_mob.show_vore_fx = show_vore_fx + new_mob.step_mechanics_pref = step_mechanics_pref + new_mob.pickup_pref = pickup_pref + new_mob.vore_taste = vore_taste + new_mob.vore_smell = vore_smell + new_mob.nutrition_message_visible = nutrition_message_visible + new_mob.allow_spontaneous_tf = allow_spontaneous_tf + +/////SUBTYPES///// + +/obj/item/weapon/gun/energy/mouseray/medical //This just changes people back, it can't TF people into anything without shenanigans + name = "recombobulation ray" + desc = "The Type Gamma Medical Recombobulation ray! A mysterious looking ray gun! It works to change people who have had their form significantly altered back into their original forms!" + + icon_state = "medray" + item_state = "mouseray" + charge_meter = FALSE + charge_cost = 0 + tf_type = null + projectile_type = /obj/item/projectile/beam/mouselaser/reversion + +/obj/item/weapon/gun/energy/mouseray/medical/consume_next_projectile() + . = ..() + var/obj/item/projectile/beam/mouselaser/reversion/G = . + cooldown = world.time + cooldown_time + if(tf_admin_pref_override) + G.tf_admin_pref_override = tf_admin_pref_override + + +/obj/item/projectile/beam/mouselaser/reversion + name = "recombobulation beam" + tf_admin_pref_override = FALSE + +/obj/item/projectile/beam/mouselaser/reversion/on_hit(var/atom/target) + var/mob/living/M = target + if(!istype(M)) + return + if(target != firer) //If you shot yourself, you probably want to be TFed so don't bother with prefs. + if(!M.allow_spontaneous_tf && !tf_admin_pref_override) + firer.visible_message("\The [src] buzzes impolitely.") + return + if(M.tf_mob_holder) + var/mob/living/ourmob = M.tf_mob_holder + if(ourmob.ai_holder) + var/datum/ai_holder/our_AI = ourmob.ai_holder + our_AI.set_stance(STANCE_IDLE) + M.tf_mob_holder = null + ourmob.ckey = M.ckey + var/turf/get_dat_turf = get_turf(target) + ourmob.loc = get_dat_turf + ourmob.forceMove(get_dat_turf) + ourmob.vore_selected = M.vore_selected + M.vore_selected = null + for(var/obj/belly/B as anything in M.vore_organs) + B.loc = ourmob + B.forceMove(ourmob) + B.owner = ourmob + M.vore_organs -= B + ourmob.vore_organs += B + + ourmob.Life(1) + + if(ishuman(M)) + for(var/obj/item/W in M) + if(istype(W, /obj/item/weapon/implant/backup) || istype(W, /obj/item/device/nif)) + continue + M.drop_from_inventory(W) + + qdel(target) + firer.visible_message("\The [shot_from] boops pleasantly.") + return + else + firer.visible_message("\The [shot_from] buzzes impolitely.") + +/obj/item/weapon/gun/energy/mouseray/admin //NEVER GIVE THIS TO ANYONE + name = "experimental metamorphosis ray" + cooldown_time = 5 SECONDS + tf_allow_select = TRUE + charge_meter = FALSE + charge_cost = 0 + icon_state = "adminray" + +/obj/item/weapon/gun/energy/mouseray/metamorphosis + name = "metamorphosis ray" + tf_allow_select = TRUE + tf_possible_types = list( + "mouse" = /mob/living/simple_mob/animal/passive/mouse, + "rat" = /mob/living/simple_mob/animal/passive/mouse/rat, + "dust jumper" = /mob/living/simple_mob/vore/alienanimals/dustjumper, + "woof" = /mob/living/simple_mob/vore/woof, + "corgi" = /mob/living/simple_mob/animal/passive/dog/corgi, + "cat" = /mob/living/simple_mob/animal/passive/cat, + "chicken" = /mob/living/simple_mob/animal/passive/chicken, + "cow" = /mob/living/simple_mob/animal/passive/cow, + "lizard" = /mob/living/simple_mob/animal/passive/lizard, + "rabbit" = /mob/living/simple_mob/vore/rabbit, + "fox" = /mob/living/simple_mob/animal/passive/fox, + "fennec" = /mob/living/simple_mob/vore/fennec, + "cute fennec" = /mob/living/simple_mob/animal/passive/fennec, + "fennix" = /mob/living/simple_mob/vore/fennix, + "red panda" = /mob/living/simple_mob/vore/redpanda, + "opossum" = /mob/living/simple_mob/animal/passive/opossum, + "horse" = /mob/living/simple_mob/vore/horse, + "goose" = /mob/living/simple_mob/animal/space/goose, + "sheep" = /mob/living/simple_mob/vore/sheep + ) + +/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced + name = "advanced metamorphosis ray" + tf_possible_types = list( + "mouse" = /mob/living/simple_mob/animal/passive/mouse, + "rat" = /mob/living/simple_mob/animal/passive/mouse/rat, + "giant rat" = /mob/living/simple_mob/vore/aggressive/rat, + "dust jumper" = /mob/living/simple_mob/vore/alienanimals/dustjumper, + "woof" = /mob/living/simple_mob/vore/woof, + "corgi" = /mob/living/simple_mob/animal/passive/dog/corgi, + "cat" = /mob/living/simple_mob/animal/passive/cat, + "chicken" = /mob/living/simple_mob/animal/passive/chicken, + "cow" = /mob/living/simple_mob/animal/passive/cow, + "lizard" = /mob/living/simple_mob/animal/passive/lizard, + "rabbit" = /mob/living/simple_mob/vore/rabbit, + "fox" = /mob/living/simple_mob/animal/passive/fox, + "fennec" = /mob/living/simple_mob/vore/fennec, + "cute fennec" = /mob/living/simple_mob/animal/passive/fennec, + "fennix" = /mob/living/simple_mob/vore/fennix, + "red panda" = /mob/living/simple_mob/vore/redpanda, + "opossum" = /mob/living/simple_mob/animal/passive/opossum, + "horse" = /mob/living/simple_mob/vore/horse, + "goose" = /mob/living/simple_mob/animal/space/goose, + "sheep" = /mob/living/simple_mob/vore/sheep, + "space bumblebee" = /mob/living/simple_mob/vore/bee, + "space bear" = /mob/living/simple_mob/animal/space/bear, + "voracious lizard" = /mob/living/simple_mob/vore/aggressive/dino, + "giant frog" = /mob/living/simple_mob/vore/aggressive/frog, + "jelly blob" = /mob/living/simple_mob/animal/space/jelly, + "wolf" = /mob/living/simple_mob/animal/wolf, + "direwolf" = /mob/living/simple_mob/animal/wolf/direwolf, + "great wolf" = /mob/living/simple_mob/vore/greatwolf, + "sect queen" = /mob/living/simple_mob/vore/sect_queen, + "sect drone" = /mob/living/simple_mob/vore/sect_drone, + "panther" = /mob/living/simple_mob/vore/aggressive/panther, + "giant snake" = /mob/living/simple_mob/vore/aggressive/giant_snake, + "deathclaw" = /mob/living/simple_mob/vore/aggressive/deathclaw, + "otie" = /mob/living/simple_mob/otie, + "mutated otie" =/mob/living/simple_mob/otie/feral, + "red otie" = /mob/living/simple_mob/otie/red, + "defanged xenomorph" = /mob/living/simple_mob/vore/xeno_defanged, + "catslug" = /mob/living/simple_mob/vore/alienanimals/catslug, + "teppi" = /mob/living/simple_mob/vore/alienanimals/teppi, + "monkey" = /mob/living/carbon/human/monkey, + "wolpin" = /mob/living/carbon/human/wolpin, + "sparra" = /mob/living/carbon/human/sparram, + "saru" = /mob/living/carbon/human/sergallingm, + "sobaka" = /mob/living/carbon/human/sharkm, + "farwa" = /mob/living/carbon/human/farwa, + "neaera" = /mob/living/carbon/human/neaera, + "stok" = /mob/living/carbon/human/stok, + "weretiger" = /mob/living/simple_mob/vore/weretiger, + "dragon" = /mob/living/simple_mob/vore/bigdragon/friendly, + "leopardmander" = /mob/living/simple_mob/vore/leopardmander + ) + +/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced/random + name = "unstable metamorphosis ray" + tf_allow_select = FALSE + +/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced/random/Fire(atom/target, mob/living/user, clickparams, pointblank, reflex) + if(world.time < cooldown) + to_chat(usr, "\The [src] isn't ready yet.") + return + var/choice = pick(tf_possible_types) + tf_type = tf_possible_types[choice] + . = ..() + +/obj/item/weapon/gun/energy/mouseray/woof + name = "woof ray" + tf_type = /mob/living/simple_mob/vore/woof + +/obj/item/weapon/gun/energy/mouseray/corgi + name = "corgi ray" + tf_type = /mob/living/simple_mob/animal/passive/dog/corgi + +/obj/item/weapon/gun/energy/mouseray/cat + name = "cat ray" + tf_type = /mob/living/simple_mob/animal/passive/cat + +/obj/item/weapon/gun/energy/mouseray/chicken + name = "chicken ray" + tf_type = /mob/living/simple_mob/animal/passive/chicken + +/obj/item/weapon/gun/energy/mouseray/lizard + name = "lizard ray" + tf_type = /mob/living/simple_mob/animal/passive/lizard + +/obj/item/weapon/gun/energy/mouseray/rabbit + name = "rabbit ray" + tf_type = /mob/living/simple_mob/vore/rabbit + +/obj/item/weapon/gun/energy/mouseray/fennec + name = "fennec ray" + tf_type = /mob/living/simple_mob/animal/passive/fennec + +/obj/item/weapon/gun/energy/mouseray/monkey + name = "monkey ray" + tf_type = /mob/living/carbon/human/monkey + +/obj/item/weapon/gun/energy/mouseray/wolpin + name = "wolpin ray" + tf_type = /mob/living/carbon/human/wolpin + +/obj/item/weapon/gun/energy/mouseray/otie + name = "otie ray" + tf_type = /mob/living/simple_mob/otie + +/obj/item/weapon/gun/energy/mouseray/direwolf + name = "dire wolf ray" + tf_type = /mob/living/simple_mob/animal/wolf/direwolf + +/obj/item/weapon/gun/energy/mouseray/giantrat + name = "giant rat ray" + tf_type = /mob/living/simple_mob/vore/aggressive/rat + +/obj/item/weapon/gun/energy/mouseray/redpanda + name = "red panda ray" + tf_type = /mob/living/simple_mob/vore/redpanda + +/obj/item/weapon/gun/energy/mouseray/catslug + name = "catslug ray" + tf_type = /mob/living/simple_mob/vore/alienanimals/catslug + +/obj/item/weapon/gun/energy/mouseray/teppi + name = "teppi ray" + tf_type = /mob/living/simple_mob/vore/alienanimals/teppi + + +/////RANDOM SPAWNER///// + +/obj/random/mouseray + name = "random ray" + icon = 'icons/mob/randomlandmarks.dmi' + icon_state = "fanc_trejur" + spawn_nothing_percentage = 0 + +/obj/random/mouseray/item_to_spawn() + return pick(prob(300);/obj/item/weapon/gun/energy/mouseray, + prob(50);/obj/item/weapon/gun/energy/mouseray/corgi, + prob(50);/obj/item/weapon/gun/energy/mouseray/woof, + prob(50);/obj/item/weapon/gun/energy/mouseray/cat, + prob(50);/obj/item/weapon/gun/energy/mouseray/chicken, + prob(50);/obj/item/weapon/gun/energy/mouseray/lizard, + prob(50);/obj/item/weapon/gun/energy/mouseray/rabbit, + prob(50);/obj/item/weapon/gun/energy/mouseray/fennec, + prob(5);/obj/item/weapon/gun/energy/mouseray/monkey, + prob(5);/obj/item/weapon/gun/energy/mouseray/wolpin, + prob(5);/obj/item/weapon/gun/energy/mouseray/otie, + prob(5);/obj/item/weapon/gun/energy/mouseray/direwolf, + prob(5);/obj/item/weapon/gun/energy/mouseray/giantrat, + prob(50);/obj/item/weapon/gun/energy/mouseray/redpanda, + prob(5);/obj/item/weapon/gun/energy/mouseray/catslug, + prob(5);/obj/item/weapon/gun/energy/mouseray/teppi, + prob(1);/obj/item/weapon/gun/energy/mouseray/metamorphosis, + prob(1);/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced/random + ) diff --git a/code/modules/vore/resizing/holder_micro_vr.dm b/code/modules/vore/resizing/holder_micro_vr.dm index c77fd207fa..b75d9cd2ed 100644 --- a/code/modules/vore/resizing/holder_micro_vr.dm +++ b/code/modules/vore/resizing/holder_micro_vr.dm @@ -10,7 +10,7 @@ item_icons = null // No in-hand sprites (for now, anyway, we could totally add some) pixel_y = 0 // Override value from parent. -/obj/item/weapon/holder/micro/examine(mob/user) +/obj/item/weapon/holder/examine(mob/user) . = list() for(var/mob/living/M in contents) . += M.examine(user) diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index b82ecb07e7..9882ea11b6 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -113,8 +113,6 @@ /mob/living/carbon/human/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE, var/aura_animation = TRUE) if(!resizable && !ignore_prefs) return 1 - if(species) - vis_height = species.icon_height . = ..() if(LAZYLEN(hud_list) && has_huds) var/new_y_offset = vis_height * (size_multiplier - 1) @@ -132,7 +130,6 @@ * Ace was here! Redid this a little so we'd use math for shrinking characters. This is the old code. */ - /mob/living/proc/set_size() set name = "Adjust Mass" set category = "Abilities" //Seeing as prometheans have an IC reason to be changing mass. @@ -142,12 +139,13 @@ return var/nagmessage = "Adjust your mass to be a size between 25 to 200% (or 1% to 600% in dormitories). (DO NOT ABUSE)" - var/new_size = input(nagmessage, "Pick a Size") as num|null + var/default = size_multiplier * 100 + var/new_size = tgui_input_number(usr, nagmessage, "Pick a Size", default, 600, 1) if(size_range_check(new_size)) resize(new_size/100, uncapped = has_large_resize_bounds(), ignore_prefs = TRUE) // I'm not entirely convinced that `src ? ADMIN_JMP(src) : "null"` here does anything // but just in case it does, I'm leaving the null-src checking - message_admins("[key_name(src)] used the resize command in-game to be [new_size]% size. [src ? ADMIN_JMP(src) : "null"]") + log_admin("[key_name(src)] used the resize command in-game to be [new_size]% size. [src ? ADMIN_JMP(src) : "null"]") /* //Add the set_size() proc to usable verbs. By commenting this out, we can leave the proc and hand it to species that need it. diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index 1f8eb6f207..5714234771 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -41,7 +41,7 @@ set category = "Object" set src in view(1) - var/size_select = input(usr, "Put the desired size (25-200%), (1-600%) in dormitory areas.", "Set Size", size_set_to * 100) as num|null + var/size_select = tgui_input_number(usr, "Put the desired size (25-200%), (1-600%) in dormitory areas.", "Set Size", size_set_to * 100, 600, 1) if(!size_select) return //cancelled //We do valid resize testing in actual firings because people move after setting these things. @@ -115,7 +115,7 @@ set category = "Object" set src in view(1) - var/size_select = input(usr, "Put the desired size (1-600%)", "Set Size", size_set_to * 100) as num|null + var/size_select = tgui_input_number(usr, "Put the desired size (1-600%)", "Set Size", size_set_to * 100, 600, 1) if(!size_select) return //cancelled size_set_to = clamp((size_select/100), 0, 1000) //eheh @@ -136,6 +136,7 @@ damage = 0 check_armour = "laser" var/set_size = 1 //Let's default to 100% + can_miss = FALSE muzzle_type = /obj/effect/projectile/muzzle/xray tracer_type = /obj/effect/projectile/tracer/xray diff --git a/code/modules/xenoarcheaology/effect.dm b/code/modules/xenoarcheaology/effect.dm index 145bd3e258..93c344aa83 100644 --- a/code/modules/xenoarcheaology/effect.dm +++ b/code/modules/xenoarcheaology/effect.dm @@ -158,7 +158,9 @@ /proc/GetAnomalySusceptibility(var/mob/living/carbon/human/H) if(!istype(H)) return 1 - if(istype(get_area(H),/area/crew_quarters/sleep)) return 0 //VOREStation Edit - Dorms are protected from anomalies + var/area/A = get_area(H) + if(A.forbid_events) + return 0 var/protected = 0 //anomaly suits give best protection, but excavation suits are almost as good diff --git a/code/modules/xenoarcheaology/finds/fossils.dm b/code/modules/xenoarcheaology/finds/fossils.dm index 5448db97f2..19516f47cc 100644 --- a/code/modules/xenoarcheaology/finds/fossils.dm +++ b/code/modules/xenoarcheaology/finds/fossils.dm @@ -76,7 +76,7 @@ else ..() else if(istype(W,/obj/item/weapon/pen)) - plaque_contents = sanitize(input(usr, "What would you like to write on the plaque:","Skeleton plaque","")) + plaque_contents = sanitize(tgui_input_text(usr, "What would you like to write on the plaque:","Skeleton plaque","")) user.visible_message("[user] writes something on the base of [src].","You relabel the plaque on the base of [bicon(src)] [src].") if(src.contents.Find(/obj/item/weapon/fossil/skull/horned)) src.desc = "A creature made of [src.contents.len-1] assorted bones and a horned skull. The plaque reads \'[plaque_contents]\'." diff --git a/code/modules/xenoarcheaology/tools/artifact_analyser.dm b/code/modules/xenoarcheaology/tools/artifact_analyser.dm index 32259e774a..41d4ad1bc2 100644 --- a/code/modules/xenoarcheaology/tools/artifact_analyser.dm +++ b/code/modules/xenoarcheaology/tools/artifact_analyser.dm @@ -13,6 +13,14 @@ var/scan_duration = 50 var/obj/scanned_object var/report_num = 0 + var/list/priority_objects = list(/obj/machinery/artifact, + /obj/machinery/auto_cloner, + /obj/machinery/power/supermatter, + /obj/structure/constructshell, + /obj/machinery/giga_drill, + /obj/structure/cult/pylon, + /obj/machinery/replicator, + /obj/structure/crystal) /obj/machinery/artifact_analyser/Initialize() . = ..() @@ -49,9 +57,9 @@ /obj/machinery/artifact_analyser/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) return TRUE - + add_fingerprint(usr) - + switch(action) if("scan") if(scan_in_progress) @@ -62,6 +70,7 @@ reconnect_scanner() if(owned_scanner) var/artifact_in_use = 0 + var/obj/secondary_priority for(var/obj/O in owned_scanner.loc) if(O == owned_scanner) continue @@ -78,13 +87,22 @@ if(artifact_in_use) atom_say("Cannot scan. Too much interference.") else - scanned_object = O - scan_in_progress = 1 - scan_completion_time = world.time + scan_duration - atom_say("Scanning begun.") - break + for(var/otype in priority_objects) + if(istype(O, otype)) + scanned_object = O + break + if(scanned_object) + break + else + secondary_priority = O + if(secondary_priority && !scanned_object) + scanned_object = secondary_priority if(!scanned_object) atom_say("Unable to isolate scan target.") + else + scan_in_progress = 1 + scan_completion_time = world.time + scan_duration + atom_say("Scanning begun.") return TRUE /obj/machinery/artifact_analyser/process() @@ -115,7 +133,7 @@ var/obj/machinery/artifact/A = scanned_object A.anchored = FALSE A.being_used = 0 - scanned_object = null + scanned_object = null //hardcoded responses, oh well /obj/machinery/artifact_analyser/proc/get_scan_info(var/obj/scanned_obj) diff --git a/code/modules/xenoarcheaology/tools/tools_pickaxe.dm b/code/modules/xenoarcheaology/tools/tools_pickaxe.dm index ddca8b6fe5..c7015c2c29 100644 --- a/code/modules/xenoarcheaology/tools/tools_pickaxe.dm +++ b/code/modules/xenoarcheaology/tools/tools_pickaxe.dm @@ -174,7 +174,7 @@ attack_verb = list("drilled") /obj/item/weapon/pickaxe/excavationdrill/attack_self(mob/user as mob) - var/depth = input(usr, "Put the desired depth (1-30 centimeters).", "Set Depth", 30) as num + var/depth = tgui_input_number(usr, "Put the desired depth (1-30 centimeters).", "Set Depth", 30, 30, 1) if(depth>30 || depth<1) to_chat(user, "Invalid depth.") return diff --git a/code/modules/xenobio/items/slime_objects.dm b/code/modules/xenobio/items/slime_objects.dm index 72cc0e01e3..90012d7548 100644 --- a/code/modules/xenobio/items/slime_objects.dm +++ b/code/modules/xenobio/items/slime_objects.dm @@ -57,7 +57,7 @@ S.set_species("Promethean") S.shapeshifter_set_colour("#2398FF") visible_message("The monkey cube suddenly takes the shape of a humanoid!") - var/newname = sanitize(input(S, "You are a Promethean. Would you like to change your name to something else?", "Name change") as null|text, MAX_NAME_LEN) + var/newname = sanitize(tgui_input_text(S, "You are a Promethean. Would you like to change your name to something else?", "Name change", null, MAX_NAME_LEN), MAX_NAME_LEN) if(newname) S.real_name = newname S.name = S.real_name diff --git a/code/modules/xenobio/items/slimepotions.dm b/code/modules/xenobio/items/slimepotions.dm index 11d2d07571..fa1484e0d9 100644 --- a/code/modules/xenobio/items/slimepotions.dm +++ b/code/modules/xenobio/items/slimepotions.dm @@ -110,7 +110,7 @@ playsound(src, 'sound/effects/bubbles.ogg', 50, 1) AI.remove_target() // So hostile things stop attacking people even if not hostile anymore. - var/newname = copytext(sanitize(input(user, "Would you like to give \the [M] a name?", "Name your new pet", M.name) as null|text),1,MAX_NAME_LEN) + var/newname = copytext(sanitize(tgui_input_text(user, "Would you like to give \the [M] a name?", "Name your new pet", M.name, MAX_NAME_LEN)),1,MAX_NAME_LEN) if(newname) M.name = newname diff --git a/code/modules/xenobio2/mob/slime/slime_monkey.dm b/code/modules/xenobio2/mob/slime/slime_monkey.dm index 39660b1728..8915e58e9b 100644 --- a/code/modules/xenobio2/mob/slime/slime_monkey.dm +++ b/code/modules/xenobio2/mob/slime/slime_monkey.dm @@ -44,7 +44,7 @@ Slime cube lives here. S.shapeshifter_set_colour("#05FF9B") for(var/mob/M in viewers(get_turf_or_move(loc))) M.show_message("The monkey cube suddenly takes the shape of a humanoid!") - var/newname = sanitize(input(S, "You are a Promethean. Would you like to change your name to something else?", "Name change") as null|text, MAX_NAME_LEN) + var/newname = sanitize(tgui_input_text(S, "You are a Promethean. Would you like to change your name to something else?", "Name change"), MAX_NAME_LEN) if(newname) S.real_name = newname S.name = S.real_name diff --git a/code/unit_tests/map_tests.dm b/code/unit_tests/map_tests.dm index 6dfec2bd60..e988835fc4 100644 --- a/code/unit_tests/map_tests.dm +++ b/code/unit_tests/map_tests.dm @@ -1,5 +1,5 @@ /datum/unit_test/apc_area_test - name = "MAP: Area Test APC / Scrubbers / Vents Z level 1" + name = "MAP: Area Test APC / Scrubbers / Vents (Defined Z-Levels)" /datum/unit_test/apc_area_test/start_test() var/list/bad_areas = list() @@ -47,17 +47,16 @@ var/area_good = 1 var/bad_msg = "--------------- [A.name]([A.type])" - if(isnull(A.apc) && !(A.type in exempt_from_apc)) - log_unit_test("[bad_msg] lacks an APC.") + log_unit_test("[bad_msg] lacks an APC. (X[A.x]|Y[A.y]) - Z[A.z])") area_good = 0 if(!A.air_scrub_info.len && !(A.type in exempt_from_atmos)) - log_unit_test("[bad_msg] lacks an Air scrubber.") + log_unit_test("[bad_msg] lacks an Air scrubber. (X[A.x]|Y[A.y]) - (Z[A.z])") area_good = 0 if(!A.air_vent_info.len && !(A.type in exempt_from_atmos)) - log_unit_test("[bad_msg] lacks an Air vent.") + log_unit_test("[bad_msg] lacks an Air vent. (X[A.x]|Y[A.y]) - (Z[A.z])") area_good = 0 if(!area_good) @@ -71,9 +70,11 @@ return 1 /datum/unit_test/wire_test - name = "MAP: Cable Test Z level 1" + name = "MAP: Cable Test (Defined Z-Levels)" /datum/unit_test/wire_test/start_test() + set background=1 + var/wire_test_count = 0 var/bad_tests = 0 var/turf/T = null @@ -81,23 +82,35 @@ var/list/cable_turfs = list() var/list/dirs_checked = list() - for(C in world) - T = null + var/list/exempt_from_wires = list() + exempt_from_wires += using_map.unit_test_exempt_from_wires.Copy() - T = get_turf(C) - if(T && T.z == 1) - cable_turfs |= get_turf(C) + var/list/zs_to_test = using_map.unit_test_z_levels || list(1) //Either you set it, or you just get z1 - for(T in cable_turfs) - var/bad_msg = "--------------- [T.name] \[[T.x] / [T.y] / [T.z]\]" - dirs_checked.Cut() - for(C in T) - wire_test_count++ - var/combined_dir = "[C.d1]-[C.d2]" - if(combined_dir in dirs_checked) - bad_tests++ - log_unit_test("[bad_msg] Contains multiple wires with same direction on top of each other.") - dirs_checked.Add(combined_dir) + for(var/color in possible_cable_coil_colours) + cable_turfs = list() + + for(C in world) + T = null + + T = get_turf(C) + var/area/A = get_area(T) + if(T && (T.z in zs_to_test) && !(A.type in exempt_from_wires)) + if(C.color == possible_cable_coil_colours[color]) + cable_turfs |= get_turf(C) + + for(T in cable_turfs) + var/bad_msg = "--------------- [T.name] \[[T.x] / [T.y] / [T.z]\] [color]" + dirs_checked.Cut() + for(C in T) + wire_test_count++ + var/combined_dir = "[C.d1]-[C.d2]" + if(combined_dir in dirs_checked) + bad_tests++ + log_unit_test("[bad_msg] Contains multiple wires with same direction on top of each other.") + dirs_checked.Add(combined_dir) + + log_unit_test("[color] wires checked.") if(bad_tests) fail("\[[bad_tests] / [wire_test_count]\] Some turfs had overlapping wires going the same direction.") @@ -121,12 +134,12 @@ var/a_gas = "" for(var/gas in E.A.air.gas) a_gas += "[gas]=[E.A.air.gas[gas]]" - + var/b_temp var/b_moles var/b_vol var/b_gas = "" - + // Two zones mixing if(istype(E, /connection_edge/zone)) var/connection_edge/zone/Z = E @@ -144,11 +157,11 @@ b_vol = "Unsim" for(var/gas in U.air.gas) b_gas += "[gas]=[U.air.gas[gas]]" - + edge_log += "Active Edge [E] ([E.type])" edge_log += "Edge side A: T:[a_temp], Mol:[a_moles], Vol:[a_vol], Gas:[a_gas]" edge_log += "Edge side B: T:[b_temp], Mol:[b_moles], Vol:[b_vol], Gas:[b_gas]" - + for(var/turf/T in E.connecting_turfs) edge_log += "+--- Connecting Turf [T] ([T.type]) @ [T.x], [T.y], [T.z] ([T.loc])" diff --git a/config/jukebox.json b/config/jukebox.json index 192ab502ed..0674a8e329 100644 --- a/config/jukebox.json +++ b/config/jukebox.json @@ -1,52 +1,52 @@ [ { -"url": "https://s.put.re/bkZYkYwX.mp3", +"url": "https://files.catbox.moe/notc7y.mp3", "title": "Flip-Flap (Title One)", "duration": 1500, "artist": "X-CEED", "secret": false, -"lobby": true, -"jukebox": false, +"lobby": false, +"jukebox": true, "genre": "Jazz" -}, +}, { -"url": "https://s.put.re/EzLP21Mp.mp3", +"url": "https://files.catbox.moe/b24m07.mp3", "title": "Robocop Theme (Title Two)", "duration": 1180, "artist": "Cboyardee", "secret": false, "lobby": true, -"jukebox": false, -"genre": "Electronic" -}, -{ -"url": "https://s.put.re/uDpZrL1L.mp3", -"title": "Tin Tin on the Moon (Remix)", -"duration": 2320, -"artist": "Jeroen Tel (Remixed by Cuboos)", -"secret": false, -"lobby": true, -"jukebox": true, -"genre": "Electronic" -}, -{ -"url": "https://s.put.re/nNXTd9ko.mp3", -"title": "Phoron Will Make Us Rich", -"duration": 1370, -"artist": "Earthcrusher", -"secret": false, -"lobby": true, "jukebox": true, "genre": "Electronic" }, { -"url": "https://s.put.re/vrN9ATH7.mp3", -"title": "Spaceman's Dilemma", -"duration": 2230, -"artist": "Leslie Fish", +"url": "https://files.catbox.moe/qn5tdv.mp3", +"title": "Tin Tin on the Moon (Remix)", +"duration": 2450, +"artist": "Jeroen Tel (Remixed by Cuboos)", "secret": false, "lobby": true, "jukebox": true, +"genre": "Electronic" +}, +{ +"url": "https://files.catbox.moe/uk3pr2.mp3", +"title": "Phoron Will Make Us Rich", +"duration": 1370, +"artist": "Earthcrusher", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Electronic" +}, +{ +"url": "https://files.catbox.moe/k25nxo.mp3", +"title": "Spaceman's Dilemma", +"duration": 2080, +"artist": "Leslie Fish", +"secret": false, +"lobby": false, +"jukebox": true, "genre": "Folk and Indie" }, { @@ -55,7 +55,7 @@ "duration": 3150, "artist": "Leslie Fish", "secret": false, -"lobby": true, +"lobby": false, "jukebox": true, "genre": "Folk and Indie" }, @@ -515,7 +515,7 @@ "duration": 1340, "artist": "Leslie Fish", "secret": false, -"lobby": false, +"lobby": true, "jukebox": true, "genre": "Folk and Indie" }, @@ -525,7 +525,7 @@ "duration": 2660, "artist": "Duane Elms", "secret": false, -"lobby": false, +"lobby": true, "jukebox": true, "genre": "Folk and Indie" }, @@ -535,7 +535,7 @@ "duration": 1700, "artist": "Leslie Fish", "secret": false, -"lobby": false, +"lobby": true, "jukebox": true, "genre": "Folk and Indie" }, @@ -825,7 +825,7 @@ "duration": 1170, "artist": "Hector", "secret": false, -"lobby": true, +"lobby": false, "jukebox": true, "genre": "Electronic" }, @@ -835,7 +835,7 @@ "duration": 2200, "artist": "Garoad", "secret": false, -"lobby": true, +"lobby": false, "jukebox": true, "genre": "Electronic" }, @@ -870,6 +870,16 @@ "genre": "Pop" }, { +"url": "https://cdn.discordapp.com/attachments/528973352728264714/956446080638283826/Deus_Ex_-_009_-_UNATCO_-_Ambient.mp3", +"title": "UNATCO - Ambience", +"duration": 1610, +"artist": "Michiel van den Bos", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Electronic" +}, +{ "url": "https://files.catbox.moe/gcej08.m4a", "title": "UNATCO - Conversation", "duration": 1720, @@ -880,6 +890,26 @@ "genre": "Electronic" }, { +"url": "https://cdn.discordapp.com/attachments/528973352728264714/956453078750593044/EdenShard_-_Deus_Ex-_Revision_Original_Soundtrack_-_06_The_Oath_of_Service.mp3", +"title": "Oath of Service", +"duration": 2160, +"artist": "EdenShard", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Electronic" +}, +{ +"url": "https://cdn.discordapp.com/attachments/528973352728264714/956453288600039434/EdenShard_-_Deus_Ex-_Revision_Original_Soundtrack_-_08_Mind_the_Synaptic_Gap.mp3", +"title": "Mind the Synaptic Gap", +"duration": 5460, +"artist": "EdenShard", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Electronic" +}, +{ "url": "https://files.catbox.moe/pf929m.m4a", "title": "Virtual Insanity", "duration": 3400, @@ -1215,7 +1245,7 @@ "duration": 2340, "artist": "Chris Remo", "secret": false, -"lobby": true, +"lobby": false, "jukebox": true, "genre": "Folk and Indie" }, @@ -2225,7 +2255,7 @@ "duration": 3180, "artist": "David Bowie", "secret": false, -"lobby": false, +"lobby": true, "jukebox": true, "genre": "Rock" }, @@ -2256,7 +2286,7 @@ "artist": "Chris Hadfield", "secret": false, "lobby": true, -"jukebox": false, +"jukebox": true, "genre": "Pop" }, { @@ -2865,7 +2895,7 @@ "duration": 2730, "artist": "Hall & Oates", "secret": false, -"lobby": false, +"lobby": true, "jukebox": true, "genre": "Pop" }, @@ -3508,5 +3538,1143 @@ "lobby": false, "jukebox": true, "genre": "Rock" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/404660884531707906/676726491806957568/Cassette.mp3", +"title" : "Cassette", +"duration" :2310, +"artist" : "Efence", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Ambience" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/676384242426707979/676730040624480264/Glowing_Red_Dust.mp3", +"title" : "Red Glowing Dust", +"duration" :3370, +"artist" : "Jón Hallur Haraldsson (also known as RealX)", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Ambience" +}, +{ + +"url" : "https://cdn.discordapp.com/attachments/676384242426707979/676730820530274323/Stellardrone_-_Eternity.mp3", +"title" : "Eternity", +"duration" :3810, +"artist" : "Stellardrone", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Ambience" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/612993188655005697/676732888712216596/DJ-ZEK_-_Simulate.mp3", +"title" : "Simulate", +"duration" :4850, +"artist" : "Fawxtrot (now know as DJ Zek)", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Ambience" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/520929567540772873/707899715261562960/FitnessGram_20_Meter_PACER_Test_Full_Length_OFFICIAL_Audio_Version.mp3", +"title" : "The FitnessGram Pacer Test", +"duration" : 13720, +"artist" : "The Cooper Institute (FitnessGram)", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Ambience" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/575066308362895444/701639140109844530/Peaceful_Orbits.mp3", +"title" : "Peaceful Orbits", +"duration" : 2040, +"artist" : "TeknoAXE", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Ambience" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/575066308362895444/701639311896084511/Passing_Time_in_an_Escape_Pod.mp3", +"title" : "Passing Time in an Escape Pod", +"duration" : 2300, +"artist" : "TeknoAXE", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Ambience" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/331435060735508480/613310956927451137/Persona_5_48_-_Beneath_the_Mask_-rain-.mp3", +"title" : "Beneath the Mask -Rain Version-", +"duration" : 2790, +"artist" : "Persona 5", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Jazz" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/331037116094087168/543191420370944001/DragonSharkOriginal3.mp3", +"title" : "Terrorbyte/Dragon Shark theme", +"duration" : 2100, +"artist" : "RetroSpecter", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Rock" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/528973352728264714/583441087633555456/Prey_-_Everything_is_Going_to_Be_Ok_online-audio-converter.com.mp3", +"title" : "Everything Is Going To Be Ok", +"duration" : 1600, +"artist" : "Mick Gordon", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Electronic" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/311691674130710528/463590234978910228/Saga_of_Tanya_the_Evil_-_Jingo_Jungle_Opening_ENGLISH_ver_AmaLee.mp3", +"title" : "Jingo Jungle", +"duration" : 2440, +"artist" : "Leeandlie http://bit.ly/Leeandlie", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Electronic" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/311691674130710528/468345155498541066/TheMadnessOfFate.mp3", +"title" : "Madness of Fate", +"duration" :4030, +"artist" : "NIIC the singing dog - http://bit.ly/NIICDOGYT", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Electronic" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/311691674130710528/449909217403469837/Hard_Bass_School_-_narkotik_kal.mp3", +"title" : "Narkotik kal", +"duration" : 2350, +"artist" : "Hardbass", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Ambience" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/528973352728264714/613807206047154217/TERRORBYTE_-_HELIOS.mp3", +"title" : "Helios", +"duration" : 2850, +"artist" : "TERRORBYTE", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Metal" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/377217220041900034/453308819422838784/System_Of_A_Down_-_Shimmy_11.mp3", +"title" : "Shimmy", +"duration" : 1110, +"artist" : "System of a Down", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Rock" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/377217220041900034/453308919067049995/System_Of_A_Down_-_Science_10.mp3", +"title" : "Science", +"duration" : 1630, +"artist" : "System of a Down", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Rock" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/377217220041900034/453308944706699284/System_Of_A_Down_-_Deer_Dance_03.mp3", +"title" : "deer dance", +"duration" : 1750, +"artist" : "System of a Down", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Rock" +}, +{ + "url" : "https://cdn.discordapp.com/attachments/377217220041900034/453308945411473428/System_Of_A_Down_-_Atwa.mp3", + "title" : "Atwa", + "duration" : 1790, +"artist" : "System of a Down", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Rock" +}, +{ + "url" : "https://cdn.discordapp.com/attachments/377217220041900034/453308969772122112/System_Of_A_Down_-_Forest_08.mp3", + "title" : "Forest", + "duration" : 2400, +"artist" : "System of a Down", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Rock" +}, +{ + "url" : "https://cdn.discordapp.com/attachments/377217220041900034/453308978089426985/System_Of_A_Down_-_Prison_Song_01.mp3", + "title" : "Prison song", + "duration" : 2110, +"artist" : "System of a Down", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Rock" +}, +{ + "url" : "https://cdn.discordapp.com/attachments/377217220041900034/453308978089426985/System_Of_A_Down_-_Prison_Song_01.mp3", + "title" : "SPIDERS!", + "duration" : 2150, +"artist" : "System of a Down", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Rock" +}, +{ + "url" : "https://cdn.discordapp.com/attachments/377217220041900034/453309000780611604/System_Of_A_Down_-_Aerials_14.mp3", + "title" : "Aerials", + "duration" : 2320, +"artist" : "System of a Down", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Rock" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/377217220041900034/453309015955472394/System_Of_A_Down_-_Jet_Pilot_04.mp3", +"title" : "Jet Pilot", +"duration" : 1260, +"artist" : "System of a Down", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Rock" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/377217220041900034/454653832945860608/Skeleton_Man-_The_Axis_of_Awesome.mp3", +"title" : "Skeleton Man", +"duration" : 1510, +"artist" : "AoW", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Classical and Orchestral" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/745916615606140938/775593951259918336/Nanook_Rubs_It.mp3", +"title" : "Nanook Rubs It", +"duration" :2770, +"artist" : "Frank Zappa", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Country and Western" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/745916615606140938/775593948307521566/Muffin_Man.mp3", +"title" : "Muffin Man", +"duration" :3370, +"artist" : "Frank Zappa", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Folk and Indie" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/404660884531707906/456271996314058752/Edgar_Rothermich_-01_Theme_from_Silent_Hill_jungle-vibe.com.mp3", +"title" : "Silent Hill", +"duration" : 1760, +"artist" : "Akira Yamaoka and Edgar Rothermich", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Country and Western" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/377217220041900034/460490120240300052/Nightcore_-_Tetris.mp3", +"title" : "Tetris Remixed", +"duration" : 1910, +"artist" : "nightcore", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Electronic" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/377217220041900034/460490219167154186/VERSACE_2017_-_TIX__The_Pssy_Project.mp3", +"title" : "Versance", +"duration" : 2030, +"artist" : "PussyProject", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Classical and Orchestral" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/377217220041900034/460490229523021834/-_.mp3", +"title" : "Russian Techno", +"duration" : 2400, +"artist" : "Some russians", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Hip-Hop and Rap" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/377217220041900034/460490231611654144/Rock_Dog_2017_Movie_Official_Lyric_Video_Glorious_by_Adam_Friedman.mp3", +"title" : "Gloriouse", +"duration" : 2200, +"artist" : "Rock Dog", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Rock" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/377217220041900034/460490245725487104/Gigi_DAgostino_-_You_Spin_Me_Round__Tecno_Fes_2_.mp3", +"title" : "You spin me around", +"duration" : 2580, +"artist" : "Gigi DAgostino", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Pop" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/377217220041900034/460490246610747402/-__Kyary_Pamyu_Pamyu_-.mp3", +"title" : "Pamyu Pamyu", +"duration" : 2640, +"artist" : "Kyary", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Pop" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/377217220041900034/457628201200648202/Berserk_-_S3RL_ft_Iceman.mp3", +"title" : "Beserk", +"duration" :1620, +"artist" : "S3RL ft Iceman", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Metal" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/458630047167807488/520025625852117002/Nick_Hakim_-_Pour_Another.mp3", +"title" : "Pour Another", +"duration" :3510, +"artist" : "Nick Hakim", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Jazz" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/526693916859170816/559236326264668190/Ocean_Man.mp3", +"title" : "Ocean Man", +"duration" : 1270, +"artist" : "Ween", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Classical and Orchestral" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/458630047167807488/520025672702492682/Nick_Hakim_-_I_Dont_Know.mp3", +"title" : "I dont know", +"duration" :2990, +"artist" : "Nick Hakim", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Jazz" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/404660884531707906/614356720503881728/Underfell_Megalovania.mp3", +"title" : "Underfell", +"duration" :1830, +"artist" : "keno9988iii", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Metal" +}, +{ +"url" : "https://cdn.discordapp.com/attachments/661630061983825938/663112074880352276/Headhunterz_-_Scrap_Attack_HQ.mp3", +"title" : "Scrap Attack", +"duration" :3730, +"artist" : "Headhunterz", +"secret": true, +"lobby": false, +"jukebox": true, +"genre": "Electronic" +}, +{ +"url" : "https://files.catbox.moe/h967s5.mp3", +"title" : "MEGALOVANIA", +"duration" : 1416, +"artist" : "Toby Fox", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Video Game" +}, +{ +"url" : "https://files.catbox.moe/yumfgs.mp3", +"title" : "ASGORE", +"duration" : 1416, +"artist" : "Toby Fox", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Video Game" +}, +{ +"url" : "https://files.catbox.moe/ewn2u4.mp3", +"title" : "Disco Descent", +"duration" : 1800, +"artist" : "Danny Baranowsky", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Electronic" +}, +{ +"url" : "https://files.catbox.moe/8rns1d.mp3", +"title" : "Konga Conga Kappa", +"duration" : 1130, +"artist" : "Danny Baranowsky", +"secret": false, +"lobby": false, +"jukebox": true, +"genre": "Electronic" +}, +{ +"url": "https://files.catbox.moe/3h38kn.mp3", +"title": "Among Us", +"duration": 720, +"genre": "Disco, Funk, Soul, and R&B", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/rqhxj1.mp3", +"title": "Leggy Zone", +"duration": 1470, +"genre": "Electronic", +"secret": true, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/e6l6mw.mp3", +"title": "Shop Theme", +"duration": 8910, +"genre": "Electronic", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/q2ob3n.mp3", +"title": "PONPONPON", +"duration": 2430, +"artist": "Kyary Pamyu Pamyu", +"genre": "J-Pop", +"secret": false, +"lobby": false +}, +{ +"url": "https://files.catbox.moe/o8flhu.mp3", +"title": "Man's Road", +"duration": 2060, +"artist": "America", +"genre": "Rock", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/0gb5qs.mp3", +"title": "Passionflower", +"duration": 3840, +"artist": "Jon Gomm", +"genre": "Rock", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/p5e28z.mp3", +"title": "What the Fuck", +"duration": 2420, +"artist": "Koh", +"genre": "Folk and Indie", +"secret": true, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/0f2xma.mp3", +"title": "Bonetrousle", +"duration": 580, +"artist": "Toby Fox", +"genre": "Video Game", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/pbtbjv.mp3", +"title": "Dog Song", +"duration": 380, +"artist": "Toby Fox", +"genre": "Video Game", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/4v3eeb.mp3", +"title": "Anticipation", +"duration": 230, +"artist": "Toby Fox", +"genre": "Video Game", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/0q8ch6.mp3", +"title": "Smash Clown", +"duration": 820, +"artist": "Goat", +"genre": "Space", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/ygcg2e.mp3", +"title": "Honk The Police", +"duration": 590, +"artist": "Goat", +"genre": "Space", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/h0yswi.mp3", +"title": "Cargonia", +"duration": 630, +"artist": "Goat", +"genre": "Space", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/xg76ja.mp3", +"title": "Hail Cargonia", +"duration": 980, +"artist": "Goat", +"genre": "Space", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/tbr2rc.mp3", +"title": "Banned From Cargo", +"duration": 2450, +"artist": "Goat", +"genre": "Space", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/tw2et2.mp3", +"title": "Periphery Dixie", +"duration": 1200, +"artist": "Goat", +"genre": "Space", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/rm5hcs.mp3", +"title": "Cargonia (cover)", +"duration": 2730, +"artist": "Dadbot5000", +"genre": "Space", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/ybfof9.mp3", +"title": "The Legend", +"duration": 1120, +"artist": "Toby Fox", +"genre": "Video Game", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/ugfx06.mp3", +"title": "Field of Hopes and Dreams", +"duration": 1610, +"artist": "Toby Fox", +"genre": "Video Game", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/wr08om.mp3", +"title": "Checker Dance", +"duration": 780, +"artist": "Toby Fox", +"genre": "Video Game", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/4au954.mp3", +"title": "Vs Susie", +"duration": 810, +"artist": "Toby Fox", +"genre": "Video Game", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/c9y5x2.mp3", +"title": "Golden Wind", +"duration": 2930, +"artist": "Yugo Kanno", +"genre": "Anime", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/ymvtem.mp3", +"title": "Sono Chi no Sadame", +"duration": 2610, +"artist": "Hiroaki TOMMY Tominaga", +"genre": "Anime", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/z73u05.mp3", +"title": "Bloody Stream", +"duration": 2590, +"artist": "Coda", +"genre": "Anime", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/yg3643.mp3", +"title": "Stand Proud", +"duration": 2750, +"artist": "Jin Hashimoto", +"genre": "Anime", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/344qrf.mp3", +"title": "Sono Chi no Kioku ~end of THE WORLD~", +"duration": 2620, +"artist": "JO☆STARS", +"genre": "Anime", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/0n6y6v.mp3", +"title": "Crazy Noisy Bizarre Town", +"duration": 1840, +"artist": "THE DU", +"genre": "Anime", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/j3xzw6.mp3", +"title": "Chase", +"duration": 1450, +"artist": "Batta", +"genre": "Anime", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/luf1bh.mp3", +"title": "Great Days", +"duration": 2400, +"artist": "Karen Aoki & Daisuke Hasegaw", +"genre": "Anime", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/ytp4d2.mp3", +"title": "Fighting Gold", +"duration": 2540, +"artist": "Coda", +"genre": "Anime", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/q1xjdp.mp3", +"title": "I Want It That Way", +"duration": 2120, +"artist": "Backstreet Boys", +"genre": "Pop", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/pxpkat.mp3", +"title": "Shop Theme Cover", +"duration": 1770, +"artist": "Songe", +"genre": "Video Game", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/nz03o1.mp3", +"title": "Deep Space 9 (Cover)", +"duration": 1220, +"artist": "Heropoint", +"genre": "Rock", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/n4vcnq.mp3", +"title": "Trouble Shooting Star", +"duration": 1460, +"artist": "", +"genre": "Video Game", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/byy378.mp3", +"title": "The Lord of the Rings The Fellowship of the its my book they will walk if I tell them to", +"duration": 970, +"artist": "Tom Cardy", +"genre": "Folk and Indie", +"secret": true, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/akgbup.mp3", +"title": "Flight of the Bumblebee", +"duration": 2050, +"artist": "Rimsky Korsakov", +"genre": "Classical and Orchestral", +"secret": true, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/milk8o.mp3", +"title": "As Heaven Is Wide", +"duration": 2880, +"artist": "Garbage", +"genre": "Rock", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/8mh82l.mp3", +"title": "Combat Montage", +"duration": 1410, +"artist": "Kevin Manthei", +"genre": "Rock", +"secret": true, +"lobby": false, +"jukebox": true +}, + +{ +"url": "https://files.catbox.moe/qa6ahi.mp3", +"title": "Deadlines", +"duration": 1570, +"artist": "Network Music Ensemble", +"genre": "Rock", +"secret": false, +"lobby": true, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/cdmm5k.mp3", +"title": "Holding Out For A Hero", +"duration": 2620, +"artist": "Ella Mae Bowen", +"genre": "Country and Western", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/jlv9eb.mp3", +"title": "Jiko Bunseki", +"duration": 1420, +"artist": "Yuki Hayashi", +"genre": "Anime", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/vzbcsc.mp3", +"title": "Let It End", +"duration": 2220, +"artist": "Karliene", +"genre": "Folk and Indie", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/nsfwxe.mp3", +"title": "Proof Of A Hero (16 bit)", +"duration": 1410, +"artist": "Bulby", +"genre": "Video Game", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/ywoaqa.mp3", +"title": "Proof Of A Hero", +"duration": 1340, +"artist": "Kouda Masato", +"genre": "Video Game", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/xlrbbe.mp3", +"title": "Pure Imagination", +"duration": 2060, +"artist": "Fiona Apple", +"genre": "Electronic", +"secret": false, +"lobby": true, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/q3f6sq.mp3", +"title": "Rhapsody In Blue", +"duration": 9870, +"artist": "Kamil Hala, Slovak Philharmonic Orchestra, Libor Pešek", +"genre": "Classical and Orchestral", +"secret": false, +"lobby": true, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/vzsm5k.mp3", +"title": "Surface Of SR388", +"duration": 1710, +"artist": "BG Ollie", +"genre": "Video Game", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/ngtv3e.mp3", +"title": "Where My Heart Will Take Me", +"duration": 0, +"artist": "Russell Watson", +"genre": "Country and Western", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/cfq7bo.mp3", +"title": "Kiss From A Rose", +"duration": 2860, +"artist": "Dan Avidan & Super Guitar Bros", +"genre": "Acoustic", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/4mypzc.mp3", +"title": "Black Hole Sun", +"duration": 3210, +"artist": "Dan Avidan & Super Guitar Bros", +"genre": "Acoustic", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/qpkv1q.mp3", +"title": "I Still Haven't Found What I'm Looking For", +"duration": 2870, +"artist": "Dan Avidan & Super Guitar Bros", +"genre": "Acoustic", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/g8vawq.mp3", +"title": "Nights In White Satin", +"duration": 2710, +"artist": "Dan Avidan & Super Guitar Bros", +"genre": "Acoustic", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/01ljjx.mp3", +"title": "Land Of Confusion", +"duration": 2850, +"artist": "Dan Avidan & Super Guitar Bros", +"genre": "Acoustic", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/2iugx4.mp3", +"title": "Aspirations", +"duration": 3010, +"artist": "Dan Avidan & Super Guitar Bros", +"genre": "Acoustic", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/m3cwu1.mp3", +"title": "Head Over Heels", +"duration": 2420, +"artist": "Dan Avidan & Super Guitar Bros", +"genre": "Acoustic", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/xtizlg.mp3", +"title": "Get Lucky", +"duration": 2490, +"artist": "Dan Avidan & Super Guitar Bros", +"genre": "Acoustic", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/dym0sp.mp3", +"title": "God Only Knows", +"duration": 1810, +"artist": "Dan Avidan & Super Guitar Bros", +"genre": "Acoustic", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/i8gml0.mp3", +"title": "Scarborough Fair", +"duration": 2020, +"artist": "Dan Avidan & Super Guitar Bros", +"genre": "Acoustic", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/chc70l.mp3", +"title": "The Sphere A Kind Of Dream", +"duration": 620, +"artist": "Dan Avidan & Super Guitar Bros", +"genre": "Acoustic", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/w48oqv.mp3", +"title": "Pushin' The Speed of Light", +"duration": 2130, +"artist": "Julia Ecklar & Anne Prather", +"genre": "Folk and Indie", +"secret": false, +"lobby": true, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/zacsky.mp3", +"title": "S.T.L.", +"duration": 1190, +"artist": "Free Fall & Other Delights", +"genre": "Folk and Indie", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/9a3ow3.mp3", +"title": "Phantom Lover of the Star Drive", +"duration": 1930, +"artist": "Free Fall & Other Delights", +"genre": "Folk and Indie", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/eo59pv.mp3", +"title": "Molecular Clouds", +"duration": 1560, +"artist": "Free Fall & Other Delights", +"genre": "Folk and Indie", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/227jw9.mp3", +"title": "A Reconsideration (Zero-G Sex)", +"duration": 2530, +"artist": "Free Fall & Other Delights", +"genre": "Folk and Indie", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/yvn8bu.mp3", +"title": "Stuck Here", +"duration": 1360, +"artist": "Free Fall & Other Delights", +"genre": "Folk and Indie", +"secret": false, +"lobby": true, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/nsnf73.mp3", +"title": "The Ballad of Transport 18", +"duration": 2660, +"artist": "Leslie Fish", +"genre": "Folk and Indie", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/hwsbsi.mp3", +"title": "Don't Push That Button", +"duration": 2450, +"artist": "Duane Elms", +"genre": "Folk and Indie", +"secret": false, +"lobby": true, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/iizfw9.mp3", +"title": "Late Night at the Draco Tavern", +"duration": 2600, +"artist": "Duane Elms", +"genre": "Folk and Indie", +"secret": false, +"lobby": true, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/4zaljk.mp3", +"title": "Startide Rising", +"duration": 1050, +"artist": "Duane Elms", +"genre": "Folk and Indie", +"secret": false, +"lobby": true, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/9y01ry.mp3", +"title": "F.A.P. Feline American Princess", +"duration": 2640, +"artist": "Leslie Fish", +"genre": "Folk and Indie", +"secret": false, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/s7u3vi.mp3", +"title": "Hymn to Breaking Strain", +"duration": 2710, +"artist": "Julia Ecklar & Leslie Fish", +"genre": "Folk and Indie", +"secret": false, +"lobby": false, +"jukebox": true } -] \ No newline at end of file +] diff --git a/icons/_nanomaps/gb1.png b/icons/_nanomaps/gb1.png new file mode 100644 index 0000000000..8c3ac8f2db Binary files /dev/null and b/icons/_nanomaps/gb1.png differ diff --git a/icons/_nanomaps/gb2.png b/icons/_nanomaps/gb2.png new file mode 100644 index 0000000000..63277ea186 Binary files /dev/null and b/icons/_nanomaps/gb2.png differ diff --git a/icons/_nanomaps/gb3.png b/icons/_nanomaps/gb3.png new file mode 100644 index 0000000000..2ad403f15e Binary files /dev/null and b/icons/_nanomaps/gb3.png differ diff --git a/icons/_nanomaps/gbeast.png b/icons/_nanomaps/gbeast.png new file mode 100644 index 0000000000..2f6f110f42 Binary files /dev/null and b/icons/_nanomaps/gbeast.png differ diff --git a/icons/_nanomaps/gbmining.png b/icons/_nanomaps/gbmining.png new file mode 100644 index 0000000000..769d080980 Binary files /dev/null and b/icons/_nanomaps/gbmining.png differ diff --git a/icons/_nanomaps/gbnorth.png b/icons/_nanomaps/gbnorth.png new file mode 100644 index 0000000000..5b4f03662e Binary files /dev/null and b/icons/_nanomaps/gbnorth.png differ diff --git a/icons/_nanomaps/gbsouth.png b/icons/_nanomaps/gbsouth.png new file mode 100644 index 0000000000..1a3a1b22e3 Binary files /dev/null and b/icons/_nanomaps/gbsouth.png differ diff --git a/icons/_nanomaps/gbwest.png b/icons/_nanomaps/gbwest.png new file mode 100644 index 0000000000..d19c3019a8 Binary files /dev/null and b/icons/_nanomaps/gbwest.png differ diff --git a/icons/inventory/head/item_vr.dmi b/icons/inventory/head/item_vr.dmi index 54a988a2b7..d8e7dbd97f 100644 Binary files a/icons/inventory/head/item_vr.dmi and b/icons/inventory/head/item_vr.dmi differ diff --git a/icons/inventory/head/mob_vox.dmi b/icons/inventory/head/mob_vox.dmi index 346ea9b7d1..f1570089c8 100644 Binary files a/icons/inventory/head/mob_vox.dmi and b/icons/inventory/head/mob_vox.dmi differ diff --git a/icons/inventory/head/mob_vr.dmi b/icons/inventory/head/mob_vr.dmi index 2c417cdd25..2da016ca45 100644 Binary files a/icons/inventory/head/mob_vr.dmi and b/icons/inventory/head/mob_vr.dmi differ diff --git a/icons/inventory/suit/item_vr.dmi b/icons/inventory/suit/item_vr.dmi index 806c8a021a..fb17453b3c 100644 Binary files a/icons/inventory/suit/item_vr.dmi and b/icons/inventory/suit/item_vr.dmi differ diff --git a/icons/inventory/suit/mob_vr.dmi b/icons/inventory/suit/mob_vr.dmi index c97f407958..eb19cb108c 100644 Binary files a/icons/inventory/suit/mob_vr.dmi and b/icons/inventory/suit/mob_vr.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi index 607a315377..d368c3a4d7 100644 Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index def737dcc3..2cb35cf667 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi new file mode 100644 index 0000000000..3e8d60a579 Binary files /dev/null and b/icons/mob/head.dmi differ diff --git a/icons/mob/items/lefthand_guns_vr.dmi b/icons/mob/items/lefthand_guns_vr.dmi index f2c51e21b9..20261bbbe1 100644 Binary files a/icons/mob/items/lefthand_guns_vr.dmi and b/icons/mob/items/lefthand_guns_vr.dmi differ diff --git a/icons/mob/items/righthand_guns_vr.dmi b/icons/mob/items/righthand_guns_vr.dmi index 7e899b2b99..f39b901489 100644 Binary files a/icons/mob/items/righthand_guns_vr.dmi and b/icons/mob/items/righthand_guns_vr.dmi differ diff --git a/icons/mob/pai_hud.dmi b/icons/mob/pai_hud.dmi new file mode 100644 index 0000000000..2009b0e237 Binary files /dev/null and b/icons/mob/pai_hud.dmi differ diff --git a/icons/mob/pai_vr.dmi b/icons/mob/pai_vr.dmi index 705369c7f3..82f5faffe8 100644 Binary files a/icons/mob/pai_vr.dmi and b/icons/mob/pai_vr.dmi differ diff --git a/icons/mob/pai_vr32x64.dmi b/icons/mob/pai_vr32x64.dmi new file mode 100644 index 0000000000..02c15d3de8 Binary files /dev/null and b/icons/mob/pai_vr32x64.dmi differ diff --git a/icons/mob/pai_vr64x32.dmi b/icons/mob/pai_vr64x32.dmi new file mode 100644 index 0000000000..468e5cd216 Binary files /dev/null and b/icons/mob/pai_vr64x32.dmi differ diff --git a/icons/mob/pai_vr64x64.dmi b/icons/mob/pai_vr64x64.dmi index d19f5137df..d9840c659e 100644 Binary files a/icons/mob/pai_vr64x64.dmi and b/icons/mob/pai_vr64x64.dmi differ diff --git a/icons/mob/species/teshari/head.dmi b/icons/mob/species/teshari/head.dmi index 0bb0637c4e..6cf6b2ac7d 100644 Binary files a/icons/mob/species/teshari/head.dmi and b/icons/mob/species/teshari/head.dmi differ diff --git a/icons/mob/taursuits_horse.dmi b/icons/mob/taursuits_horse.dmi index 192f282796..4986bed14f 100644 Binary files a/icons/mob/taursuits_horse.dmi and b/icons/mob/taursuits_horse.dmi differ diff --git a/icons/mob/taursuits_horse_vr.dmi b/icons/mob/taursuits_horse_vr.dmi index 192f282796..4986bed14f 100644 Binary files a/icons/mob/taursuits_horse_vr.dmi and b/icons/mob/taursuits_horse_vr.dmi differ diff --git a/icons/mob/vore/ears_vr.dmi b/icons/mob/vore/ears_vr.dmi index 032ba8e4fa..4bde02b8bf 100644 Binary files a/icons/mob/vore/ears_vr.dmi and b/icons/mob/vore/ears_vr.dmi differ diff --git a/icons/mob/vore/taurs_vr.dmi b/icons/mob/vore/taurs_vr.dmi index d10b18cb04..20ddaee2a4 100644 Binary files a/icons/mob/vore/taurs_vr.dmi and b/icons/mob/vore/taurs_vr.dmi differ diff --git a/icons/obj/cooking_machines.dmi b/icons/obj/cooking_machines.dmi index 4009cb6224..b8c3ea6f5d 100644 Binary files a/icons/obj/cooking_machines.dmi and b/icons/obj/cooking_machines.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 915c170551..f1637aca4b 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/lighting32x64.dmi b/icons/obj/lighting32x64.dmi index 1fe0dc024b..36ccfb03fe 100644 Binary files a/icons/obj/lighting32x64.dmi and b/icons/obj/lighting32x64.dmi differ diff --git a/icons/obj/lighting_vr.dmi b/icons/obj/lighting_vr.dmi index e6e27c57a4..a97da56f00 100644 Binary files a/icons/obj/lighting_vr.dmi and b/icons/obj/lighting_vr.dmi differ diff --git a/icons/obj/mouseray.dmi b/icons/obj/mouseray.dmi new file mode 100644 index 0000000000..fdb4d9bb90 Binary files /dev/null and b/icons/obj/mouseray.dmi differ diff --git a/icons/obj/paicard.dmi b/icons/obj/paicard.dmi index c69ead6efd..4403d47a3d 100644 Binary files a/icons/obj/paicard.dmi and b/icons/obj/paicard.dmi differ diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi index e7e7f0859c..29bee45a9f 100644 Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ diff --git a/icons/obj/stacks.dmi b/icons/obj/stacks.dmi index cce7d2e9e7..b08f3b086a 100644 Binary files a/icons/obj/stacks.dmi and b/icons/obj/stacks.dmi differ diff --git a/icons/turf/flooring/carpet.dmi b/icons/turf/flooring/carpet.dmi index f668ae8943..f7dcf3c046 100644 Binary files a/icons/turf/flooring/carpet.dmi and b/icons/turf/flooring/carpet.dmi differ diff --git a/icons/turf/flooring/wood.dmi b/icons/turf/flooring/wood.dmi index eb91333673..afec20c851 100644 Binary files a/icons/turf/flooring/wood.dmi and b/icons/turf/flooring/wood.dmi differ diff --git a/icons/turf/flooring/wood_vr.dmi b/icons/turf/flooring/wood_vr.dmi index d6024f3de0..f072969e54 100644 Binary files a/icons/turf/flooring/wood_vr.dmi and b/icons/turf/flooring/wood_vr.dmi differ diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index 1f3fb6cea7..76707a55fb 100644 Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ diff --git a/maps/expedition_vr/beach/beach.dmm b/maps/expedition_vr/beach/beach.dmm index 86e53b1aaa..1d3c1e6233 100644 --- a/maps/expedition_vr/beach/beach.dmm +++ b/maps/expedition_vr/beach/beach.dmm @@ -873,6 +873,10 @@ "nD" = ( /turf/simulated/mineral/ignore_mapgen, /area/tether_away/beach/water) +"nP" = ( +/mob/living/simple_mob/animal/passive/fennec/faux, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/kitchen) "of" = ( /obj/structure/table/woodentable, /obj/random/drinkbottle, @@ -1345,16 +1349,16 @@ /turf/simulated/floor/beach/sand/outdoors, /area/tether_away/beach/resort) "Bk" = ( -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, @@ -1363,10 +1367,10 @@ /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/material/knife/butch, /obj/item/weapon/material/minihoe, /obj/item/weapon/material/knife/machete/hatchet, @@ -11048,7 +11052,7 @@ ad ad ad ad -ad +nP ad ad ad diff --git a/maps/gateway_vr/eggnogtown.dmm b/maps/gateway_vr/eggnogtown.dmm index 175934ba36..02654d71f2 100644 --- a/maps/gateway_vr/eggnogtown.dmm +++ b/maps/gateway_vr/eggnogtown.dmm @@ -1000,16 +1000,16 @@ /turf/simulated/floor/tiled, /area/gateway/eggnogtown/loniabode) "gk" = ( -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, @@ -1018,10 +1018,10 @@ /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/structure/closet, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/reagent_containers/food/condiment/small/peppermill, @@ -3649,7 +3649,7 @@ "Rd" = ( /obj/structure/table/marble, /obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/condiment/yeast, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/yeast, diff --git a/maps/gateway_vr/isle_de_monch.dmm b/maps/gateway_vr/isle_de_monch.dmm new file mode 100644 index 0000000000..501945adeb --- /dev/null +++ b/maps/gateway_vr/isle_de_monch.dmm @@ -0,0 +1,317 @@ +"ah" = (/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"aj" = (/obj/structure/closet/crate/secure/loot,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"bh" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/closet/walllocker_double/south{name = "Uniform Locker"},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"bE" = (/obj/structure/table/steel,/obj/machinery/light,/obj/item/weapon/storage/toolbox/electrical{pixel_x = -3; pixel_y = -2},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"bR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"cq" = (/turf/simulated/floor/water/beach{dir = 8},/area/tether_away/beach/coast) +"cA" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"cK" = (/obj/structure/bed/chair/bay/comfy{dir = 4},/obj/item/trash/spacercake_wrap,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"cR" = (/turf/simulated/floor/water/beach/corner{dir = 8},/area/tether_away/beach/coast) +"dZ" = (/turf/simulated/floor/water/beach{dir = 5},/area/tether_away/beach/coast) +"en" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"ey" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"eI" = (/obj/effect/overlay/palmtree_l,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach) +"eQ" = (/obj/machinery/door/airlock/hatch{req_one_access = list(160)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"fC" = (/turf/simulated/floor/water/beach{dir = 6},/area/tether_away/beach/coast) +"fH" = (/turf/simulated/floor/water/deep/ocean,/area/tether_away/beach/water) +"fO" = (/obj/effect/overlay/palmtree_r,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach/resort) +"gu" = (/obj/structure/hull_corner{dir = 1},/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) +"gC" = (/obj/tether_away_spawner/beach_outside,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach) +"gD" = (/obj/effect/overlay/palmtree_l,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach/resort) +"gV" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"hj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/item/trash/syndi_cakes,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"hC" = (/obj/structure/girder,/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) +"im" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/item/weapon/melee/baton/cattleprod{desc = "Metal rod with wire attached to it."; name = "jury-rigged antenna"; pixel_x = 5; pixel_y = 4},/turf/simulated/floor/outdoors/grass,/area/tether_away/beach/resort) +"iM" = (/obj/structure/barricade,/turf/simulated/floor/outdoors/newdirt,/area/tether_away/beach/resort) +"jk" = (/turf/simulated/floor/water/beach{dir = 10},/area/tether_away/beach/coast) +"jo" = (/obj/structure/salvageable/machine,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"ju" = (/obj/structure/girder,/turf/simulated/floor/outdoors/newdirt,/area/tether_away/beach/resort) +"jy" = (/turf/simulated/floor/water/beach/corner,/area/tether_away/beach/coast) +"jH" = (/obj/random/multiple/corp_crate,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"jJ" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/bed,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"jX" = (/obj/structure/salvageable/console{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"kj" = (/obj/machinery/atmospherics/binary/pump/fuel{dir = 1},/obj/random/trash_pile,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"kk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"ks" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/salvageable/console{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"kx" = (/obj/machinery/gateway{dir = 5},/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) +"kJ" = (/turf/simulated/floor/water/beach,/area/tether_away/beach/coast) +"kQ" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/wall/shull,/area/tether_away/beach/resort) +"lJ" = (/obj/structure/table/rack,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"mp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) +"mr" = (/obj/structure/barricade,/turf/simulated/mineral/floor/cave{name = "dirt"},/area/tether_away/beach/resort) +"mt" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5},/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{dir = 4; id_tag = "salamander_docking_star"; name = "Starboard Airlock Control"; pixel_x = -22; req_one_access = list(160)},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"mA" = (/obj/structure/railing/grey{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"mV" = (/obj/machinery/atmospherics/unary/engine/bigger{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"nL" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/hatch{req_one_access = list(160)},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"nV" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"oe" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 2; req_one_access = list(160)},/obj/machinery/door/firedoor/multi_tile{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"oB" = (/obj/machinery/atmospherics/pipe/manifold/visible{dir = 1},/obj/structure/catwalk,/obj/machinery/light/small{dir = 1},/obj/random/trash_pile,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"oI" = (/obj/machinery/gateway{dir = 9},/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) +"oS" = (/turf/simulated/floor/water/ocean,/area/tether_away/beach/water) +"oY" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"pB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"pJ" = (/obj/structure/salvageable/console{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"pX" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"qf" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/item/clothing/ears/earmuffs,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"qQ" = (/obj/structure/hull_corner{dir = 4},/turf/simulated/floor/outdoors/newdirt,/area/tether_away/beach/resort) +"rd" = (/obj/effect/map_helper/airlock/sensor/int_sensor,/obj/machinery/airlock_sensor{dir = 8; pixel_x = 21; req_one_access = list(160)},/obj/structure/handrail{dir = 8},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"rN" = (/obj/machinery/door/airlock/glass_external/public,/obj/effect/map_helper/airlock/door/int_door,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"rS" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/railing/grey{dir = 1},/obj/machinery/atmospherics/portables_connector/fuel{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"sk" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"so" = (/obj/item/broken_device/random,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"sF" = (/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) +"tG" = (/obj/structure/bed/chair/bay/chair{dir = 4},/obj/machinery/button/remote/blast_door{id = "trade"; name = "Shop Shutters"; pixel_y = -26; req_access = list(160)},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"tO" = (/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"ue" = (/obj/effect/landmark/gateway_scatter,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach/resort) +"up" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable,/obj/structure/railing/grey{dir = 8},/obj/machinery/light,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"uL" = (/obj/random/trash_pile,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"vx" = (/obj/machinery/gateway{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) +"vy" = (/turf/simulated/floor/water/beach/corner{dir = 4},/area/tether_away/beach/coast) +"vN" = (/obj/structure/table/standard,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"vT" = (/obj/machinery/atmospherics/pipe/simple/hidden/fuel{dir = 10},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"wo" = (/obj/structure/handrail{dir = 1},/obj/machinery/alarm/alarms_hidden{dir = 4; pixel_x = -26},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/light{dir = 8},/obj/structure/closet/autolok_wall{dir = 1; pixel_y = -32},/obj/structure/railing/grey{dir = 4},/obj/structure/bed/chair/bay/comfy{dir = 4},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"wp" = (/obj/machinery/atmospherics/pipe/manifold/visible{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"ww" = (/mob/living/simple_mob/vore/aggressive/deathclaw,/turf/simulated/mineral/floor/cave{name = "dirt"},/area/tether_away/beach/resort) +"wY" = (/turf/simulated/floor/water/beach/corner{dir = 1},/area/tether_away/beach/coast) +"xc" = (/obj/machinery/gateway{dir = 1},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) +"xe" = (/obj/structure/handrail,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"xf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"xM" = (/obj/item/stack/cable_coil,/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/item/weapon/melee/baton/cattleprod{desc = "Metal rod with wire attached to it."; name = "jury-rigged antenna"; pixel_x = 5; pixel_y = 4},/obj/item/weapon/cell/emergency_light{pixel_x = -4},/obj/item/device/radio/off{channels = list("Talon" = 1); pixel_x = 4; pixel_y = -3},/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) +"xS" = (/obj/item/clothing/head/soft/black,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"xU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"xZ" = (/turf/simulated/mineral/floor/cave{name = "dirt"},/area/tether_away/beach/resort) +"yc" = (/obj/structure/barricade,/obj/structure/barricade/planks,/turf/simulated/mineral/floor/cave{name = "dirt"},/area/tether_away/beach/resort) +"yd" = (/turf/simulated/wall/shull,/area/tether_away/beach/resort) +"yn" = (/obj/structure/table/steel_reinforced,/obj/machinery/door/blast/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "trade"; name = "Shop Shutters"; opacity = 0},/obj/structure/railing/grey{dir = 1},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window/brigdoor/eastleft{layer = 2.9; open_layer = 2.9; req_access = list(); req_one_access = list(160)},/obj/random/mug,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"yw" = (/obj/structure/closet/autolok_wall{pixel_y = 32},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"zX" = (/obj/structure/salvageable/computer,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"Af" = (/obj/machinery/door/airlock/glass_external/public,/obj/effect/map_helper/airlock/door/ext_door,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"Aq" = (/obj/machinery/gateway{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) +"As" = (/obj/tether_away_spawner/beach_outside,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach/resort) +"AE" = (/obj/effect/map_helper/airlock/sensor/chamber_sensor,/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1},/obj/machinery/airlock_sensor{dir = 4; pixel_x = -21; req_one_access = list(160)},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"AI" = (/turf/simulated/floor/water/beach{dir = 1},/area/tether_away/beach/coast) +"Cd" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/fuel{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"Cw" = (/obj/machinery/alarm/alarms_hidden{dir = 8; pixel_x = 26},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"Cx" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 6},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"Dt" = (/obj/machinery/gateway{dir = 10},/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) +"DJ" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/effect/floor_decal/industrial/outline,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"DW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 1},/obj/effect/catwalk_plated,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"Em" = (/turf/simulated/floor/outdoors/newdirt,/area/tether_away/beach/resort) +"ET" = (/turf/simulated/floor/outdoors/grass,/area/tether_away/beach/resort) +"Fr" = (/obj/structure/barricade,/obj/structure/barricade/planks,/turf/simulated/floor/outdoors/newdirt,/area/tether_away/beach/resort) +"Ft" = (/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{dir = 1},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"FK" = (/obj/structure/hull_corner,/turf/simulated/floor/outdoors/newdirt,/area/tether_away/beach/resort) +"FP" = (/obj/effect/decal/remains,/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) +"FX" = (/obj/structure/bed/chair/bay/comfy{dir = 4},/obj/effect/decal/remains,/obj/item/clothing/under/utility,/obj/item/clothing/shoes/boots/workboots,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"Gv" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/railing/grey{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"Gy" = (/obj/machinery/light,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"GX" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"Hg" = (/obj/structure/girder,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"Ht" = (/obj/structure/handrail{dir = 1},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"Hx" = (/obj/effect/decal/remains,/turf/simulated/floor/outdoors/newdirt,/area/tether_away/beach/resort) +"HH" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"HN" = (/obj/effect/overlay/coconut,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach) +"HY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"IZ" = (/obj/machinery/gateway,/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) +"Jd" = (/obj/machinery/gateway{dir = 6},/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) +"Jr" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 5},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"JB" = (/obj/machinery/gateway/centeraway{calibrated = 0},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) +"Km" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/structure/railing/grey{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"KH" = (/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"Lt" = (/obj/effect/overmap/visitable/sector/virgo4,/turf/simulated/floor/water/deep/ocean,/area/tether_away/beach/water) +"Mm" = (/obj/machinery/door/firedoor/glass,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/airlock/voidcraft{req_one_access = list(160)},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"Mr" = (/obj/structure/bed/chair,/obj/effect/decal/remains,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"MI" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/effect/floor_decal/industrial/outline,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"MM" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/fuel{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"MO" = (/obj/structure/table/steel,/obj/machinery/light_switch{dir = 8; pixel_x = -22},/obj/structure/closet/walllocker_double/kitchen/south,/obj/item/device/multitool{pixel_x = 4; pixel_y = 2},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"NH" = (/obj/machinery/light/small{dir = 1},/obj/random/trash_pile,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"NY" = (/obj/effect/overlay/palmtree_r,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach) +"Od" = (/obj/machinery/atmospherics/pipe/simple/hidden/universal,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"OJ" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"OR" = (/obj/structure/handrail{dir = 1},/obj/structure/closet/walllocker_double/south{name = "Storage Locker"},/obj/random/multiple/corp_crate,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"Pd" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"Po" = (/obj/structure/table/standard,/obj/item/weapon/pen,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"PI" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"Qo" = (/turf/simulated/floor/water/beach{dir = 4},/area/tether_away/beach/coast) +"Qx" = (/obj/structure/bed/chair/bay/chair,/obj/structure/handrail,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 24},/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/closet/autolok_wall{dir = 8; pixel_x = -32},/obj/effect/decal/remains,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"QK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 1},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"QZ" = (/obj/effect/overlay/coconut,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach/resort) +"Rs" = (/turf/simulated/wall/r_wall,/area/tether_away/beach/resort) +"RJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) +"Sk" = (/obj/structure/handrail{dir = 1},/obj/random/trash_pile,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"Sp" = (/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach) +"Ss" = (/obj/machinery/light_switch{dir = 4; pixel_x = 22},/obj/structure/bed,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"SC" = (/obj/structure/railing/grey{dir = 8},/obj/structure/handrail{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/closet/walllocker_double/south{name = "Voidsuit Locker"},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"SG" = (/obj/effect/decal/remains,/turf/simulated/mineral/floor/cave{name = "dirt"},/area/tether_away/beach/resort) +"Th" = (/obj/structure/table,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"TB" = (/obj/effect/landmark/gateway_scatter,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach) +"TQ" = (/obj/structure/salvageable/console,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"TR" = (/obj/machinery/power/port_gen/pacman,/obj/structure/cable{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) +"TW" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -28},/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/structure/handrail,/obj/machinery/light{dir = 8},/obj/structure/closet/autolok_wall{pixel_y = 32},/obj/structure/railing/grey{dir = 4},/obj/item/weapon/gun/projectile/pistol,/obj/item/ammo_magazine/m9mm/compact,/obj/item/ammo_magazine/m9mm/compact,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"Uk" = (/obj/structure/catwalk,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"Uu" = (/obj/machinery/light,/obj/structure/closet/walllocker_double/south{name = "Storage Locker"},/obj/structure/closet/crate/secure/loot,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"Uy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"UB" = (/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach/resort) +"Ve" = (/obj/machinery/door/blast/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "trade"; name = "Shop Shutters"; opacity = 0},/obj/structure/table/steel_reinforced,/obj/machinery/door/window/brigdoor/eastright{layer = 2.9; open_layer = 2.9; req_access = list(); req_one_access = list(160)},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"Vs" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) +"VD" = (/obj/structure/salvageable/server,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"Wb" = (/turf/simulated/floor/water/beach{dir = 9},/area/tether_away/beach/coast) +"Wm" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"WJ" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"WS" = (/obj/structure/barricade,/obj/structure/barricade/planks,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"Xf" = (/obj/machinery/door/airlock/glass_external/public,/obj/effect/map_helper/airlock/door/ext_door,/obj/effect/map_helper/airlock/sensor/ext_sensor,/obj/machinery/airlock_sensor/airlock_exterior/shuttle{pixel_x = 24; pixel_y = -11},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"Xl" = (/obj/item/weapon/circuitboard/broken,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"Xo" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/handrail{dir = 1},/obj/structure/closet/walllocker_double/south{name = "Storage Locker"},/obj/structure/closet/crate/secure/loot,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"Xw" = (/obj/item/weapon/circuitboard/broken,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"Xx" = (/obj/machinery/atmospherics/portables_connector,/obj/effect/floor_decal/industrial/outline/blue,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"XA" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/outdoors/grass,/area/tether_away/beach/resort) +"XJ" = (/obj/random/multiple/corp_crate,/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) +"XT" = (/turf/unsimulated/wall/planetary/normal/virgo4,/area/tether_away/beach/water) +"Yj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8},/obj/effect/map_helper/airlock/atmos/chamber_pump,/obj/structure/closet/walllocker/emerglocker/east,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) +"YD" = (/obj/structure/handrail{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) +"YN" = (/obj/machinery/atmospherics/portables_connector,/obj/effect/floor_decal/industrial/outline/blue,/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/tether_away/beach/resort) +"ZX" = (/turf/simulated/mineral/ignore_mapgen,/area/tether_away/beach/resort) +"ZZ" = (/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/cave{name = "dirt"},/area/tether_away/beach/resort) + +(1,1,1) = {" +XTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSWbAIAIAIAIdZoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSWbvySpSpSpSpcRdZoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSWbAIvySpSpSpSpSpSpcRdZoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSWbvySpSpSpSpUBUBSpSpSpQooSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSWbAIvySpSpSpUBZXZXZXZXSpSpcRdZoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSWbvySpSpSpSpUBZXZXZXZXZXUBSpSpcRdZoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSWbvySpSpSpUBZXZXZXZXZXZXZXZXSpSpSpQooSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSWbAIAIAIAIdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSWbvySpSpSpUBZXZXZXZXZXZXZXZXZXUBSpSpQooSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSWbvySpSpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoScqSpSpSpZXZXZXZXZXZXZXZXZXZXZXZXSpSpcRAIdZoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoScqSpSpSpSpSpSpcRAIdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXUBSpSpSpcRAIAIAIdZoSoSfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoScqSpTBUBUBSpSpSpSpcRAIAIAIAIAIdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSWbvySpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpSpSpSpSpSpSpcRdZoSoSfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBSpSpSpSpSpSpSpSpSpcRAIAIAIAIAIdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSWbvySpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpSpSpSpSpSpcRdZoSfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBueUBUBSpSpSpSpSpSpSpSpSpSpSpSpSpcRAIAIAIAIAIAIAIdZoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoScqSpSpUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBSpSpSpQooSoSoSfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoScqSpSpUBUBUBUBUBUBUBUBUBUBUBUBSpSpSpSpSpSpSpSpSpSpSpSpSpSpSpcRAIAIdZoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBSpSpSpQooSoSoSoSfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBUBETETETETETETETETUBUBUBUBUBUBSpSpSpSpSpSpSpSpSpSpSpSpcRdZoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBSpSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpUBETETETETETETETETETETETETETETETUBUBUBUBUBfOUBUBUBUBSpSpSpSpeIcRdZoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpETETETETETETETETETETETETETETETETETETETUBUBUBUBUBUBUBgDQZUBUBSpSpSpcRdZoSoSoSoSoSfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbAIAIvySpSpSpETETETETETETETETETETETETETETETETETETETETETETUBUBUBUBUBUBUBUBUBUBSpSpSpQooSoSoSoSoSfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpSpSpUBETETETETETETETETETETETETETETETETETETETETETETETUBUBUBUBUBUBUBUBUBUBgCSpcRdZoSoSoSoSfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSjkwYSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpSpUBUBETETETETETETETETETETETETETsFsFsFsFsFsFETETETETETUBUBUBUBUBUBUBUBfOUBSpSpSpQooSoSoSoSoSfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoScqSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBUBETETETETETETETETsFsFsFsFEmydydydydydydydEmETETETETETUBUBUBUBUBUBUBQZUBUBSpSpQooSoSoSoSoSfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoScqSpSpSpUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBETETETETETETETsFsFsFsFEmEmEmKHKHxeajKHjHEmEmEmETETETETETETETETUBUBUBUBUBUBSpSpQooSoSoSoSoSfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSjkwYSpSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpQooSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBETETETETETETETsFsFsFsFEmEmEmEmEmuLUkUkUkUkKHEmsFsFsFETETETETETETETUBUBUBUBUBSpSpQooSoSoSoSoSfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSjkwYSpSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpQooSoSoSoSoSoSoSoSoSoSoSWbAIvySpSpSpUBUBETETETETETETETsFsFsFsFsFsFsFsFsFEmydnLydydydEmsFsFsFydsFETETETETETETETUBUBUBUBSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSjkkJwYSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpSpQooSoSoSoSoSoSoSoSoSoSWbvySpSpSpSpUBUBETETETETETETFKydydydjuydsFsFsFhCsFsFsFsFsFsFsFFPsFydydydsFhCsFETETydydETETUBUBUBSpSpcRdZoSoSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpjyfCoSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBUBUBETETETETEmEmydydydNHKHYNXxsFsFsFsFKHsFKHEmEmEmsFsFsFXJsFsFsFsFEmKHSsydETETUBUBUBUBSpSpQooSoSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpUBZXZXZXZXZXZXZXZXZXZXZXSpSpjyfCoSoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBUBETETETEmEmEmEmKHoYMMFtvTJrwpsFEmEmEmEmEmEmEmjuEmEmEmEmsFEmEmEmEmEmUyCwydydenenWmUBUBSpSpQooSoSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpUBZXZXZXZXZXZXZXZXZXSpSpjyfCoSoSoSoSoSoSoSoSoSoSWbvySpSpSpUBUBUBUBETETETETEmEmEmmVGyCdKHkjOJOdajsFsFsFEmydydydydEmEmjusFsFKHsFEmEmKHHYydydTWjJTQPdWmUBSpSpcRdZoSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBZXZXZXZXZXZXZXSpSpQooSoSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBUBUBETETETETETETsFEmjuydydrSpXsFsFsFsFhCsFsFKHsFsFsFsFsFsFydydsFEmEmbRKHpBtOxUhjkkFXpJHHUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpSpSpUBZXZXZXZXZXUBSpSpQooSoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBUBUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFEmEmEmEmKHKHKHsFsFsFEmEmEmEmEmxfDWbhoeqfKHcKpJHHUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkkJwYSpSpSpSpUBUBUBUBUBSpSpQooSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBUBUBUBETETETETsFsFEmEmKHsFsFEmEmEmEmHxEmEmEmKHKHKHKHKHKHKHsFsFsFsFsFEmEmydMmydydwoxSjXPdgVUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkkJwYSpSpSpSpUBUBSpSpjyfCoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBUBUBETETETETETEmEmKHKHKHKHEmEmEmEmKHmAYDKHKHGvGXahKmeyyntOtOSCHtsFEmEmEmKHWJCwydydcAcAgVUBUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkkJwYSpSpSpSpSpSpQooSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBUBUBUBETETETETsFsFEmmVKHuLEmEmEmKHKHKHupahydPIORSkUuXotGVetOrdydydQKKHEmEmEmKHsFETETETETETUBUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSWbAIAIAIAIAIAIdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpSpSpjyfCoSoSoSoSoSoSoSoSoSWbvySpSpUBfOUBUBUBUBETETETETsFEmEmEmHgjuEmEmEmEmEmKHydydydeQydydydydydydrNrNydQxWJKHKHsFsFsFsFETETETETUBUBUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSWbvySpSpHNSpSpSpcRAIAIdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkkJkJkJkJfCoSoSoSoSoSoSoSoSoSWbvySpSpgCUBUBQZUBUBETETETETsFsFsFsFEmEmEmEmEmEmEmEmydydajywKHUkKHUkCxoBkQAEYjydMOksbEsFsFTRsFsFETETETETUBUBUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpNYSpSpSpSpSpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpUBUBUBUBUBUBETETETETsFsFsFsFsFsFsFsFsFEmEmEmEmydydskUkjHajjHDJMIydmtYjydydnVydsFsFRJsFsFETETETETUBUBUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSWbvySpSpUBUBUBUBSpSpSpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbAIvySpeISpUBUBUBUBUBUBUBETETETETsFsFsFsFsFsFsFsFsFsFsFsFEmqQydydjujuydydHgydydAfXfydgusFsFsFsFRJsFsFETETETUBUBUBUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBUBfOUBUBUBUBSpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbAIvySpSpSpSpUBUBUBUBUBUBUBUBETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFEmEmEmEmEmsFsFsFsFsFsFsFsFsFsFsFsFxMVsmpXAXAimETUBUBUBUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpeIUBAsUBUBUBUBUBUBUBSpSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbAIvySpSpSpSpUBUBUBUBgDUBUBUBUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBSpSpSpQooSoSoSoSoSfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBUBUBUBUBUBUBUBfOSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpSpSpUBAsUBUBUBUBUBUBUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBSpSpjyfCoSoSoSoSoSfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSWbvySpSpUBUBUBUBZXZXUBUBUBUBUBSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpeIUBUBUBUBUBUBUBUBUBUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETETUBUBUBSpSpQooSoSoSoSoSoSfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBfOUBUBZXZXZXZXZXUBUBUBSpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpQZUBUBUBgDUBUBUBUBUBUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBSpSpSpQooSoSoSoSoSoSfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpQZUBUBZXZXZXZXZXZXUBUBUBUBSpSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBUBUBUBUBUBUBUBUBETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBSpSpjyfCoSoSoSoSoSoSfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoScqSpSpUBUBZXZXZXZXZXZXZXZXUBUBgDUBSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBUBUBUBUBUBETETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBUBSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSWbvySpSpUBETZXZXZXZXZXZXZXZXZXUBQZUBUBSpSpcRdZoSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBUBUBUBUBUBETETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBUBSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoScqSpSpSpUBETZXZXZXZXZXZXZXZXZXUBUBUBUBNYSpSpQooSoSoSoSoSoSoSoSoSoScqSpSpUBUBUBUBUBUBUBETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETETUBUBUBUBSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSWbvySpSpUBETETZXZXZXZXZXZXZXZXZXZXUBUBUBUBSpSpcRdZoSoSoSoSoSoSoSoSoScqSpSpUBUBfOUBUBUBETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETETUBUBUBUBUBSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSWbvySpSpUBETETETZXZXZXZXZXZXZXZXZXZXUBUBUBUBUBSpSpcRdZoSoSoSoSoSoSoSWbvySpSpUBUBUBUBUBUBETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETETETUBUBUBUBSpSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSWbAIvySpSpSpUBETETETZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBSpSpSpQooSoSoSoSoSoSoScqSpSpSpUBUBUBUBUBUBETETETETETsFsFsFsFsFsFsFsFsFsFETETETETsFsFETETETETETETETsFsFsFsFETETETETsFsFsFsFsFsFETETETETETETETETUBUBUBUBUBSpSpjyfCoSoSoSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSWbAIvySpSpSpSpUBETETETETZXZXZXZXZXZXZXZXZXZXZXUBUBgDUBUBSpSpQooSoSoSoSoSoSoScqSpSpUBUBUBUBUBUBUBETETETETETsFsFsFsFsFsFsFsFsFETETETETETETETETETETETETETETETETETETETETETETETsFsFETETETETETETETETETETETUBUBUBUBUBSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSWbvySpSpSpSpUBUBETETETETETZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBSpSpQooSoSoSoSoSoSWbvySpSpUBUBUBUBUBUBUBUBETETETETsFsFsFsFsFsFETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETUBUBUBUBUBSpSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSWbvySpSpSpUBUBUBETETETETETZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBSpSpcRdZoSoSoSoSoScqSpSpSpUBUBUBUBUBUBUBUBETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETUBUBUBUBUBSpSpSpjyfCoSoSoSoSoSoSfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSWbvySpSpSpUBETETETETETETETETZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBSpSpcRAIdZoSWbAIvySpSpUBUBUBUBUBUBUBUBUBUBETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETUBUBUBUBUBSpSpjyfCoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpSpUBETETETETETETETETZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBSpSpSpSpcRAIvySpSpSpSpUBUBUBUBUBUBUBUBUBUBUBETETETETETETETETETETETETETUBUBUBUBUBETETETETETETETETUBUBUBUBUBUBETETETETETETETETETETETETUBUBUBUBUBSpSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHoSoSoSWbvySpSpUBETETETETETETETETZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBSpSpSpSpSpSpSpSpSpUBUBUBUBUBUBUBUBUBUBUBUBUBETETETETETETETETETUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBETETETETETETETETETETUBUBUBSpSpSpSpjyfCoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBETETETETETZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBSpSpSpSpSpUBUBUBUBUBUBUBUBUBUBUBueUBUBUBUBUBUBUBETETETUBUBUBUBUBUBUBUBUBUBUBSpSpSpSpSpSpSpSpSpUBUBUBUBUBUBUBUBETETETETETETETUBUBUBSpSpSpjykJfCoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpETETETZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBSpSpSpSpSpSpSpSpSpSpSpSpSpNYUBQZUBfOUBUBUBUBETETETETUBUBUBSpSpSpjyfCoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpETETZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBUBUBUBETETETETETUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBSpSpSpSpSpjykJkJkJkJkJkJkJwYSpSpSpSpUBUBUBUBUBUBUBUBUBUBUBUBSpSpSpjyfCoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHoSoSoSWbvySpSpETETZXZXZXZXZXRsRsRsRsRsRsRsRsRsRsZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBETETETETETETETETETUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBSpSpSpSpSpSpjykJkJfCoSoSoSoSoSoSoSjkkJwYSpSpSpSpUBUBUBfOUBUBUBUBUBUBSpSpjyfCoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBETETZXZXZXZXZXRsoIxckxKHRszXVDjoRsZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBETETETETETETETETETETETETETUBUBUBUBUBUBUBUBUBUBUBUBSpSpSpSpSpSpjykJfCoSoSoSoSoSoSoSoSoSoSoSoSjkkJwYSpSpUBUBUBUBUBUBueUBUBUBSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHoSoSoSWbvySpSpUBETZXZXZXZXZXZXRsAqJBvxXwKHahahKHRsZXSGxZZXZXZXZXZXZXZXZXZXZXZXZXZXZXETETETETsFsFsFsFETETETETETETETETUBUBUBUBUBUBUBUBSpSpSpSpjykJkJkJfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpUBUBUBUBUBUBUBUBUBSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHoSoSoScqSpSpSpUBZXZXZXZXZXZXZXRsDtIZJdahKHKHsoKHWSxZxZxZxZxZZXZXZXZXZXZXZXZXZXZXZXZXETETsFsFsFsFsFsFsFETETETETETETETETUBUBUBUBUBUBSpSpSpjykJfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoScqSpNYSpUBueUBUBUBUBgDSpSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBZXZXZXZXZXZXZXZXRsahKHKHKHKHKHKHKHWSxZxZxZSGxZZXZXZXZXZXZXZXZXZXZXZXETETETsFsFsFsFsFsFsFETETETETETETETETETUBUBUBUBSpSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpSpUBUBUBUBUBUBSpSpjyfCoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBZXZXZXZXZXZXZXZXRsRsRsRsRsKHXlMrThRsZXZXZXxZxZxZZXZXZXZXZXZXZXZXZXETETETETsFsFsFsFsFsFsFsFETETETETETETETETUBUBUBUBSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpSpQZfOUBUBSpSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXRslJvNvNPoRsZXZXZXZXycycZXZXZXZXZXZXZXZXZXETETETETETsFsFsFsFsFsFsFsFsFETETETETETETUBUBUBUBSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSWbAIdZoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpSpSpSpSpSpSpjyfCoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXRsRsRsRsRsRsZXZXZXZXxZxZZXZXZXZXZXZXZXZXZXZXETETETETsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBUBSpSpcRdZoSoSoSoSoSoSoSoSoSWbAIAIvySpcRdZoSoSoSoSoSWbAIAIdZoSoSjkwYSpSpSpSpSpSpjyfCoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZxZZXZXZXZXZXZXZXZXZXETETETETsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBSpSpSpcRAIAIdZoSoSoSoSoSWbvySpSpSpSpSpcRdZoSoSoSWbvySpSpQooSoSoSjkkJkJkJkJkJkJfCoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZZZxZxZxZxZZXZXZXZXZXZXZXZXETETETETsFsFsFsFsFsFsFsFsFsFETETETETETETUBUBUBSpSpSpSpSpcRAIAIAIAIAIvySpSpSpSpSpSpSpQooSoSWbvyHNeIjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZxZxZxZxZxZxZxZZXZXZXZXZXZXZXZXETETETsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBUBSpSpSpSpSpSpSpSpSpSpNYSpSpSpSpSpNYSpcRdZoSjkwYSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoScqNYSpUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZSGxZxZxZxZxZxZSGZXZXZXZXZXZXZXZXETETETETsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBUBUBUBfOSpgCSpSpSpSpSpSpSpeISpSpgCSpSpQooSoSjkkJkJfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZZZxZxZxZxZxZxZZZxZxZxZZXZXZXZXZXZXZXETETETETsFsFsFsFsFsFsFsFsFsFsFsFETETETETUBUBUBUBUBSpSpSpSpSpSpSpSpSpgCSpSpSpSpSpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZxZxZxZwwxZxZxZxZxZxZZXZXZXZXZXZXETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETUBUBSpSpSpSpSpSpSpSpNYHNSpSpSpSpSpNYSpSpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZxZxZxZxZxZZZxZxZZZxZZXZXZXZXZXETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETUBSpSpSpjykJwYSpSpjykJwYSpSpSpSpSpHNSpSpNYjykJfCoSoSoSfHfHfHoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpgDUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZZZZZxZxZxZxZxZxZxZZXZXZXZXZXETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETUBSpSpjyfCoSjkkJkJfCoSjkkJwYSpSpSpSpSpjykJfCoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZZZxZxZxZxZxZxZZXZXZXZXZXETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETUBUBSpSpQooSoSoSoSoSoSoSoSoSjkkJkJkJkJkJfCoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZxZSGxZxZxZxZZXZXZXZXZXETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBUBSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHoSoSoSoSjkwYSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZxZxZxZiMZXZXETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBUBSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZmrFrFrEmETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBSpSpSpQooSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHoSoSoSoScqSpNYQZUBUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXiMFrEmEmETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpSpUBUBUBUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXEmETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETUBSpSpSpQooSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHoSoSoSjkwYSpSpSpUBUBUBUBUBETETETETZXZXZXZXZXZXZXZXZXZXZXZXZXETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBSpSpjyfCoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHoSoSoSoSjkwYSpSpUBUBUBUBUBETETETETETZXZXZXZXZXZXZXZXZXZXZXETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBSpSpQooSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpeISpUBfOUBUBUBUBETETETETETETZXZXZXZXZXZXETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBSpSpcRdZoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSjkwYSpSpSpSpHNSpUBUBETETETETETETETETETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBSpSpSpQooSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSjkwYSpSpSpSpSpSpSpUBUBETETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETUBUBUBSpSpcRdZoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSjkkJkJkJkJwYSpSpSpSpUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBUBSpSpcRAIdZoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSjkkJwYSpSpUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBUBSpSpSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSjkwYSpSpUBETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBSpSpSpcRdZoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoScqSpSpUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETsFsFsFsFsFsFETETETETETETUBUBUBUBSpSpSpcRdZoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoScqSpSpUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETETETETETETETETETETETETETETETETETETETETUBUBUBUBUBUBSpSpSpcRdZoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSjkwYSpSpUBETETETETsFsFsFsFsFsFsFsFsFsFsFETETETETETETETETETETETETETETETETETETETETETETETETETETUBUBUBUBUBUBUBSpSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoScqSpSpUBETETETETsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBETETETETETETETETETETETETETETETETETETUBUBUBUBUBgDUBUBUBSpSpcRdZoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoScqSpSpUBETETETETETETsFsFsFsFsFsFsFETETETETETUBUBUBUBUBUBUBUBETETETETETETETETETETETETUBUBUBUBUBUBUBUBUBUBUBUBSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoScqSpSpUBETETETETETETsFsFsFsFsFsFETETETETETUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBETETETETETETsFsFsFsFsFETETETETETUBUBgDUBSpSpSpSpUBUBfOUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBAsUBSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSjkwYSpSpETETETETETETETsFsFsFETETETETETETUBQZSpSpSpSpSpSpSpUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBfOUBUBUBUBUBUBSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpETETETETETETETETETETETETETETETUBUBSpSpSpjykJwYSpSpUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBfOUBUBSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBETETETETETETETETETETETETETETUBUBSpSpjyfCoScqSpSpSpSpSpUBUBUBUBUBUBUBUBAsUBUBUBfOUBUBUBUBUBUBUBUBSpSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBUBETETETETETETETETETETETETETUBSpSpSpQooSoSjkwYSpSpSpSpSpSpSpHNgDUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBSpSpSpjyfCoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBUBUBETETETETETETETETETETETUBfOSpSpjyfCoSoSoSjkkJkJwYSpSpSpSpSpSpSpUBUBUBUBUBUBUBUBUBUBgDQZUBUBSpSpjyfCoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoScqSpSpUBUBUBETETETETETETETETETETUBUBSpSpSpQooSoSoSoSoSoSoSjkkJkJkJkJwYSpSpSpSpUBUBUBUBAsUBUBUBUBUBUBUBSpSpQooSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSjkwYSpSpUBUBETETETETETETETETUBUBUBUBSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSjkkJwYSpSpSpUBUBUBUBUBUBUBUBUBUBUBSpSpQooSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoScqSpSpUBUBETETETETETETETUBUBUBUBUBSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpUBUBUBUBUBUBUBUBAsUBfOSpSpQooSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoScqSpSpUBUBUBETETETUBUBUBUBUBUBfOSpSpSpQooSoSoSoSoSWbAIAIAIAIAIdZoSoSoSoSjkwYSpSpUBUBUBUBfOUBUBUBUBUBSpSpQooSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoScqSpSpUBUBUBUBUBUBUBUBUBfOUBUBSpSpSpjyfCoSoSoSWbAIvySpSpSpSpSpcRdZoSoSoSoScqSpSpSpSpSpSpQZUBUBUBUBSpSpSpQooSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoScqSpSpUBUBUBUBUBUBUBUBUBQZUBUBSpSpjyfCoSoSoSWbvySpSpSpSpSpSpSpSpcRdZoSoSoSjkwYSpSpSpSpSpSpSpSpSpSpSpSpjyfCoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoScqSpNYSpUBUBUBUBUBUBUBUBUBgDSpSpjyfCoSoSoSoScqSpSpHNeISpSpSpNYSpSpcRdZoSoSoSjkkJkJkJwYSpSpSpSpSpSpjykJfCoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSjkwYSpSpUBUBUBUBgDUBUBUBUBSpSpSpQooSoSoSoSoSjkwYSpSpSpSpNYTBSpHNSpSpcRAIdZoSoSoSoSoSjkkJkJkJkJkJkJfCoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSjkwYSpSpUBUBUBUBUBUBUBSpSpSpjyfCoSoSoSoSoSoSjkkJwYSpSpSpSpSpSpSpSpSpSpcRAIdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoScqSpSpNYUBUBUBUBUBSpSpSpjyfCoSoSoSoSoSoSoSoSoSjkkJkJkJwYSpSpTBSpeISpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSjkwYHNSpSpSpSpSpSpSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkkJwYSpSpSpSpSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoScqSpSpSpSpSpSpSpjykJfCoSoSoSoSoSfHfHfHoSoSoSoSoSoSoSoSoSjkwYSpSpSpSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSjkwYSpSpSpSpSpSpQooSoSoSoSoSfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSjkkJkJkJkJkJfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSjkkJkJkJkJkJkJfCoSoSoSfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTLtfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT +XTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXT +"} diff --git a/maps/gateway_vr/variable/arynthilake_a.dmm b/maps/gateway_vr/variable/arynthilake_a.dmm index afc16589d3..41a8be8f09 100644 --- a/maps/gateway_vr/variable/arynthilake_a.dmm +++ b/maps/gateway_vr/variable/arynthilake_a.dmm @@ -1143,16 +1143,16 @@ /obj/random/meat, /obj/random/meat, /obj/random/meat, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, diff --git a/maps/gateway_vr/variable/arynthilake_b.dmm b/maps/gateway_vr/variable/arynthilake_b.dmm index bbba59342e..53c799bac4 100644 --- a/maps/gateway_vr/variable/arynthilake_b.dmm +++ b/maps/gateway_vr/variable/arynthilake_b.dmm @@ -157,16 +157,16 @@ /obj/random/meat, /obj/random/meat, /obj/random/meat, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, diff --git a/maps/gateway_vr/wildwest.dmm b/maps/gateway_vr/wildwest.dmm index 2a42bcc14f..12a79c33ec 100644 --- a/maps/gateway_vr/wildwest.dmm +++ b/maps/gateway_vr/wildwest.dmm @@ -676,9 +676,9 @@ /area/awaymission/wwmines) "fb" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwmines) "fc" = ( diff --git a/maps/groundbase/eastwilds/eastwilds1.dmm b/maps/groundbase/eastwilds/eastwilds1.dmm index 28b038004a..fc499a6095 100644 --- a/maps/groundbase/eastwilds/eastwilds1.dmm +++ b/maps/groundbase/eastwilds/eastwilds1.dmm @@ -29,6 +29,12 @@ "r" = ( /turf/simulated/mineral/cave/virgo3c, /area/submap/groundbase/wilderness/east/cave) +"u" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/deep/virgo3c, +/area/submap/groundbase/wilderness/east) "w" = ( /obj/effect/map_effect/portal/master/side_a/gb_wilds/east_west{ dir = 8 @@ -38,6 +44,12 @@ "y" = ( /turf/simulated/mineral/ignore_cavegen, /area/submap/groundbase/wilderness/east) +"B" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/virgo3c, +/area/submap/groundbase/wilderness/east) "F" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/submap/groundbase/wilderness/east/unexplored) @@ -2383,7 +2395,7 @@ U U U U -U +u U U U @@ -2653,7 +2665,7 @@ U U U U -U +u U U U @@ -2972,7 +2984,7 @@ U U U U -U +u U U U @@ -3421,7 +3433,7 @@ U U U U -U +u U U U @@ -3513,7 +3525,7 @@ U U U U -U +u U U U @@ -4779,7 +4791,7 @@ Z U U U -U +u U U U @@ -4839,7 +4851,7 @@ Z Z Z U -U +u U U U @@ -5212,7 +5224,7 @@ U U U U -U +u U U U @@ -5245,7 +5257,7 @@ Z Z U U -U +u U U U @@ -5414,7 +5426,7 @@ U U U U -U +u Z Z Z @@ -6518,7 +6530,7 @@ F V V Z -Z +B Z Z Z @@ -6908,7 +6920,7 @@ Z Z Z Z -U +u U U U @@ -6971,7 +6983,7 @@ U U U U -U +u U U Z @@ -8192,7 +8204,7 @@ U U U U -U +u U U U @@ -8245,7 +8257,7 @@ U U U U -U +u U U U @@ -9461,7 +9473,7 @@ r r Z Z -Z +B Z U U @@ -10186,7 +10198,7 @@ U U U U -U +u U U Z @@ -10322,7 +10334,7 @@ U U U U -U +u U U U @@ -10374,7 +10386,7 @@ U U U U -U +u U U U @@ -11219,7 +11231,7 @@ Z U U U -U +u U U U @@ -11373,7 +11385,7 @@ U U U U -U +u U Z Z @@ -11476,7 +11488,7 @@ U U U U -U +u U U U @@ -12337,7 +12349,7 @@ U U U U -U +u U U U @@ -12456,7 +12468,7 @@ Z Z Z U -U +u U U U @@ -12778,7 +12790,7 @@ U U U U -U +u U U U @@ -13757,7 +13769,7 @@ Z Z U U -U +u U U U @@ -13767,7 +13779,7 @@ Z Z Z Z -Z +B Z Z Z @@ -15893,7 +15905,7 @@ V V V Z -Z +B Z Z Z diff --git a/maps/groundbase/eastwilds/eastwilds2.dmm b/maps/groundbase/eastwilds/eastwilds2.dmm index fdd0dfdc34..33a58e58c2 100644 --- a/maps/groundbase/eastwilds/eastwilds2.dmm +++ b/maps/groundbase/eastwilds/eastwilds2.dmm @@ -37,6 +37,12 @@ }, /turf/simulated/floor/water/deep/virgo3c, /area/submap/groundbase/wilderness/east) +"B" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/deep/virgo3c, +/area/submap/groundbase/wilderness/east) "F" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/submap/groundbase/wilderness/east/unexplored) @@ -46,6 +52,12 @@ }, /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/submap/groundbase/wilderness/east) +"I" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/virgo3c, +/area/submap/groundbase/wilderness/east) "V" = ( /obj/effect/map_effect/portal/master/side_b/gb_wilds/east{ dir = 4 @@ -949,7 +961,7 @@ Z Z Z t -t +B t t Z @@ -3082,7 +3094,7 @@ l l Z Z -Z +I t t t @@ -5071,7 +5083,7 @@ Z Z Z Z -Z +I n n F @@ -5917,7 +5929,7 @@ F n Z Z -Z +I Z Z Z @@ -6912,7 +6924,7 @@ t t t t -Z +I Z Z Z @@ -7225,7 +7237,7 @@ Z t t t -t +B t t t @@ -7515,7 +7527,7 @@ t t Z Z -Z +I Z n n @@ -8044,7 +8056,7 @@ Z Z Z Z -t +B t t t @@ -8128,7 +8140,7 @@ n n Z Z -Z +I Z Z Z @@ -8341,7 +8353,7 @@ t t t t -Z +I Z Z Z @@ -8695,7 +8707,7 @@ Z Z t t -t +B t t t @@ -8904,7 +8916,7 @@ t t Z Z -Z +I Z Z Z @@ -8992,7 +9004,7 @@ t t t t -t +B Z Z Z @@ -9067,7 +9079,7 @@ n n Z Z -Z +I t Z Z @@ -9412,7 +9424,7 @@ t t t t -t +B t t t @@ -9689,7 +9701,7 @@ n Z Z Z -Z +I t t t @@ -10688,7 +10700,7 @@ Z t t t -t +B t t t @@ -11336,7 +11348,7 @@ n n n Z -Z +I Z n n @@ -11513,7 +11525,7 @@ t t t t -t +B t t t @@ -11532,7 +11544,7 @@ Z Z t t -t +B t t t @@ -12521,7 +12533,7 @@ t t t t -t +B t t t @@ -12787,7 +12799,7 @@ t t t t -t +B t t t @@ -13531,7 +13543,7 @@ t t t t -t +B t Z Z @@ -13953,7 +13965,7 @@ t t t t -t +B t t t @@ -14303,7 +14315,7 @@ Z Z Z Z -Z +I Z Z Z @@ -14620,7 +14632,7 @@ n n Z Z -Z +I Z Z Z @@ -14644,6 +14656,7 @@ Z Z Z t +B t t t @@ -14655,8 +14668,7 @@ t t t t -t -t +B t t t @@ -16027,7 +16039,7 @@ Z Z Z Z -Z +I Z Z Z @@ -16081,6 +16093,7 @@ t t t t +B t t t @@ -16090,8 +16103,7 @@ t t t t -t -t +B t t t @@ -16352,7 +16364,7 @@ Z Z t t -t +B t t t @@ -16937,7 +16949,7 @@ t t t t -t +B t t t @@ -17085,7 +17097,7 @@ t t t t -t +B Z Z Z diff --git a/maps/groundbase/gb-centcomm.dmm b/maps/groundbase/gb-centcomm.dmm index bf2655e628..5e79cb7dc5 100644 --- a/maps/groundbase/gb-centcomm.dmm +++ b/maps/groundbase/gb-centcomm.dmm @@ -161,8 +161,8 @@ /area/centcom/control) "aG" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/martin, -/obj/item/weapon/gun/energy/gun/martin, +/obj/item/weapon/gun/energy/gun/compact, +/obj/item/weapon/gun/energy/gun/compact, /obj/item/device/flash, /obj/item/device/flash, /turf/simulated/floor/tiled{ @@ -710,8 +710,8 @@ /area/centcom/terminal) "cv" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/martin, -/obj/item/weapon/gun/energy/gun/martin, +/obj/item/weapon/gun/energy/gun/compact, +/obj/item/weapon/gun/energy/gun/compact, /obj/item/device/flash, /obj/item/device/flash, /turf/simulated/floor/tiled/dark, diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index 10e7a0f4b7..9faa853c6b 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -53,6 +53,13 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) +"ag" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/alarm, +/turf/simulated/floor, +/area/maintenance/groundbase/substation/aiciv) "ah" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -335,6 +342,18 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos/monitoring) +"aN" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/firealarm{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/groundbase/substation/aiciv) "aO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 9 @@ -372,6 +391,18 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/or1) +"aU" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/mob/living/simple_mob/vore/alienanimals/catslug/custom/engislug{ + ghostjoin = 1 + }, +/turf/simulated/floor/tiled, +/area/groundbase/engineering/lobby) "aV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light_switch{ @@ -395,6 +426,18 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) +"aY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/mob/living/simple_mob/vore/alienanimals/catslug/custom/gatslug{ + ghostjoin = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "aZ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -455,6 +498,16 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) +"bk" = ( +/obj/structure/bed/chair/office/dark, +/obj/machinery/button/windowtint/multitint{ + id = "detoffice"; + pixel_x = -15; + pixel_y = -30 + }, +/obj/effect/landmark/start/detective, +/turf/simulated/floor/carpet, +/area/groundbase/security/detective) "bl" = ( /obj/machinery/power/apc, /obj/structure/cable/yellow, @@ -2033,6 +2086,8 @@ /obj/structure/sign/painting/library_secure{ pixel_y = -30 }, +/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/weapon/reagent_containers/glass/rag, /turf/simulated/floor/lino, /area/groundbase/civilian/cafe) "fk" = ( @@ -3809,16 +3864,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/groundbase/engineering/atmos) -"jN" = ( -/obj/structure/bed/chair/office/dark, -/obj/machinery/button/windowtint/multitint{ - id = "detoffice0"; - pixel_x = -15; - pixel_y = -30 - }, -/obj/effect/landmark/start/detective, -/turf/simulated/floor/carpet, -/area/groundbase/security/detective) "jO" = ( /obj/structure/cable/heavyduty{ icon_state = "1-4" @@ -4302,6 +4347,11 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) +"kP" = ( +/obj/structure/table/glass, +/obj/random/paicard, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "kQ" = ( /obj/machinery/power/apc{ dir = 8; @@ -4999,6 +5049,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/closet/secure_closet/atmos_personal, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos/monitoring) "mF" = ( @@ -6120,18 +6171,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/womensrestroom) -"pp" = ( -/mob/living/simple_mob/vore/alienanimals/catslug/custom/engislug{ - ghostjoin = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/groundbase/engineering/lobby) "pq" = ( /obj/structure/cable{ icon_state = "2-4" @@ -6658,8 +6697,8 @@ /obj/machinery/cell_charger{ pixel_y = 7 }, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, +/obj/item/weapon/cell/super, +/obj/item/weapon/cell/super, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) "qG" = ( @@ -7533,12 +7572,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/groundbase/civilian/arrivals) -"sI" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor, -/area/maintenance/groundbase/substation/aiciv) "sJ" = ( /obj/structure/table/rack, /obj/item/device/suit_cooling_unit, @@ -13713,6 +13746,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/random/paicard, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hos) "Hw" = ( @@ -14170,6 +14204,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/random/paicard, /turf/simulated/floor/tiled, /area/groundbase/engineering/ce) "Iy" = ( @@ -16174,6 +16209,8 @@ pixel_x = -3; pixel_y = 26 }, +/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/weapon/reagent_containers/glass/rag, /turf/simulated/floor/lino, /area/groundbase/civilian/bar) "Nh" = ( @@ -17623,15 +17660,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/womensrestroom) -"QW" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor, -/area/maintenance/groundbase/substation/aiciv) "QX" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -17892,6 +17920,12 @@ }, /turf/simulated/floor/outdoors/sidewalk/side/virgo3c, /area/groundbase/level1/centsquare) +"RB" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/deep/virgo3c, +/area/groundbase/level1/eastspur) "RC" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light{ @@ -18643,6 +18677,7 @@ departmentType = 2; pixel_y = 30 }, +/obj/item/weapon/gun/energy/mouseray/medical, /turf/simulated/floor/tiled/white, /area/groundbase/medical/equipment) "To" = ( @@ -19573,18 +19608,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/womensrestroom) -"VH" = ( -/mob/living/simple_mob/vore/alienanimals/catslug/custom/gatslug{ - ghostjoin = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) "VI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -25334,10 +25357,10 @@ WG WP WP Qi -sI +ag rq pq -QW +aN fk GJ Fi @@ -25353,7 +25376,7 @@ ht ht KR GF -GF +kP oQ uF pj @@ -27251,7 +27274,7 @@ wl wl wl tL -VH +aY Zq TC ti @@ -29658,7 +29681,7 @@ AZ yb Bp Uz -jN +bk jL dq cz @@ -35034,7 +35057,7 @@ MK Wl fv ga -pp +aU Cq Cq Cq @@ -39104,7 +39127,7 @@ df uH uH eW -eW +RB eW uH uH @@ -39657,7 +39680,7 @@ eW eW eW eW -eW +RB eW eW eW @@ -39688,11 +39711,11 @@ eW eW eW eW +RB eW eW eW -eW -eW +RB eW eW eW @@ -39959,13 +39982,13 @@ eW eW eW eW +RB eW eW eW eW eW -eW -eW +RB eW eW eW @@ -40236,7 +40259,7 @@ uH uH uH eW -eW +RB eW eW eW diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index 087f0a1eb5..304434ff5c 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -22,6 +22,16 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) +"ac" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/hologram/holopad, +/mob/living/simple_mob/vore/alienanimals/catslug/custom/medislug{ + ghostjoin = 1 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/medical/lobby) "ad" = ( /obj/structure/bed/chair/office/light{ dir = 1 @@ -35,6 +45,20 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/rd) +"ae" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark{ + name = "lightsout" + }, +/mob/living/simple_mob/vore/alienanimals/catslug/custom/capslug{ + ghostjoin = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/command/bridge) "af" = ( /obj/structure/railing/grey{ dir = 8 @@ -44,6 +68,12 @@ "ag" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/science/picnic) +"ah" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/groundbase/science/rnd) "ai" = ( /obj/machinery/door/airlock{ id_tag = null; @@ -51,6 +81,18 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/dorms/room2) +"aj" = ( +/obj/machinery/button/remote/blast_door{ + id = "cirshutters"; + name = "Privacy Shutter Control"; + pixel_y = 30 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/bed/chair/office/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/groundbase/science/circuits) "ak" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -58,6 +100,13 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) +"al" = ( +/obj/effect/landmark/start/roboticist, +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/groundbase/science/robotics) "am" = ( /obj/item/toy/figure/mime, /obj/item/weapon/pen/crayon/marker/mime, @@ -90,6 +139,22 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level2/ne) +"aq" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/camera/network/research{ + dir = 1 + }, +/obj/structure/table/standard, +/obj/machinery/computer/med_data/laptop{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/groundbase/science/robotics) "ar" = ( /obj/machinery/light, /obj/structure/bed/double/padded, @@ -131,6 +196,18 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) +"av" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/alarm{ + dir = 1 + }, +/obj/structure/bed/chair/office/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/groundbase/science/robotics) "ax" = ( /obj/structure/closet/secure_closet/personal, /obj/item/weapon/towel/random, @@ -466,7 +543,7 @@ /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) "bl" = ( -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/groundbase/civilian/kitchen/backroom) "bn" = ( /obj/machinery/door/airlock{ @@ -510,9 +587,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/medical/virology) -"bt" = ( -/turf/simulated/wall/r_wall, -/area/groundbase/science) "bu" = ( /obj/machinery/door/airlock/freezer{ name = "Kitchen"; @@ -673,6 +747,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/random/paicard, /turf/simulated/floor/wood, /area/groundbase/command/captainq) "bQ" = ( @@ -809,11 +884,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "cm" = ( /obj/structure/closet/secure_closet/freezer/meat, /turf/simulated/floor/tiled/eris/cafe, @@ -869,7 +941,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "ct" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1025,7 +1097,7 @@ "cU" = ( /obj/structure/table/bench/padded, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "cV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -2161,6 +2233,11 @@ outdoors = 0 }, /area/groundbase/cargo/office) +"go" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light/small/fairylights, +/turf/simulated/floor/outdoors/sidewalk/virgo3c, +/area/groundbase/level2/nw) "gq" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper_bin{ @@ -2399,7 +2476,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/groundbase/civilian/kitchen/backroom) "gZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2495,7 +2572,7 @@ /obj/structure/bed/chair/sofa/black, /obj/machinery/alarm, /obj/effect/landmark/start/chef, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/groundbase/civilian/kitchen/backroom) "hp" = ( /obj/structure/bed/chair/sofa/pew/left{ @@ -2672,7 +2749,7 @@ "hL" = ( /obj/machinery/light, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "hM" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -2719,7 +2796,7 @@ /area/rnd/xenobiology) "hU" = ( /obj/machinery/button/remote/blast_door{ - id = "rndshutters"; + id = "robshutters"; name = "Privacy Shutter Control"; pixel_y = 30 }, @@ -2766,7 +2843,7 @@ pixel_x = 32 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "hZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2795,7 +2872,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "ic" = ( /obj/structure/extinguisher_cabinet{ dir = 8; @@ -2870,7 +2947,7 @@ icon_state = "2-4" }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "ir" = ( /obj/machinery/firealarm{ dir = 8 @@ -2958,7 +3035,7 @@ }, /obj/effect/landmark/start/intern, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "iC" = ( /turf/simulated/wall/r_wall, /area/groundbase/command/hop) @@ -3271,7 +3348,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "jv" = ( /obj/machinery/appliance/cooker/grill, /turf/simulated/floor/tiled/eris/cafe, @@ -3450,7 +3527,7 @@ }, /obj/machinery/light, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "jU" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_research{ @@ -3780,7 +3857,7 @@ pixel_y = 5 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "kY" = ( /obj/machinery/power/apc{ dir = 8 @@ -3946,7 +4023,7 @@ }, /obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "lv" = ( /obj/structure/closet/secure_closet/hydroponics{ req_access = list(77) @@ -4090,6 +4167,10 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/Chemistry) +"lM" = ( +/obj/machinery/light/small/fairylights, +/turf/simulated/floor/outdoors/grass/virgo3c, +/area/groundbase/level2/nw) "lN" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -4274,7 +4355,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/groundbase/civilian/kitchen/backroom) "mo" = ( /obj/structure/table/woodentable, @@ -4446,7 +4527,7 @@ }, /obj/random/coin/sometimes, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "mN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -4531,7 +4612,7 @@ /area/groundbase/civilian/janitor) "nf" = ( /obj/structure/table/wooden_reinforced, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/groundbase/civilian/kitchen/backroom) "ng" = ( /obj/machinery/camera/network/research{ @@ -4657,20 +4738,6 @@ /obj/machinery/microwave, /turf/simulated/floor/wood, /area/groundbase/dorms/room8) -"nC" = ( -/mob/living/simple_mob/vore/alienanimals/catslug/custom/capslug{ - ghostjoin = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark{ - name = "lightsout" - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/command/bridge) "nD" = ( /obj/machinery/disposal/wall{ dir = 8; @@ -4953,7 +5020,9 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) "oy" = ( -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{ + outdoors = 0 + }, /area/groundbase/level2/se) "oA" = ( /obj/machinery/door/blast/regular{ @@ -5491,6 +5560,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) +"qc" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/groundbase/civilian/bar) "qd" = ( /obj/structure/sign/nanotrasen{ pixel_x = 32; @@ -5768,10 +5846,18 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) "qQ" = ( -/obj/structure/table/standard, -/obj/structure/noticeboard{ - pixel_y = -32 +/obj/structure/closet/chefcloset, +/obj/item/glass_jar, +/obj/item/device/retail_scanner/civilian, +/obj/item/weapon/soap/nanotrasen, +/obj/item/device/destTagger{ + pixel_x = 4; + pixel_y = 3 }, +/obj/item/weapon/packageWrap, +/obj/item/weapon/packageWrap, +/obj/item/weapon/packageWrap, +/obj/item/weapon/tool/wrench, /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) "qS" = ( @@ -5909,7 +5995,7 @@ /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, /turf/simulated/floor, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "rm" = ( /obj/machinery/light, /turf/simulated/floor/wood, @@ -6222,7 +6308,7 @@ }, /obj/effect/landmark/start/intern, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "se" = ( /obj/item/device/aicard, /obj/structure/table/reinforced, @@ -6266,7 +6352,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "sn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ @@ -6405,7 +6491,7 @@ dir = 5 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "sI" = ( /obj/structure/disposalpipe/sortjunction/flipped{ dir = 1; @@ -7175,18 +7261,18 @@ /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level2/northspur) "uU" = ( -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/reagent_containers/food/condiment/small/peppermill, @@ -7556,7 +7642,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "we" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -7663,7 +7749,7 @@ }, /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "ww" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -7907,7 +7993,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "xo" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/biochemistry/full, @@ -8105,7 +8191,7 @@ }, /obj/machinery/alarm, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "xN" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -8131,7 +8217,7 @@ /obj/structure/table/glass, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "xU" = ( /obj/structure/grille, /obj/machinery/door/firedoor, @@ -8230,13 +8316,13 @@ }, /obj/effect/landmark/start/intern, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "yh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "yj" = ( /obj/structure/sign/directions/kitchen{ pixel_x = -32 @@ -8424,7 +8510,7 @@ pixel_x = 32 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "yJ" = ( /obj/structure/bed/chair{ dir = 4 @@ -9066,14 +9152,8 @@ "AK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/power/apc{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "AL" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, @@ -9197,7 +9277,7 @@ }, /obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "AT" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/science/xenobot) @@ -9485,7 +9565,7 @@ icon_state = "4-8" }, /turf/simulated/floor/bmarble, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "BU" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -9627,7 +9707,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Cj" = ( /obj/structure/sign/directions/stairs_down{ pixel_y = 38 @@ -9737,7 +9817,7 @@ dir = 1 }, /turf/simulated/open, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "CE" = ( /turf/simulated/floor/wood, /area/groundbase/dorms/room8) @@ -10044,7 +10124,7 @@ pixel_x = 25 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Du" = ( /turf/simulated/wall, /area/groundbase/medical/lobby) @@ -10067,7 +10147,7 @@ }, /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Dy" = ( /obj/structure/table/reinforced, /obj/machinery/requests_console{ @@ -10243,7 +10323,7 @@ dir = 1 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "DV" = ( /obj/structure/table/rack, /obj/item/weapon/tank/jetpack/oxygen, @@ -10305,13 +10385,13 @@ }, /obj/effect/landmark/start/entertainer, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Ea" = ( /obj/structure/table/bench/padded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Eb" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -10597,7 +10677,7 @@ /area/groundbase/medical/psych) "EW" = ( /obj/structure/bed/chair/sofa/right/black, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/groundbase/civilian/kitchen/backroom) "EX" = ( /obj/structure/closet/secure_closet/quartermaster, @@ -10616,6 +10696,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/virology) +"EZ" = ( +/obj/machinery/light/small/fairylights, +/turf/simulated/floor/outdoors/newdirt/virgo3c, +/area/groundbase/level2/nw) "Fa" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -10828,7 +10912,7 @@ /area/groundbase/cargo/office) "FF" = ( /turf/simulated/wall, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "FI" = ( /obj/structure/fence/corner{ dir = 5 @@ -10894,7 +10978,7 @@ }, /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "FU" = ( /obj/structure/table/bench/standard, /obj/effect/landmark/start/rd, @@ -11024,7 +11108,7 @@ icon_state = "1-4" }, /turf/simulated/wall, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Gp" = ( /turf/simulated/wall, /area/groundbase/level2/nw) @@ -11130,6 +11214,12 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) +"Gz" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/groundbase/civilian/bar) "GA" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -11426,6 +11516,16 @@ }, /turf/simulated/floor/bmarble, /area/groundbase/civilian/chapel) +"Hr" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/small/fairylights, +/turf/simulated/floor/outdoors/sidewalk/virgo3c, +/area/groundbase/level2/nw) "Hs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -11476,10 +11576,6 @@ }, /turf/simulated/floor/bmarble, /area/groundbase/cargo/office) -"Hy" = ( -/obj/effect/landmark/start/roboticist, -/turf/simulated/floor/tiled, -/area/groundbase/science/robotics) "Hz" = ( /obj/structure/table/marble, /obj/machinery/camera/network/civilian{ @@ -11646,6 +11742,14 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/dorms/room7) +"HW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/freezer{ + name = "Kitchen"; + req_access = list(28) + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "HX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12074,15 +12178,6 @@ "Jc" = ( /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/level2/nw) -"Jd" = ( -/obj/machinery/button/remote/blast_door{ - id = "cirshutters"; - name = "Privacy Shutter Control"; - pixel_y = 30 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/groundbase/science/circuits) "Je" = ( /obj/effect/floor_decal/chapel, /obj/structure/disposalpipe/segment, @@ -12250,7 +12345,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "JD" = ( /obj/machinery/appliance/cooker/oven, /turf/simulated/floor/tiled/eris/cafe, @@ -13092,7 +13187,7 @@ "LS" = ( /obj/structure/table/glass, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "LT" = ( /obj/machinery/light/small{ dir = 8 @@ -13113,7 +13208,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "LW" = ( /obj/structure/sign/xenobio{ plane = -34 @@ -13391,7 +13486,7 @@ icon_state = "1-2" }, /turf/simulated/wall, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "ME" = ( /turf/simulated/wall, /area/groundbase/civilian/chapel/office) @@ -13647,16 +13742,6 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/triage) -"Np" = ( -/mob/living/simple_mob/vore/alienanimals/catslug/custom/medislug{ - ghostjoin = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled/white, -/area/groundbase/medical/lobby) "Nq" = ( /turf/simulated/floor/reinforced/virgo3c{ edge_blending_priority = -1 @@ -13684,7 +13769,7 @@ /area/groundbase/level2/ne) "Ny" = ( /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Nz" = ( /obj/structure/bed/chair/sofa/pew/right{ dir = 1 @@ -13825,7 +13910,7 @@ /obj/structure/bed/chair/sofa/black{ dir = 8 }, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/groundbase/civilian/kitchen/backroom) "NU" = ( /obj/structure/sign/painting/library_secure{ @@ -13924,7 +14009,7 @@ /obj/structure/bed/chair/sofa/left/black{ dir = 8 }, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/groundbase/civilian/kitchen/backroom) "Oi" = ( /obj/structure/disposalpipe/tagger{ @@ -13946,7 +14031,7 @@ layer = 3.3; pixel_y = -27 }, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/groundbase/civilian/kitchen/backroom) "Ok" = ( /obj/machinery/power/apc{ @@ -14086,7 +14171,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/computer/timeclock/premade/east, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "OD" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14521,7 +14606,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "PT" = ( /obj/machinery/button/remote/airlock{ dir = 8; @@ -14547,7 +14632,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "PV" = ( /turf/simulated/floor/wood, /area/groundbase/dorms/room2) @@ -15049,7 +15134,7 @@ dir = 1 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Rn" = ( /obj/machinery/atmospherics/binary/pump{ dir = 1; @@ -15276,7 +15361,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "RV" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -15448,20 +15533,10 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) "Ss" = ( -/obj/structure/closet/chefcloset, -/obj/item/glass_jar, -/obj/item/device/retail_scanner/civilian, -/obj/item/weapon/soap/nanotrasen, -/obj/item/device/destTagger{ - pixel_x = 4; - pixel_y = 3 +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{ + outdoors = 0 }, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/tool/wrench, -/turf/simulated/floor/tiled/eris/cafe, -/area/groundbase/civilian/kitchen) +/area/groundbase/level2/nw) "St" = ( /obj/structure/fence/corner{ dir = 8 @@ -15963,7 +16038,7 @@ /obj/machinery/light, /obj/effect/landmark/start/entertainer, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "TO" = ( /obj/structure/bed/chair/office/dark, /obj/effect/landmark/start/cargo, @@ -15981,7 +16056,7 @@ dir = 4 }, /turf/simulated/floor/bmarble, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "TT" = ( /obj/structure/railing/grey{ dir = 8 @@ -16031,21 +16106,13 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"Uc" = ( +/obj/structure/stairs/spawner/south, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level2/nw) "Ud" = ( /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) -"Ue" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/camera/network/research{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/groundbase/science/robotics) "Uf" = ( /obj/structure/filingcabinet/filingcabinet, /obj/machinery/camera/network/command, @@ -16072,6 +16139,9 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) +"Ui" = ( +/turf/simulated/open, +/area/groundbase/civilian/bar) "Uj" = ( /obj/machinery/door/blast/regular{ id = "xenobiodiv4"; @@ -16094,7 +16164,7 @@ icon_state = "1-8" }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Un" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 @@ -16158,14 +16228,14 @@ "Ux" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Uy" = ( /obj/machinery/light{ dir = 4 }, /obj/random/vendorall, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Uz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -16749,7 +16819,7 @@ dir = 4 }, /turf/simulated/wall, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Wd" = ( /obj/structure/railing/grey{ dir = 8 @@ -16801,7 +16871,7 @@ }, /obj/effect/landmark/start/entertainer, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Wj" = ( /turf/simulated/wall, /area/groundbase/cargo/office) @@ -16887,6 +16957,7 @@ dir = 4; pixel_x = -30 }, +/obj/random/paicard, /turf/simulated/floor/tiled, /area/groundbase/science/rd) "Wz" = ( @@ -16999,15 +17070,6 @@ edge_blending_priority = 0.1 }, /area/groundbase/civilian/kitchen) -"WU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/alarm{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/groundbase/science/robotics) "WV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -17110,7 +17172,7 @@ /obj/structure/table/bench/padded, /obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Xl" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -17202,7 +17264,7 @@ pixel_x = -25 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "XB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -17417,7 +17479,7 @@ }, /obj/machinery/firealarm, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Yg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -17441,7 +17503,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Ym" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -17473,7 +17535,7 @@ "Yr" = ( /obj/structure/sign/department/bar, /turf/simulated/wall, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Ys" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -17612,7 +17674,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "YS" = ( /obj/machinery/biogenerator, /turf/simulated/floor/tiled, @@ -17728,7 +17790,7 @@ /area/groundbase/cargo/office) "Zi" = ( /obj/machinery/firealarm, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/groundbase/civilian/kitchen/backroom) "Zk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18466,7 +18528,7 @@ UH UH UH wS -Hn +Ss Kl Kl xE @@ -18608,7 +18670,7 @@ UH UH wS wS -Hn +Ss Kl Kl xE @@ -21477,11 +21539,11 @@ il il LA bY -Jc -Jc -Jc bY bY +Jc +Jc +Jc bY bY bY @@ -21617,12 +21679,12 @@ bY bY bY bY -bY -bY -bY -bY -bY -bY +Hn +Ja +Hn +Hn +Uc +Gp bY bY bY @@ -21761,7 +21823,7 @@ Vl Vl Vl Vl -Vl +HW Vl Vl JJ @@ -21903,7 +21965,7 @@ Oz Ej ep LD -Ss +Gc Wp JO JJ @@ -22808,7 +22870,7 @@ Rh EJ YI ng -bt +PD AH lO Ga @@ -22950,7 +23012,7 @@ Rh bO AZ ff -bt +PD IO qW PZ @@ -23092,7 +23154,7 @@ Rh ff AZ ff -bt +PD nw qW lw @@ -23234,7 +23296,7 @@ Rh Fk AZ yw -bt +PD ws qW lw @@ -23366,7 +23428,7 @@ mP mP FL Rh -Jd +aj UX Dn ww @@ -23376,7 +23438,7 @@ Rh vh Nb Ys -bt +PD aB PR lw @@ -23452,7 +23514,7 @@ Bb Bb Iz yh -GS +qc CD FF bY @@ -23518,7 +23580,7 @@ Rh PD qU PD -bt +PD Ov PR lw @@ -23594,8 +23656,8 @@ Ny Ny Ny yh -YO -Gl +Gz +Ui rl bY sZ @@ -24173,13 +24235,13 @@ bY bY pw pw -LT +lM ml LT -pw +EZ pw bY -bY +lM bY bY bY @@ -24315,13 +24377,13 @@ bY bY bY bY -pw +EZ ml pw +lM bY bY -bY -bY +lM bY bY bY @@ -24457,13 +24519,13 @@ Hm Hm Hm Hm -Hm +Hr pJ sF -sF +go sF vV -sF +go sF sF sF @@ -24503,7 +24565,7 @@ pt RE Wn hU -Hy +al CA AR ov @@ -24599,13 +24661,13 @@ bY bY bY bY -pw +EZ sN pw -bY +lM bY Oa -bY +lM bY bY bY @@ -24741,13 +24803,13 @@ bY bY bY bY -yS +lM sN bY -bY +lM bY Oa -yS +lM bY Aq bY @@ -24782,7 +24844,7 @@ bZ Fm Fm Fm -Fm +ah Fm MR Wn @@ -25079,7 +25141,7 @@ de Wn Yz ir -Ue +aq Wn Gu Nn @@ -25221,7 +25283,7 @@ Ph bD Hb wp -WU +av Wn zT zT @@ -28289,7 +28351,7 @@ fp to to to -VR +fp fp fp fp @@ -30121,7 +30183,7 @@ to HL WZ cM -Np +ac WQ qT Bx @@ -30729,7 +30791,7 @@ vr sx ld jg -nC +ae ss Mb vr diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index f8b3d9e6fa..95d87ed2be 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -19,6 +19,12 @@ }, /turf/simulated/floor/carpet, /area/groundbase/medical/cmo) +"aN" = ( +/obj/item/weapon/stool/padded{ + dir = 4 + }, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "aQ" = ( /obj/structure/table/glass, /obj/item/weapon/folder/white_cmo, @@ -121,6 +127,12 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/escapepad) +"cD" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "cE" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -291,6 +303,11 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +"fn" = ( +/obj/structure/table/steel, +/obj/random/paicard, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "fu" = ( /obj/structure/table/bench/marble, /obj/effect/landmark/start/chemist, @@ -393,6 +410,11 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +"gV" = ( +/obj/structure/railing, +/obj/structure/table/steel, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "gZ" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -418,6 +440,13 @@ }, /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) +"hM" = ( +/obj/structure/railing, +/obj/structure/bed/chair/backed_red{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "hN" = ( /obj/structure/table/bench/marble, /obj/effect/landmark/start/medical, @@ -697,6 +726,16 @@ }, /turf/simulated/wall/r_wall, /area/groundbase/level3/escapepad) +"mS" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/table/steel, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) +"mT" = ( +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "mU" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -712,6 +751,12 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/nw) +"mY" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "nb" = ( /obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ @@ -720,6 +765,15 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/groundbase/medical/cmo) +"nh" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "nq" = ( /obj/structure/railing/grey{ dir = 1 @@ -766,8 +820,18 @@ dir = 1 }, /obj/machinery/light, +/obj/random/paicard, /turf/simulated/floor/wood, /area/groundbase/medical/cmo) +"nD" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/bed/chair/backed_red{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "nN" = ( /obj/machinery/light, /obj/effect/landmark/start/explorer, @@ -824,6 +888,12 @@ /obj/effect/overmap/visitable/sector/virgo3c, /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/level3/sw) +"oI" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "oK" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -877,6 +947,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient4) +"pa" = ( +/obj/item/weapon/stool/padded, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "pd" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/alarm{ @@ -945,6 +1019,12 @@ edge_blending_priority = -1 }, /area/groundbase/exploration/shuttlepad) +"pP" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "pY" = ( /obj/structure/sign/nanotrasen, /turf/simulated/wall, @@ -1025,6 +1105,13 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient1) +"rr" = ( +/obj/structure/railing, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "rD" = ( /obj/structure/bookcase, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -1051,6 +1138,13 @@ }, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) +"sa" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "sb" = ( /obj/machinery/power/apc{ dir = 8 @@ -1141,6 +1235,12 @@ "tZ" = ( /turf/simulated/mineral/cave/virgo3c, /area/groundbase/level3/se) +"ud" = ( +/obj/structure/bed/chair/backed_red{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "ui" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, @@ -1228,6 +1328,15 @@ /obj/structure/bed/chair/sofa/corp/left, /turf/simulated/floor/carpet/retro, /area/groundbase/dorms/bathroom) +"vJ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "vV" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -1392,6 +1501,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) +"yu" = ( +/obj/machinery/light, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "yy" = ( /obj/structure/dispenser{ phorontanks = 0 @@ -1529,6 +1642,9 @@ }, /turf/simulated/floor/wood, /area/groundbase/dorms/bathroom) +"AZ" = ( +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Bd" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -1591,6 +1707,12 @@ "BH" = ( /turf/simulated/wall, /area/groundbase/medical/patient3) +"BM" = ( +/obj/structure/catwalk, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/level3/nw/open) "Ck" = ( /obj/structure/table/woodentable, /obj/machinery/computer/security/telescreen/entertainment{ @@ -1598,6 +1720,12 @@ }, /turf/simulated/floor/carpet/retro, /area/groundbase/dorms/bathroom) +"Ct" = ( +/obj/structure/bed/chair/backed_red{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Cv" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet/medical, @@ -1722,6 +1850,15 @@ }, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) +"Em" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Es" = ( /obj/structure/closet/secure_closet/pathfinder{ req_access = list(62,43,67) @@ -1830,6 +1967,12 @@ "Fh" = ( /turf/simulated/floor/wood, /area/groundbase/dorms/bathroom) +"Fr" = ( +/obj/item/weapon/stool/padded{ + dir = 1 + }, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "Fx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1862,6 +2005,9 @@ }, /turf/simulated/floor/bmarble, /area/groundbase/civilian/pilot) +"FU" = ( +/turf/simulated/floor/lino, +/area/groundbase/civilian/kitchen) "FV" = ( /obj/item/weapon/storage/backpack/parachute{ pixel_x = 4; @@ -1912,6 +2058,13 @@ /obj/machinery/light/bigfloorlamp, /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/level3/escapepad) +"Gk" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Gn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -1942,6 +2095,9 @@ "GW" = ( /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/level3/escapepad) +"Ha" = ( +/turf/simulated/wall, +/area/groundbase/civilian/kitchen) "Hm" = ( /turf/simulated/floor/reinforced/virgo3c{ edge_blending_priority = -1 @@ -2088,6 +2244,15 @@ "IS" = ( /turf/simulated/open/virgo3c, /area/groundbase/level3/ne/open) +"IW" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/bed/chair/backed_red{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Jf" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/virgo3c, @@ -2179,6 +2344,10 @@ "KG" = ( /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) +"KN" = ( +/obj/structure/table/steel, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "KZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2226,6 +2395,12 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient3) +"Ms" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Mz" = ( /obj/structure/railing{ dir = 4 @@ -2294,6 +2469,12 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) +"NR" = ( +/obj/structure/sink/kitchen{ + pixel_y = 16 + }, +/turf/simulated/floor/lino, +/area/groundbase/civilian/kitchen) "NT" = ( /obj/machinery/alarm{ dir = 8 @@ -2408,6 +2589,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +"Pq" = ( +/obj/structure/table/steel, +/turf/simulated/floor/lino, +/area/groundbase/civilian/kitchen) "Pr" = ( /obj/machinery/button/remote/airlock{ dir = 8; @@ -2488,6 +2673,15 @@ "Qa" = ( /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/level3/nw) +"Qb" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Qe" = ( /obj/structure/table/bench/marble, /obj/structure/cable/yellow{ @@ -2523,6 +2717,13 @@ outdoors = 0 }, /area/groundbase/level3/escapepad) +"Qs" = ( +/obj/structure/railing, +/obj/structure/bed/chair/backed_red{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "QC" = ( /obj/machinery/door/airlock/multi_tile/glass/polarized{ id_tag = null; @@ -2582,6 +2783,12 @@ "Rq" = ( /turf/simulated/wall/r_wall, /area/groundbase/dorms/bathroom) +"RH" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "RM" = ( /obj/machinery/photocopier/faxmachine{ department = "Exploration" @@ -2876,6 +3083,10 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient1) +"Wh" = ( +/obj/structure/railing, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Wm" = ( /obj/structure/closet/secure_closet/pilot, /obj/machinery/light{ @@ -2912,6 +3123,13 @@ "Xv" = ( /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/unexplored/outdoors) +"Xz" = ( +/obj/structure/railing, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "XB" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet/medical, @@ -2952,6 +3170,11 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/dorms/bathroom) +"YG" = ( +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/civilian/kitchen) "YJ" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -5979,7 +6202,7 @@ QD QD QD QD -Kr +ly Kr pf pf @@ -6121,7 +6344,7 @@ QD QD QD QD -Kr +ly Kr pf pf @@ -6263,7 +6486,7 @@ QD QD QD QD -Kr +ly Kr Kr Kr @@ -6401,6 +6624,7 @@ Kr Kr Kr Kr +Kr QO By By @@ -6410,7 +6634,6 @@ Kr Kr Kr Kr -Kr pf pf pf @@ -6543,6 +6766,7 @@ Kr Kr Kr Kr +Kr QO By By @@ -6552,7 +6776,6 @@ Kr Kr Kr Kr -Kr pf pf pf @@ -6685,8 +6908,9 @@ Kr Kr Kr Kr -QO -By +Kr +QD +BM By ly Kr @@ -6694,7 +6918,6 @@ Kr Kr Kr Kr -Kr pf pf pf @@ -6819,22 +7042,22 @@ nU Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG Kr Kr pf @@ -6961,22 +7184,22 @@ pe Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +Ha +nh +Ms +Ms +Ms +Ms +Ms +Ms +Ms +AZ +AZ +Ms +sa +Ha +YG Kr Kr pf @@ -7103,22 +7326,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +Em +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +rr +YG Kr Kr pf @@ -7245,22 +7468,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +nD +Ct +Ct +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +Ct +Ct +hM +YG Kr Kr pf @@ -7387,22 +7610,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +mS +KN +KN +mT +mT +mT +mT +mT +mT +mT +mT +KN +KN +gV +YG Kr Kr pf @@ -7529,22 +7752,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +IW +ud +ud +mT +mT +pP +aN +aN +pP +mT +mT +ud +ud +Qs +YG Kr Kr pf @@ -7671,22 +7894,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +RH +AZ +AZ +mT +yu +Ha +Pq +Pq +Ha +oI +mT +AZ +AZ +Wh +YG Kr Kr pf @@ -7813,22 +8036,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +RH +AZ +AZ +mT +pa +Pq +FU +FU +Pq +Fr +mT +AZ +AZ +Wh +YG Kr Kr pf @@ -7955,22 +8178,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +RH +AZ +AZ +mT +pa +Pq +FU +FU +Pq +Fr +mT +AZ +AZ +Wh +YG Kr Kr pf @@ -8097,22 +8320,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +RH +AZ +AZ +mT +pa +Pq +FU +FU +Pq +Fr +mT +AZ +AZ +Wh +YG Kr Kr pf @@ -8239,22 +8462,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +RH +AZ +AZ +mT +yu +Ha +NR +FU +Ha +oI +mT +AZ +AZ +Wh +YG Kr Kr pf @@ -8381,22 +8604,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +nD +Ct +Ct +mT +mT +mY +mT +mT +mY +mT +mT +Ct +Ct +hM +YG Kr Kr pf @@ -8523,22 +8746,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +mS +fn +KN +mT +mT +mT +mT +mT +mT +mT +mT +KN +KN +gV +YG Kr Kr pf @@ -8665,22 +8888,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +IW +ud +ud +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +ud +ud +Qs +YG Kr Kr pf @@ -8807,22 +9030,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +vJ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +Xz +YG Kr Kr pf @@ -8949,22 +9172,22 @@ pe Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +Ha +Qb +cD +cD +cD +cD +cD +cD +AZ +AZ +cD +cD +Gk +Ha +YG Kr Kr pf @@ -9091,22 +9314,22 @@ VR Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG Kr Kr pf @@ -14891,9 +15114,9 @@ Lf Lf Lf Lf -Lf -Lf -Lf +IS +IS +IS IS IS IS @@ -15033,9 +15256,9 @@ Lf Lf Lf Lf -Lf -Lf -Lf +IS +IS +IS IS IS IS @@ -15175,9 +15398,9 @@ Lf Lf Lf Lf -Lf -Lf -Lf +IS +IS +IS IS IS IS @@ -15317,9 +15540,9 @@ Lf Lf Lf Lf -Lf -Lf -Lf +IS +IS +IS IS IS IS diff --git a/maps/groundbase/groundbase.dm b/maps/groundbase/groundbase.dm index 5d1c73a7c4..1a38bc0c85 100644 --- a/maps/groundbase/groundbase.dm +++ b/maps/groundbase/groundbase.dm @@ -8,7 +8,7 @@ #include "..\offmap_vr\common_offmaps.dm" #include "..\tether\tether_jobs.dm" #include "groundbase_poi_stuff.dm" - #include "gb-wilds.dm" + #include "groundbase_wilds.dm" #include "..\~map_system\maps_vr.dm" #if !AWAY_MISSION_TEST //Don't include these for just testing away missions diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm index e5eac280c4..19af27e4ec 100644 --- a/maps/groundbase/groundbase_areas.dm +++ b/maps/groundbase/groundbase_areas.dm @@ -359,6 +359,7 @@ /area/groundbase/civilian/arrivals name = "Arrivals" lightswitch = 1 + forbid_events = TRUE /area/groundbase/civilian/toolstorage name = "Tool Storage" lightswitch = 1 @@ -417,10 +418,12 @@ name = "Men's Restroom" sound_env = SOUND_ENVIRONMENT_BATHROOM lightswitch = 1 + forbid_events = TRUE /area/groundbase/civilian/womensrestroom name = "Women's Restroom" sound_env = SOUND_ENVIRONMENT_BATHROOM lightswitch = 1 + forbid_events = TRUE /area/groundbase/exploration name = "Exploration" diff --git a/maps/groundbase/groundbase_defines.dm b/maps/groundbase/groundbase_defines.dm index 4f3fedd2aa..de61e75d2f 100644 --- a/maps/groundbase/groundbase_defines.dm +++ b/maps/groundbase/groundbase_defines.dm @@ -124,6 +124,9 @@ default_skybox = /datum/skybox_settings/groundbase unit_test_exempt_areas = list( //These are all outside + /area/groundbase/cargo/bay, + /area/groundbase/civilian/bar/upper, + /area/groundbase/exploration/shuttlepad, /area/groundbase/level1, /area/groundbase/level1/ne, /area/groundbase/level1/nw, @@ -140,11 +143,20 @@ /area/groundbase/level2/nw, /area/groundbase/level2/se, /area/groundbase/level2/sw, + /area/groundbase/level2/northspur, + /area/groundbase/level2/eastspur, + /area/groundbase/level2/westspur, + /area/groundbase/level2/southeastspur, + /area/groundbase/level2/southwestspur, /area/groundbase/level3, /area/groundbase/level3/ne, /area/groundbase/level3/nw, /area/groundbase/level3/se, /area/groundbase/level3/sw, + /area/groundbase/level3/ne/open, + /area/groundbase/level3/nw/open, + /area/groundbase/level3/se/open, + /area/groundbase/level3/sw/open, /area/maintenance/groundbase/level1/netunnel, /area/maintenance/groundbase/level1/nwtunnel, /area/maintenance/groundbase/level1/setunnel, @@ -165,6 +177,11 @@ unit_test_exempt_from_atmos = list() + unit_test_z_levels = list( + Z_LEVEL_GB_BOTTOM, + Z_LEVEL_GB_MIDDLE, + Z_LEVEL_GB_TOP + ) lateload_z_levels = list( list("Groundbase - Central Command"), @@ -393,7 +410,7 @@ name = "Misc" flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT -#include "gb-mining.dm" +#include "groundbase_mining.dm" /datum/map_template/gb_lateload/mining name = "V3c Underground" desc = "The caves underneath the survace of Virgo 3C" @@ -534,4 +551,3 @@ */ //////////////////////////////////////////////////////////////////////// - diff --git a/maps/groundbase/gb-mining.dm b/maps/groundbase/groundbase_mining.dm similarity index 100% rename from maps/groundbase/gb-mining.dm rename to maps/groundbase/groundbase_mining.dm diff --git a/maps/groundbase/groundbase_poi_stuff.dm b/maps/groundbase/groundbase_poi_stuff.dm index 23826a464a..e24fe9b14a 100644 --- a/maps/groundbase/groundbase_poi_stuff.dm +++ b/maps/groundbase/groundbase_poi_stuff.dm @@ -1073,11 +1073,11 @@ name = "long building 2" mappath = 'southwilds/villagepois/long2.dmm' /area/submap/groundbase/poi/wildvillage/long/long2 -/datum/map_template/groundbase/wildvillage/wide/long3 +/datum/map_template/groundbase/wildvillage/long/long3 name = "wide building 3" mappath = 'southwilds/villagepois/long3.dmm' /area/submap/groundbase/poi/wildvillage/long/long3 -/datum/map_template/groundbase/wildvillage/wide/long4 +/datum/map_template/groundbase/wildvillage/long/long4 name = "wide building 4" mappath = 'southwilds/villagepois/long4.dmm' /area/submap/groundbase/poi/wildvillage/long/long4 diff --git a/maps/groundbase/gb-wilds.dm b/maps/groundbase/groundbase_wilds.dm similarity index 100% rename from maps/groundbase/gb-wilds.dm rename to maps/groundbase/groundbase_wilds.dm diff --git a/maps/groundbase/southwilds/southwilds1.dmm b/maps/groundbase/southwilds/southwilds1.dmm index f8fe87f859..f2c050a458 100644 --- a/maps/groundbase/southwilds/southwilds1.dmm +++ b/maps/groundbase/southwilds/southwilds1.dmm @@ -10,6 +10,12 @@ edge_blending_priority = -1 }, /area/submap/groundbase/wilderness/south) +"o" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/deep/virgo3c, +/area/submap/groundbase/wilderness/south) "p" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/submap/groundbase/wilderness/south) @@ -34,6 +40,12 @@ "H" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/submap/groundbase/wilderness/south/unexplored) +"I" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/virgo3c, +/area/submap/groundbase/wilderness/south) "K" = ( /obj/effect/map_effect/portal/line/side_b, /turf/simulated/floor/outdoors/grass/forest/virgo3c, @@ -1243,7 +1255,7 @@ d d c c -F +o c c c @@ -4771,7 +4783,7 @@ H d d c -c +I c F F @@ -4917,7 +4929,7 @@ c c F F -F +o c c c @@ -6511,7 +6523,7 @@ d d c c -c +I c c c @@ -7085,7 +7097,7 @@ c c c c -F +o F c c @@ -10217,7 +10229,7 @@ d c c c -F +o c c c @@ -11761,7 +11773,7 @@ d c F F -c +I c d d @@ -12927,7 +12939,7 @@ d d c c -c +I c c c @@ -13156,7 +13168,7 @@ c c c c -c +I c c d @@ -13784,7 +13796,7 @@ d d c c -c +I c c c @@ -13931,7 +13943,7 @@ d c c c -F +o F F c @@ -14023,7 +14035,7 @@ F F F F -F +o F F F @@ -14878,7 +14890,7 @@ c c F F -F +o F c c @@ -15234,7 +15246,7 @@ d d c F -F +o c c c @@ -16689,7 +16701,7 @@ d c c F -F +o c c d @@ -17687,7 +17699,7 @@ H d c c -F +o c c d @@ -18497,7 +18509,7 @@ d c c F -F +o F F F @@ -18643,7 +18655,7 @@ F F F F -F +o F c c diff --git a/maps/groundbase/southwilds/villagepois/square7.dmm b/maps/groundbase/southwilds/villagepois/square7.dmm index 5cc3728a75..e92257e2a1 100644 --- a/maps/groundbase/southwilds/villagepois/square7.dmm +++ b/maps/groundbase/southwilds/villagepois/square7.dmm @@ -119,18 +119,18 @@ /turf/simulated/floor/tiled/eris/cafe, /area/submap/groundbase/poi/wildvillage/square/square7) "G" = ( -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/reagent_containers/food/condiment/small/peppermill, diff --git a/maps/groundbase/southwilds/villagepois/wide5.dmm b/maps/groundbase/southwilds/villagepois/wide5.dmm index 170e791a89..a106381ee3 100644 --- a/maps/groundbase/southwilds/villagepois/wide5.dmm +++ b/maps/groundbase/southwilds/villagepois/wide5.dmm @@ -59,7 +59,7 @@ layer = 3.3; pixel_y = 30 }, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/submap/groundbase/poi/wildvillage/wide/wide5) "j" = ( /obj/structure/bed/chair/office/light{ @@ -138,7 +138,7 @@ /turf/simulated/floor/bmarble, /area/submap/groundbase/poi/wildvillage/wide/wide5) "u" = ( -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/submap/groundbase/poi/wildvillage/wide/wide5) "v" = ( /turf/simulated/floor/bmarble, @@ -150,7 +150,7 @@ /obj/structure/curtain/open/bed{ color = "#5e0c1d" }, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/submap/groundbase/poi/wildvillage/wide/wide5) "y" = ( /obj/machinery/light/small{ @@ -170,14 +170,14 @@ /obj/structure/table/standard, /obj/random/maintenance/misc, /obj/random/maintenance/misc, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/submap/groundbase/poi/wildvillage/wide/wide5) "B" = ( /turf/simulated/wall, /area/submap/groundbase/poi/wildvillage/wide/wide5) "C" = ( /obj/structure/undies_wardrobe, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/submap/groundbase/poi/wildvillage/wide/wide5) "D" = ( /obj/structure/table/rack/shelf, @@ -284,7 +284,7 @@ /obj/structure/table/standard, /obj/random/maintenance/misc, /obj/random/maintenance/misc, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/submap/groundbase/poi/wildvillage/wide/wide5) "V" = ( /obj/structure/bed/chair/sofa/corp/left, @@ -297,7 +297,7 @@ color = "#4287f5" }, /obj/machinery/light/small, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/submap/groundbase/poi/wildvillage/wide/wide5) "X" = ( /obj/machinery/door/airlock/silver{ diff --git a/maps/groundbase/westwilds/westwilds1.dmm b/maps/groundbase/westwilds/westwilds1.dmm index 614234c823..d9ba406ce0 100644 --- a/maps/groundbase/westwilds/westwilds1.dmm +++ b/maps/groundbase/westwilds/westwilds1.dmm @@ -691,7 +691,7 @@ name = "Burn Chamber Air Control"; output_tag = "burn_out"; pressure_setting = 0; - sensors = list("burn_sensor" = "Burn Chamber Sensor") + sensors = list("burn_sensor"="Burn Chamber Sensor") }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) @@ -1722,7 +1722,7 @@ /obj/machinery/vending/phoronresearch{ dir = 8; name = "Toximate 2556"; - products = list(/obj/item/device/transfer_valve = 3, /obj/item/device/assembly/timer = 6, /obj/item/device/assembly/signaler = 6, /obj/item/device/assembly/prox_sensor = 6, /obj/item/device/assembly/igniter = 12) + products = list(/obj/item/device/transfer_valve=3,/obj/item/device/assembly/timer=6,/obj/item/device/assembly/signaler=6,/obj/item/device/assembly/prox_sensor=6,/obj/item/device/assembly/igniter=12) }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) @@ -2038,7 +2038,7 @@ /obj/machinery/vending/wallmed1{ pixel_x = 30 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) "zz" = ( @@ -2144,7 +2144,6 @@ /area/groundbase/science/outpost/atmos) "AD" = ( /obj/machinery/artifact_scanpad, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) "AH" = ( @@ -4375,7 +4374,6 @@ /area/groundbase/science/outpost/anomaly_storage) "YX" = ( /obj/machinery/artifact_analyser, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) "Zk" = ( diff --git a/maps/groundbase/westwilds/westwilds2.dmm b/maps/groundbase/westwilds/westwilds2.dmm index 31d7f3e8d0..f1f03cad6e 100644 --- a/maps/groundbase/westwilds/westwilds2.dmm +++ b/maps/groundbase/westwilds/westwilds2.dmm @@ -13,6 +13,23 @@ /obj/item/weapon/tool/wrench, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"ab" = ( +/obj/machinery/artifact_scanpad, +/turf/simulated/floor/tiled/dark, +/area/groundbase/science/outpost/anomaly_lab) +"ac" = ( +/obj/machinery/artifact_analyser, +/turf/simulated/floor/tiled/dark, +/area/groundbase/science/outpost/anomaly_lab) +"ad" = ( +/obj/structure/table/standard, +/obj/item/device/flashlight/lamp, +/obj/machinery/vending/wallmed1{ + pixel_x = 30 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark, +/area/groundbase/science/outpost/anomaly_lab) "am" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 9 @@ -438,11 +455,6 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) -"gg" = ( -/obj/machinery/artifact_scanpad, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/dark, -/area/groundbase/science/outpost/anomaly_lab) "gi" = ( /obj/structure/table/standard, /obj/machinery/computer/atmoscontrol/laptop{ @@ -952,11 +964,6 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) -"lq" = ( -/obj/machinery/artifact_analyser, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/groundbase/science/outpost/anomaly_lab) "lw" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2674,15 +2681,6 @@ /obj/machinery/atmospherics/portables_connector, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) -"DN" = ( -/obj/structure/table/standard, -/obj/item/device/flashlight/lamp, -/obj/machinery/vending/wallmed1{ - pixel_x = 30 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/groundbase/science/outpost/anomaly_lab) "DP" = ( /obj/machinery/atmospherics/pipe/manifold/visible/supply, /obj/machinery/meter, @@ -18616,9 +18614,9 @@ MY qy Sh mh -gg -lq -DN +ab +ac +ad bp hm qg diff --git a/maps/offmap_vr/om_ships/itglight.dmm b/maps/offmap_vr/om_ships/itglight.dmm index 8dae10297d..8a11ecf0b9 100644 --- a/maps/offmap_vr/om_ships/itglight.dmm +++ b/maps/offmap_vr/om_ships/itglight.dmm @@ -1985,16 +1985,16 @@ /turf/simulated/floor, /area/itglight/portengi) "lO" = ( -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, @@ -2003,10 +2003,10 @@ /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/material/knife/butch, /obj/item/weapon/material/minihoe, /obj/item/weapon/material/knife/machete/hatchet, diff --git a/maps/stellardelight/overmap.dmm b/maps/stellar_delight/overmap.dmm similarity index 99% rename from maps/stellardelight/overmap.dmm rename to maps/stellar_delight/overmap.dmm index 2890f0159b..8edb64c502 100644 --- a/maps/stellardelight/overmap.dmm +++ b/maps/stellar_delight/overmap.dmm @@ -9,7 +9,7 @@ /turf/unsimulated/map, /area/overmap) "I" = ( -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/space) "J" = ( /obj/effect/overmap/bluespace_rift, diff --git a/maps/stellardelight/ship_centcom.dmm b/maps/stellar_delight/ship_centcom.dmm similarity index 99% rename from maps/stellardelight/ship_centcom.dmm rename to maps/stellar_delight/ship_centcom.dmm index 23be338ccd..b0e1314f59 100644 --- a/maps/stellardelight/ship_centcom.dmm +++ b/maps/stellar_delight/ship_centcom.dmm @@ -1139,8 +1139,8 @@ /area/centcom/specops) "dv" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/martin, -/obj/item/weapon/gun/energy/gun/martin, +/obj/item/weapon/gun/energy/gun/compact, +/obj/item/weapon/gun/energy/gun/compact, /obj/item/device/flash, /obj/item/device/flash, /turf/simulated/floor/tiled/dark, @@ -2276,8 +2276,8 @@ /area/centcom/control) "hq" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/martin, -/obj/item/weapon/gun/energy/gun/martin, +/obj/item/weapon/gun/energy/gun/compact, +/obj/item/weapon/gun/energy/gun/compact, /obj/item/device/flash, /obj/item/device/flash, /turf/simulated/floor/tiled{ diff --git a/maps/stellardelight/ship_misc.dmm b/maps/stellar_delight/ship_misc.dmm similarity index 100% rename from maps/stellardelight/ship_misc.dmm rename to maps/stellar_delight/ship_misc.dmm diff --git a/maps/stellardelight/stelardelightskybox.dmi b/maps/stellar_delight/stelardelightskybox.dmi similarity index 100% rename from maps/stellardelight/stelardelightskybox.dmi rename to maps/stellar_delight/stelardelightskybox.dmi diff --git a/maps/stellardelight/stellar_delight.dm b/maps/stellar_delight/stellar_delight.dm similarity index 100% rename from maps/stellardelight/stellar_delight.dm rename to maps/stellar_delight/stellar_delight.dm diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm similarity index 99% rename from maps/stellardelight/stellar_delight1.dmm rename to maps/stellar_delight/stellar_delight1.dmm index 6e65aa5629..666ed451eb 100644 --- a/maps/stellardelight/stellar_delight1.dmm +++ b/maps/stellar_delight/stellar_delight1.dmm @@ -1,4 +1,17 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/structure/cable/pink{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, +/obj/machinery/newscaster/security_unit{ + pixel_y = 28 + }, +/mob/living/simple_mob/vore/fennec/bridgette, +/turf/simulated/floor/tiled/dark, +/area/security/security_cell_hallway) "ab" = ( /obj/structure/cable/pink{ icon_state = "2-4" @@ -37,6 +50,19 @@ /obj/effect/floor_decal/milspec/color/red, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) +"af" = ( +/obj/machinery/computer/transhuman/resleeving{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/item/weapon/book/manual/resleeving, +/turf/simulated/floor/tiled/steel_grid, +/area/assembly/robotics) "ag" = ( /obj/structure/cable/pink{ icon_state = "1-4" @@ -98,6 +124,20 @@ }, /turf/simulated/floor/tiled/dark, /area/prison/cell_block) +"al" = ( +/obj/structure/table/standard, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/computer/med_data/laptop{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/assembly/robotics) "am" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 @@ -167,6 +207,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/tiled/dark, /area/security/tactical) +"av" = ( +/obj/structure/table/standard, +/obj/machinery/cell_charger, +/obj/machinery/power/apc/angled{ + dir = 8 + }, +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "0-4" + }, +/obj/item/weapon/storage/box/backup_kit, +/turf/simulated/floor/tiled/steel_dirty, +/area/assembly/robotics) "aw" = ( /obj/structure/stairs/spawner/north, /obj/structure/railing/grey{ @@ -192,6 +245,18 @@ "ay" = ( /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/pathfinder) +"az" = ( +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "2-8" + }, +/mob/living/simple_mob/animal/passive/mimepet/gregory, +/turf/simulated/floor/tiled/eris, +/area/rnd/xenobiology/xenoflora) "aA" = ( /obj/structure/cable{ icon_state = "1-2" @@ -204,18 +269,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) -"aB" = ( -/obj/structure/table/standard, -/obj/machinery/cell_charger, -/obj/machinery/power/apc/angled{ - dir = 8 - }, -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/steel_dirty, -/area/assembly/robotics) "aC" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -1285,19 +1338,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) -"cP" = ( -/obj/structure/cable/pink{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 1 - }, -/mob/living/simple_mob/vore/fennec/bridgette, -/obj/machinery/newscaster/security_unit{ - pixel_y = 28 - }, -/turf/simulated/floor/tiled/dark, -/area/security/security_cell_hallway) "cQ" = ( /obj/machinery/mineral/unloading_machine, /turf/simulated/floor/tiled/eris/steel/cargo, @@ -5275,18 +5315,6 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/stellardelight/deck1/dorms/dorm6) -"lk" = ( -/obj/machinery/computer/transhuman/resleeving{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/assembly/robotics) "ll" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -5399,19 +5427,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) -"lu" = ( -/obj/structure/table/standard, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/storage/box/backup_kit, -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/assembly/robotics) "lv" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 @@ -9217,18 +9232,6 @@ }, /turf/simulated/floor/airless, /area/stellardelight/deck1/exterior) -"tl" = ( -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "1-2" - }, -/mob/living/simple_mob/animal/passive/mimepet/gregory, -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/eris, -/area/rnd/xenobiology/xenoflora) "tm" = ( /obj/structure/dogbed, /mob/living/simple_mob/animal/passive/tindalos/twigs, @@ -35218,7 +35221,7 @@ Ne Ne Ne Qu -cP +aa wT QC Iq @@ -36395,7 +36398,7 @@ xs zG Ih ru -aB +av aD Mr fo @@ -36960,8 +36963,8 @@ JU LB nu yI -lk -lu +af +al rz ss aD @@ -37558,7 +37561,7 @@ Yc zI CS Gl -tl +az KN Yw FA diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm similarity index 99% rename from maps/stellardelight/stellar_delight2.dmm rename to maps/stellar_delight/stellar_delight2.dmm index a53bc1fb65..e54c49f0b2 100644 --- a/maps/stellardelight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -7931,18 +7931,18 @@ pixel_x = -1; pixel_y = -42 }, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/reagent_containers/food/condiment/small/peppermill, @@ -11229,6 +11229,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/item/weapon/gun/energy/mouseray/medical, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) "yW" = ( @@ -13909,12 +13910,6 @@ /obj/structure/cable/orange{ icon_state = "2-4" }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, /turf/simulated/floor/airless, /area/stellardelight/deck2/exterior) "Fi" = ( diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellar_delight/stellar_delight3.dmm similarity index 99% rename from maps/stellardelight/stellar_delight3.dmm rename to maps/stellar_delight/stellar_delight3.dmm index 418fa680b0..ab630a0974 100644 --- a/maps/stellardelight/stellar_delight3.dmm +++ b/maps/stellar_delight/stellar_delight3.dmm @@ -1032,8 +1032,12 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portcent) "ei" = ( @@ -6294,6 +6298,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/stellardelight/deck3/readingroom) "xw" = ( @@ -6558,6 +6564,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/stellardelight/deck3/readingroom) "ys" = ( @@ -7083,6 +7091,7 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/stellardelight/deck3/readingroom) "Ai" = ( @@ -7125,6 +7134,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/wood, /area/stellardelight/deck3/readingroom) "An" = ( @@ -7384,6 +7395,7 @@ dir = 8 }, /obj/structure/bookcase, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/stellardelight/deck3/readingroom) "Be" = ( @@ -8114,7 +8126,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/carpet/geo, /area/ai) "Dy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, @@ -9267,6 +9279,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/readingroom) "HR" = ( @@ -13966,6 +13980,18 @@ /obj/structure/girder/displaced, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/stellardelight/deck3/forestarroomb) +"Yk" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck3/portcent) "Yl" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -14292,6 +14318,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portcent) "Zt" = ( @@ -22452,7 +22480,7 @@ yq xv HQ Zp -My +Yk RM WQ OX diff --git a/maps/stellardelight/stellar_delight_areas.dm b/maps/stellar_delight/stellar_delight_areas.dm similarity index 99% rename from maps/stellardelight/stellar_delight_areas.dm rename to maps/stellar_delight/stellar_delight_areas.dm index 47bb681c0a..7d8e9a5326 100644 --- a/maps/stellardelight/stellar_delight_areas.dm +++ b/maps/stellar_delight/stellar_delight_areas.dm @@ -272,8 +272,10 @@ /area/stellardelight/deck3/transitgateway name = "Transit Gateway" + forbid_events = TRUE /area/stellardelight/deck3/cryo name = "Cryogenic Storage" + forbid_events = TRUE /area/stellardelight/deck3/readingroom name = "Reading Rooms" @@ -281,7 +283,7 @@ flags = RAD_SHIELDED| BLUE_SHIELDED |AREA_FLAG_IS_NOT_PERSISTENT soundproofed = TRUE block_suit_sensors = TRUE - forbid_events = TRUE + forbid_events = TRUE /area/stellardelight/deck3/portdock name = "Port Dock" diff --git a/maps/stellardelight/stellar_delight_defines.dm b/maps/stellar_delight/stellar_delight_defines.dm similarity index 97% rename from maps/stellardelight/stellar_delight_defines.dm rename to maps/stellar_delight/stellar_delight_defines.dm index 3cafb69e00..0405b9f199 100644 --- a/maps/stellardelight/stellar_delight_defines.dm +++ b/maps/stellar_delight/stellar_delight_defines.dm @@ -120,11 +120,24 @@ unit_test_exempt_areas = list( /area/stellardelight/deck1/exterior, /area/stellardelight/deck1/exploshuttle, - /area/stellardelight/deck1/miningshuttle + /area/stellardelight/deck1/miningshuttle, + /area/stellardelight/deck2/exterior, + /area/stellardelight/deck2/portescape, + /area/stellardelight/deck2/starboardescape, + /area/stellardelight/deck3/exterior, + + /area/medical/cryo, + /area/holodeck_control, + /area/tcommsat/chamber ) unit_test_exempt_from_atmos = list() //it maint + unit_test_z_levels = list( + Z_LEVEL_SHIP_LOW, + Z_LEVEL_SHIP_MID, + Z_LEVEL_SHIP_HIGH + ) lateload_z_levels = list( list("Ship - Central Command"), diff --git a/maps/stellardelight/stellar_delight_jobs.dm b/maps/stellar_delight/stellar_delight_jobs.dm similarity index 100% rename from maps/stellardelight/stellar_delight_jobs.dm rename to maps/stellar_delight/stellar_delight_jobs.dm diff --git a/maps/stellardelight/stellar_delight_shuttle_defs.dm b/maps/stellar_delight/stellar_delight_shuttle_defs.dm similarity index 100% rename from maps/stellardelight/stellar_delight_shuttle_defs.dm rename to maps/stellar_delight/stellar_delight_shuttle_defs.dm diff --git a/maps/stellardelight/stellar_delight_telecomms.dm b/maps/stellar_delight/stellar_delight_telecomms.dm similarity index 100% rename from maps/stellardelight/stellar_delight_telecomms.dm rename to maps/stellar_delight/stellar_delight_telecomms.dm diff --git a/maps/stellardelight/stellar_delight_things.dm b/maps/stellar_delight/stellar_delight_things.dm similarity index 100% rename from maps/stellardelight/stellar_delight_things.dm rename to maps/stellar_delight/stellar_delight_things.dm diff --git a/maps/stellardelight/stellar_delight_turfs.dm b/maps/stellar_delight/stellar_delight_turfs.dm similarity index 100% rename from maps/stellardelight/stellar_delight_turfs.dm rename to maps/stellar_delight/stellar_delight_turfs.dm diff --git a/maps/submaps/admin_use_vr/dhael_centcom.dmm b/maps/submaps/admin_use_vr/dhael_centcom.dmm index ebf1d39200..0e66e67a78 100644 --- a/maps/submaps/admin_use_vr/dhael_centcom.dmm +++ b/maps/submaps/admin_use_vr/dhael_centcom.dmm @@ -307,8 +307,8 @@ /area/centcom/specops) "aP" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/martin, -/obj/item/weapon/gun/energy/gun/martin, +/obj/item/weapon/gun/energy/gun/compact, +/obj/item/weapon/gun/energy/gun/compact, /obj/item/device/flash, /obj/item/device/flash, /turf/unsimulated/floor{ @@ -16126,8 +16126,8 @@ /area/centcom/evac) "UO" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/martin, -/obj/item/weapon/gun/energy/gun/martin, +/obj/item/weapon/gun/energy/gun/compact, +/obj/item/weapon/gun/energy/gun/compact, /obj/item/device/flash, /obj/item/device/flash, /turf/unsimulated/floor{ diff --git a/maps/submaps/depreciated_vr/ert_base.dmm b/maps/submaps/depreciated_vr/ert_base.dmm index 811010e5d0..e16d4b09ed 100644 --- a/maps/submaps/depreciated_vr/ert_base.dmm +++ b/maps/submaps/depreciated_vr/ert_base.dmm @@ -456,16 +456,16 @@ /obj/item/weapon/gun/energy/sniperrifle{ battery_lock = 0 }, -/obj/item/weapon/gun/energy/gun/martin{ +/obj/item/weapon/gun/energy/gun/compact{ battery_lock = 0 }, -/obj/item/weapon/gun/energy/gun/martin{ +/obj/item/weapon/gun/energy/gun/compact{ battery_lock = 0 }, -/obj/item/weapon/gun/energy/gun/martin{ +/obj/item/weapon/gun/energy/gun/compact{ battery_lock = 0 }, -/obj/item/weapon/gun/energy/gun/martin{ +/obj/item/weapon/gun/energy/gun/compact{ battery_lock = 0 }, /obj/item/weapon/cell/device/weapon, diff --git a/maps/submaps/surface_submaps/plains/Diner.dmm b/maps/submaps/surface_submaps/plains/Diner.dmm index 69f2b63996..d6fa3316b4 100644 --- a/maps/submaps/surface_submaps/plains/Diner.dmm +++ b/maps/submaps/surface_submaps/plains/Diner.dmm @@ -43,7 +43,7 @@ /turf/simulated/floor/tiled/white, /area/submap/Diner) "ak" = ( -/obj/machinery/vending/cola, +/obj/machinery/vending/hotfood, /turf/simulated/floor/tiled/white, /area/submap/Diner) "al" = ( @@ -113,8 +113,8 @@ "aw" = ( /obj/machinery/appliance/mixer/cereal, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/tiled/white, /area/submap/Diner) @@ -134,7 +134,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/cream, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /turf/simulated/floor/tiled/white, /area/submap/Diner) "az" = ( @@ -180,13 +180,13 @@ /area/submap/Diner) "aI" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aJ" = ( @@ -198,8 +198,8 @@ "aK" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/tiled/white, /area/submap/Diner) @@ -250,13 +250,13 @@ /area/submap/Diner) "aQ" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aR" = ( @@ -317,8 +317,8 @@ /area/submap/Diner) "bc" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/tiled/white, /area/submap/Diner) @@ -361,6 +361,11 @@ "bi" = ( /turf/simulated/floor/lino, /area/submap/Diner) +"bj" = ( +/obj/structure/table/standard, +/obj/random/mug, +/turf/simulated/floor/tiled/white, +/area/submap/Diner) "bk" = ( /obj/machinery/light/small{ dir = 8 @@ -374,6 +379,7 @@ /area/submap/Diner) "bm" = ( /obj/structure/table/woodentable, +/obj/random/mug, /turf/simulated/floor/lino, /area/submap/Diner) "bn" = ( @@ -389,8 +395,8 @@ "bp" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/windoor_assembly{ - icon_state = "l_windoor_assembly01"; - dir = 2 + dir = 2; + icon_state = "l_windoor_assembly01" }, /turf/simulated/floor/tiled/white, /area/submap/Diner) @@ -406,8 +412,8 @@ /area/submap/Diner) "bs" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -452,6 +458,7 @@ /area/submap/Diner) "bA" = ( /obj/structure/table/standard, +/obj/random/soap/anom, /turf/simulated/floor/tiled/hydro, /area/submap/Diner) @@ -863,7 +870,7 @@ aa (16,1,1) = {" aa ad -ah +bj ap ap ap diff --git a/maps/submaps/surface_submaps/plains/Diner_vr.dmm b/maps/submaps/surface_submaps/plains/Diner_vr.dmm index 1ef47715cb..a2eedcc00d 100644 --- a/maps/submaps/surface_submaps/plains/Diner_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Diner_vr.dmm @@ -130,7 +130,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/cream, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /turf/simulated/floor/tiled/white, /area/submap/Diner) "az" = ( @@ -245,13 +245,13 @@ /area/submap/Diner) "aQ" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aR" = ( diff --git a/maps/submaps/surface_submaps/plains/lonehome.dmm b/maps/submaps/surface_submaps/plains/lonehome.dmm index 2b0fca5b59..b610c17a87 100644 --- a/maps/submaps/surface_submaps/plains/lonehome.dmm +++ b/maps/submaps/surface_submaps/plains/lonehome.dmm @@ -86,7 +86,7 @@ "zN" = (/obj/item/weapon/paper{info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper"},/turf/simulated/floor/wood,/area/submap/lonehome) "AQ" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome) "BH" = (/obj/item/weapon/paper{info = "F%$K this detective, I swear I can see them peeking from behind the window, these tinted glasses help but I swear I can still see them snooping around. His days are counted... I am so close to figuring this out, just need a few more days. Then Shepiffany will be part of the family once again, then our two kids and I can go back on having a normal life... a normal life..."; name = "Stained sheet of paper"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) -"Dd" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/condimentbottles,/obj/item/weapon/reagent_containers/food/condiment/sugar,/obj/structure/curtain/open/bed,/obj/structure/table/rack,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/tiled/white,/area/submap/lonehome) +"Dd" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/condimentbottles,/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,/obj/structure/curtain/open/bed,/obj/structure/table/rack,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/tiled/white,/area/submap/lonehome) "Dk" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/submap/lonehome) "DE" = (/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/item/weapon/storage/box/glasses/square{pixel_y = -2},/obj/item/weapon/storage/box/glass_extras/sticks{pixel_y = 4},/obj/item/weapon/storage/box/glass_extras/straws{pixel_y = 7},/obj/item/weapon/packageWrap,/obj/structure/curtain/open/bed,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/structure/table/rack,/turf/simulated/floor/tiled/white,/area/submap/lonehome) "DG" = (/obj/structure/simple_door/wood,/turf/simulated/floor,/area/submap/lonehome) diff --git a/maps/submaps/surface_submaps/plains/lonehome_vr.dmm b/maps/submaps/surface_submaps/plains/lonehome_vr.dmm index 776d5a25a2..6cee63decc 100644 --- a/maps/submaps/surface_submaps/plains/lonehome_vr.dmm +++ b/maps/submaps/surface_submaps/plains/lonehome_vr.dmm @@ -166,7 +166,7 @@ }, /obj/item/weapon/storage/box/donkpockets, /obj/item/weapon/storage/box/condimentbottles, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /obj/structure/curtain/open/bed, /obj/structure/table/rack, /obj/structure/window/reinforced/polarized{ diff --git a/maps/submaps/surface_submaps/plains_yw/Diner.dmm b/maps/submaps/surface_submaps/plains_yw/Diner.dmm index 5702e7c8f7..d84cfd55ab 100644 --- a/maps/submaps/surface_submaps/plains_yw/Diner.dmm +++ b/maps/submaps/surface_submaps/plains_yw/Diner.dmm @@ -245,13 +245,13 @@ /area/submap/Diner) "aQ" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aR" = ( diff --git a/maps/submaps/surface_submaps/plains_yw/Diner_vr.dmm b/maps/submaps/surface_submaps/plains_yw/Diner_vr.dmm index a264da893a..380440a425 100644 --- a/maps/submaps/surface_submaps/plains_yw/Diner_vr.dmm +++ b/maps/submaps/surface_submaps/plains_yw/Diner_vr.dmm @@ -245,13 +245,13 @@ /area/submap/Diner) "aQ" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aR" = ( diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm index bd6de68333..aec901cfe7 100644 --- a/maps/tether/submaps/tether_centcom.dmm +++ b/maps/tether/submaps/tether_centcom.dmm @@ -529,6 +529,11 @@ fancy_shuttle_tag = "tram" }, /obj/structure/closet/walllocker/medical/east, +/obj/item/stack/medical/crude_pack, +/obj/item/stack/medical/crude_pack, +/obj/item/stack/medical/ointment, +/obj/item/stack/medical/ointment, +/obj/item/stack/medical/splint, /turf/simulated/floor/tiled, /area/shuttle/escape{ base_turf = /turf/simulated/floor/tiled/techfloor/grid @@ -826,7 +831,9 @@ /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "tram" }, -/obj/structure/closet/walllocker/medical/west, +/obj/machinery/vending/wallmed1/public{ + pixel_x = -28 + }, /turf/simulated/floor/tiled, /area/shuttle/escape{ base_turf = /turf/simulated/floor/tiled/techfloor/grid @@ -1124,8 +1131,8 @@ /area/centcom/specops) "dv" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/martin, -/obj/item/weapon/gun/energy/gun/martin, +/obj/item/weapon/gun/energy/gun/compact, +/obj/item/weapon/gun/energy/gun/compact, /obj/item/device/flash, /obj/item/device/flash, /turf/simulated/floor/tiled/dark, @@ -1888,7 +1895,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/weapon/storage/fancy/cigarettes=10,/obj/item/weapon/storage/box/matches=10,/obj/item/weapon/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2) }, /turf/simulated/floor/wood, /area/centcom/specops) @@ -2258,8 +2265,8 @@ /area/centcom/control) "hq" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/martin, -/obj/item/weapon/gun/energy/gun/martin, +/obj/item/weapon/gun/energy/gun/compact, +/obj/item/weapon/gun/energy/gun/compact, /obj/item/device/flash, /obj/item/device/flash, /turf/simulated/floor/tiled{ diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index a412e998d0..660a826ec6 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -10172,9 +10172,15 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "apL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "apM" = ( @@ -10184,19 +10190,29 @@ req_one_access = list() }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "apN" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/security/evastorage) "apO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/evastorage) "apP" = ( @@ -10703,6 +10719,9 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "aqM" = ( @@ -10711,6 +10730,9 @@ /obj/item/device/radio{ pixel_x = -4 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "aqN" = ( @@ -11238,6 +11260,8 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/evastorage) "arK" = ( @@ -32894,6 +32918,15 @@ /obj/structure/table/rack, /turf/simulated/floor/plating, /area/maintenance/lower/south) +"dea" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/evastorage) "dio" = ( /obj/structure/closet/crate, /obj/random/maintenance/clean, @@ -32974,6 +33007,15 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"dXC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/surfacebase/security/warden) "dXJ" = ( /obj/structure/railing, /obj/structure/railing{ @@ -33764,6 +33806,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/rnd) +"lGN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/surfacebase/security/warden) "lJc" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -34972,6 +35023,12 @@ /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) +"wEf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/surfacebase/security/warden) "wIA" = ( /obj/structure/cable/cyan, /obj/machinery/power/apc{ @@ -44152,8 +44209,8 @@ alo amr anq aox -apL -apL +dXC +wEf arH asH ann @@ -44294,7 +44351,7 @@ alp ams ano aoy -apL +lGN aqN arI asI @@ -44578,7 +44635,7 @@ alr amu anr aoz -apN +dea aqO arJ asJ diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index d21a316752..432a231c7d 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -557,6 +557,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, +/obj/item/weapon/gun/energy/mouseray/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aaT" = ( @@ -2455,9 +2456,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 1 }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "adD" = ( @@ -2467,9 +2465,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 4 }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "adE" = ( @@ -4090,9 +4085,12 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "aga" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/area/tether/surfacebase/medical/admin) "agb" = ( /obj/structure/cable/green{ d1 = 4; @@ -9173,23 +9171,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aoD" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/effect/floor_decal/borderfloor{ +/obj/structure/disposalpipe/junction{ dir = 1 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/admin) "aoE" = ( /obj/structure/sign/directions/evac{ dir = 1 @@ -19968,6 +19957,7 @@ /obj/item/weapon/book/manual/resleeving, /obj/item/weapon/book/manual/ripley_build_and_repair, /obj/item/weapon/book/manual/robotics_cyborgs, +/obj/item/weapon/book/manual/robotics_manual, /obj/item/weapon/book/manual/rust_engine, /obj/item/weapon/book/manual/security_space_law, /obj/item/weapon/book/manual/standard_operating_procedure, @@ -23186,12 +23176,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "aMd" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/area/tether/surfacebase/medical/admin) "aMe" = ( /obj/structure/cable/orange{ d2 = 2; @@ -23990,14 +23982,24 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "aNH" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/firealarm{ + layer = 3.3; + pixel_x = 4; + pixel_y = 26 }, -/obj/structure/disposalpipe/junction{ +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "aNI" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 @@ -25055,6 +25057,21 @@ /obj/structure/sign/department/xenolab, /turf/simulated/wall, /area/rnd/outpost/xenobiology/outpost_breakroom) +"aPU" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "aPV" = ( /obj/machinery/light{ dir = 4 @@ -25084,6 +25101,23 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) +"aPZ" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"aQa" = ( +/turf/simulated/wall, +/area/rnd/research/researchdivision) "aQb" = ( /obj/machinery/papershredder, /turf/simulated/floor/wood, @@ -25906,15 +25940,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) -"aRK" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) "aRL" = ( /obj/machinery/washing_machine, /turf/simulated/floor/tiled/white, @@ -36263,6 +36288,7 @@ "bkS" = ( /obj/structure/table/standard, /obj/item/weapon/book/manual/robotics_cyborgs, +/obj/item/weapon/book/manual/robotics_manual, /obj/item/clothing/glasses/omnihud/rnd, /obj/machinery/light{ dir = 8 @@ -52842,11 +52868,11 @@ aHI aHj aTh aJN -aJW +aQa aKR aFW aMz -aNF +aJW bkp aKk bkP @@ -52984,11 +53010,11 @@ aBL ahf aJe aJO -aJW +aQa aKS aLX aMP -aNF +aJW bkq bkE bkQ @@ -53126,11 +53152,11 @@ apK aCe aJf aJP -aJW +aQa aLq aLY aMQ -aNF +aJW bkr bkF bkR @@ -53272,11 +53298,11 @@ aqS aLr aLZ aLr -aqS +aJW bks bkG bks -aqS +aNF aac aac aac @@ -59604,10 +59630,10 @@ iLq aSU ahQ aTb +aTb aga +aoD aMd -aNH -aRK aSn aoo aXU @@ -59751,9 +59777,9 @@ bkd bkc aRG aSn -aoD -aXU -asr +aNH +aPU +aPZ aio ajn akg diff --git a/maps/tether/tether-04-transit.dmm b/maps/tether/tether-04-transit.dmm index 2f5e075c78..02b5d5e84d 100644 --- a/maps/tether/tether-04-transit.dmm +++ b/maps/tether/tether-04-transit.dmm @@ -419,6 +419,10 @@ "Dz" = ( /turf/simulated/wall/r_wall, /area/maintenance/tether_midpoint) +"El" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) "Et" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -9356,7 +9360,7 @@ Dz iK pM pM -pM +El Dz oN yi diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index faa7cd90d3..38b069fc8a 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -650,16 +650,9 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "abn" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Long-Range Teleporter Access" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/monotile, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, /area/teleporter/departing) "abo" = ( /obj/effect/floor_decal/corner_steel_grid{ @@ -1032,16 +1025,15 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "abU" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ name = "Long-Range Teleporter Access" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/monotile, /area/teleporter/departing) "abV" = ( @@ -1296,9 +1288,17 @@ /turf/simulated/floor, /area/maintenance/station/exploration) "act" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor, -/turf/simulated/floor, +/obj/machinery/door/airlock/glass{ + name = "Long-Range Teleporter Access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/monotile, /area/teleporter/departing) "acu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -2519,6 +2519,16 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"aed" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock{ + name = "Docking Arm Storage" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/station/dock_two) "aee" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /obj/structure/railing{ @@ -2545,6 +2555,21 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"aeg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/airlock/glass_mining{ + name = "Delivery Office"; + req_access = list(50); + req_one_access = list() + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/delivery) "aeh" = ( /obj/structure/cable{ d1 = 1; @@ -2627,6 +2652,50 @@ "aen" = ( /turf/simulated/floor/tiled, /area/engineering/workshop) +"aeo" = ( +/obj/structure/plasticflaps, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "crate-belt" + }, +/obj/machinery/door/window/brigdoor/westleft{ + id = "mailing-door"; + name = "Mail Room"; + req_access = list(50) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) +"aep" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/table/steel_reinforced, +/obj/machinery/door/window/northright{ + dir = 2; + name = "Mailing Room"; + req_access = list(50) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) +"aeq" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/door/window/northright{ + dir = 2; + name = "Cargo Ordering"; + req_access = list(50) + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "aer" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 @@ -2690,6 +2759,46 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) +"aeu" = ( +/obj/machinery/door/airlock/glass_mining{ + name = "Delivery Office"; + req_access = list(50); + req_one_access = list() + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"aev" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/mining{ + name = "Quartermaster"; + req_access = list(41); + req_one_access = list() + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/qm) "aew" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -2715,6 +2824,18 @@ }, /turf/simulated/floor, /area/engineering/engine_monitoring) +"aex" = ( +/obj/machinery/door/airlock/maintenance/cargo{ + req_access = list(50); + req_one_access = list(48) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/quartermaster/delivery) +"aey" = ( +/obj/machinery/smartfridge/sheets/persistent_lossy, +/turf/simulated/wall, +/area/quartermaster/belterdock/gear) "aez" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -2801,6 +2922,48 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"aeF" = ( +/obj/machinery/door/airlock/glass_mining{ + name = "Mining Operations"; + req_access = list(31); + req_one_access = list() + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/belterdock/gear) +"aeG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/grille, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/window/reinforced/full, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) +"aeH" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock) "aeK" = ( /obj/structure/cable/green{ d1 = 1; @@ -2955,6 +3118,9 @@ fancy_shuttle_tag = "medbus"; name = "medbus" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/shuttle/medivac/general) "afe" = ( @@ -9084,16 +9250,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"avA" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/table/steel_reinforced, -/obj/machinery/door/window/northright{ - dir = 2; - name = "Mailing Room"; - req_access = list(50) - }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) "avB" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -14565,9 +14721,6 @@ "bnG" = ( /obj/machinery/door/airlock/glass, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -15164,6 +15317,14 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) +"bIK" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "bIO" = ( /obj/machinery/exonet_node{ anchored = 1 @@ -15345,6 +15506,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/item/clothing/shoes/magboots, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "bPl" = ( @@ -16302,6 +16464,16 @@ }, /turf/simulated/floor, /area/maintenance/cargo) +"czD" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "czS" = ( /obj/structure/cable/green{ d1 = 1; @@ -17782,9 +17954,6 @@ }, /turf/simulated/floor/tiled, /area/shuttle/medivac/engines) -"dSp" = ( -/turf/simulated/wall, -/area/mine/explored/upper_level) "dSJ" = ( /obj/machinery/disposal/deliveryChute, /obj/structure/disposalpipe/trunk{ @@ -18404,23 +18573,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) -"eIy" = ( -/obj/machinery/door/airlock/glass_mining{ - name = "Mining Operations"; - req_access = list(31); - req_one_access = list() - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/steel_grid, -/area/quartermaster/belterdock) "eIJ" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -19398,11 +19550,6 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) "fNX" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/door/airlock/maintenance/common{ name = "Engine Access"; req_one_access = list(1,67) @@ -20047,14 +20194,6 @@ /area/quartermaster/foyer) "gqN" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -20062,6 +20201,9 @@ fancy_shuttle_tag = "medbus"; name = "medbus" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/shuttle/medivac/general) "gsz" = ( @@ -22625,14 +22767,10 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 4 }, +/obj/item/clothing/shoes/magboots, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "iEn" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -22916,11 +23054,6 @@ /turf/simulated/floor/airless, /area/shuttle/belter) "iVi" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/cable{ icon_state = "2-8" }, @@ -23204,6 +23337,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 5 }, +/obj/item/clothing/shoes/magboots, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "jnG" = ( @@ -23916,15 +24050,6 @@ /area/tcommsat/entrance{ name = "\improper Telecomms Entrance" }) -"jYg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/airlock{ - name = "Docking Arm Storage" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_grid, -/area/tether/station/dock_two) "jYB" = ( /obj/machinery/teleport/station{ dir = 2 @@ -24217,6 +24342,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/shuttle/medivac/engines) "kjA" = ( @@ -24591,6 +24719,9 @@ fancy_shuttle_tag = "secbus"; name = "secbus" }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/shuttle/securiship/general) "kzY" = ( @@ -24702,9 +24833,6 @@ /area/tether/exploration/hallway) "kEt" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -25926,24 +26054,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) -"lzt" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/grille, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/window/reinforced/full, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) "lzB" = ( /obj/structure/closet/crate, /obj/random/maintenance/engineering, @@ -26135,14 +26245,6 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) -"lHr" = ( -/obj/machinery/door/airlock/maintenance/cargo{ - req_access = list(50); - req_one_access = list(48) - }, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor, -/area/quartermaster/delivery) "lHv" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/borderfloor{ @@ -27252,22 +27354,6 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) -"mFS" = ( -/obj/structure/plasticflaps, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/conveyor{ - dir = 8; - id = "crate-belt" - }, -/obj/machinery/door/window/brigdoor/westleft{ - id = "mailing-door"; - name = "Mail Room"; - req_access = list(50) - }, -/turf/simulated/floor/plating, -/area/quartermaster/delivery) "mHR" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -27305,9 +27391,6 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "mIV" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/cable{ icon_state = "2-4" }, @@ -27321,6 +27404,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/shuttle/securiship/engines) "mJd" = ( @@ -27521,21 +27607,6 @@ }, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/belter) -"mRX" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/door/window/northright{ - dir = 2; - name = "Cargo Ordering"; - req_access = list(50) - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/quartermaster/office) "mTK" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/map_helper/airlock/door/int_door, @@ -28157,11 +28228,6 @@ req_access = list(); req_one_access = list(11,67) }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/structure/cable{ icon_state = "0-4" }, @@ -28169,6 +28235,9 @@ fancy_shuttle_tag = "medbus"; name = "medbus" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/shuttle/medivac/engines) "nyL" = ( @@ -29232,21 +29301,6 @@ }, /turf/simulated/floor/tiled, /area/shuttle/securiship/general) -"oUP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/airlock/glass_mining{ - name = "Delivery Office"; - req_access = list(50); - req_one_access = list() - }, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled/steel_grid, -/area/quartermaster/delivery) "oWu" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -29608,10 +29662,6 @@ oxygen = 0 }, /area/shuttle/securiship/engines) -"ptc" = ( -/obj/machinery/smartfridge/sheets/persistent_lossy, -/turf/simulated/wall, -/area/quartermaster/belterdock) "pty" = ( /obj/machinery/conveyor{ dir = 8; @@ -31394,6 +31444,14 @@ /obj/structure/plasticflaps, /turf/simulated/floor, /area/quartermaster/delivery) +"rEr" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/general) "rFi" = ( /obj/structure/cable/green{ d1 = 1; @@ -32002,9 +32060,6 @@ req_one_access = list(5,67) }, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -32539,6 +32594,14 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) +"sRA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/general) "sRG" = ( /obj/structure/cable{ d1 = 1; @@ -32753,6 +32816,9 @@ fancy_shuttle_tag = "medbus"; name = "medbus" }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/shuttle/medivac/general) "teI" = ( @@ -32786,9 +32852,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable/green{ d1 = 2; d2 = 4; @@ -32798,6 +32861,9 @@ fancy_shuttle_tag = "medbus"; name = "medbus" }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/shuttle/medivac/general) "tgr" = ( @@ -33346,6 +33412,9 @@ fancy_shuttle_tag = "secbus"; name = "secbus" }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/shuttle/securiship/general) "tGV" = ( @@ -33524,9 +33593,6 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "tOn" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -33539,6 +33605,11 @@ fancy_shuttle_tag = "secbus"; name = "secbus" }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/tiled, /area/shuttle/securiship/general) "tOp" = ( @@ -33552,11 +33623,6 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "tOr" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/structure/cable{ icon_state = "2-8" }, @@ -33762,6 +33828,9 @@ fancy_shuttle_tag = "medbus"; name = "medbus" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/shuttle/medivac/general) "udq" = ( @@ -33777,9 +33846,6 @@ /area/maintenance/station/cargo) "udG" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -33966,12 +34032,6 @@ oxygen = 0 }, /area/shuttle/medivac/cockpit) -"usX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/quartermaster/belterdock) "utf" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -34881,6 +34941,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 9 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/shuttle/medivac/engines) "vtx" = ( @@ -35290,6 +35353,12 @@ fancy_shuttle_tag = "medbus"; name = "medbus" }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/shuttle/medivac/general) "vVA" = ( @@ -35415,6 +35484,9 @@ name = "secbus" }, /obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/shuttle/securiship/general) "waj" = ( @@ -35485,9 +35557,6 @@ /area/quartermaster/belterdock/gear) "weP" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -35731,6 +35800,9 @@ fancy_shuttle_tag = "secbus"; name = "secbus" }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/shuttle/securiship/general) "wBw" = ( @@ -35868,11 +35940,6 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "wLR" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/door/airlock/glass_security, /obj/structure/cable{ icon_state = "1-2" @@ -36166,29 +36233,6 @@ }, /turf/simulated/floor/grass, /area/crew_quarters/heads/chief) -"xbQ" = ( -/obj/machinery/door/airlock/glass_mining{ - name = "Delivery Office"; - req_access = list(50); - req_one_access = list() - }, -/obj/machinery/door/firedoor/border_only, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/quartermaster/office) "xcE" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -36241,6 +36285,14 @@ /obj/structure/sign/department/gravi, /turf/simulated/wall/r_wall, /area/engineering/hallway) +"xfE" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) "xfN" = ( /obj/structure/flora/pottedplant/stoutbush, /obj/effect/floor_decal/borderfloor{ @@ -36457,22 +36509,6 @@ /obj/structure/closet, /turf/simulated/floor/tiled, /area/janitor) -"xuh" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/mining{ - name = "Quartermaster"; - req_access = list(41); - req_one_access = list() - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/steel_grid, -/area/quartermaster/qm) "xur" = ( /turf/simulated/wall/r_wall, /area/quartermaster/belterdock/refinery) @@ -36734,9 +36770,6 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "xMQ" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -46799,7 +46832,7 @@ nbO nsz awo iYG -lHr +aex bnl azc azc @@ -46934,14 +46967,14 @@ adP adT aec aAD -oUP -mFS +aeg +aeo aAD sjc wwR jfP awL -aBM +azc azc azc iqs @@ -46969,7 +47002,7 @@ uJM lBS exi cUF -usX +aeH lVJ mRU eLX @@ -47083,7 +47116,7 @@ qCY obh qWq tos -ayY +sgp aBo uMR pGq @@ -47111,7 +47144,7 @@ tNG tIc tts bGw -usX +aeH lVJ mRU eLX @@ -47220,12 +47253,12 @@ aVY qjn wnV aux -avA +aep sVp xbp oYq cCL -ayY +sgp oZy ngC oQe @@ -47364,7 +47397,7 @@ qCg auC azc rIt -xbQ +aeu aDR sgp xfN @@ -47658,7 +47691,7 @@ nPQ awN aOC xOx -aBM +awN aBe aBe aBe @@ -47778,17 +47811,17 @@ aaD aaD aaD aaD -abn -aaD abU aaD +act +aaD ahL phy vYO dUA mAh afV -mRX +aeq nkl oFl riU @@ -47808,7 +47841,7 @@ czS aDX pnV aDz -ptc +aey cNJ wdk meW @@ -47950,7 +47983,7 @@ wZj aDY axq vDW -eIy +aeF kqW wYD wYD @@ -48092,7 +48125,7 @@ wkd oyD aDz kJz -bmW +xyO iEl duh meW @@ -48217,7 +48250,7 @@ kum iZJ xuc kPu -xuh +aev hVn fxO avv @@ -48234,8 +48267,8 @@ aDB kQQ lEt awN -bmW -dSp +xyO +xyO bOV meW qfA @@ -48377,7 +48410,7 @@ oPH tHB bOm jVr -dSp +xyO jms hQk meW @@ -48484,7 +48517,7 @@ rci smz hrw hrw -act +abn aaM aaZ abi @@ -48523,7 +48556,7 @@ xur jzz jzz tQT -lzt +aeG tQT jzz jzz @@ -49485,7 +49518,7 @@ hFV hUm iOq jEb -jYg +aed wbf btr fQr @@ -51347,12 +51380,12 @@ qtf vyd ter ucL -tda +sRA afa -kXu -kXu +czD +czD vVy -hDi +bIK kiN vtg lof @@ -54045,11 +54078,11 @@ sJM abJ tOn vZG -kok +rEr wAK kzv tGO -kKj +xfE mIV ydq ncN diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index e498759526..4faa344487 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -140,18 +140,36 @@ /area/crew_quarters/sleep/Dorm_5/holo, /area/crew_quarters/sleep/Dorm_7/holo, /area/looking_glass/lg_1, - /area/rnd/miscellaneous_lab + /area/rnd/miscellaneous_lab, + /area/tether/transit, // Tether Debug Transit + /area/tether/surfacebase/outside/outside2, // Very Outside + /area/tether/surfacebase/outside/outside3 // Very Outside ) unit_test_exempt_from_atmos = list( /area/engineering/atmos_intake, // Outside, + /area/engineering/engine_gas, /area/rnd/external, // Outside, + /area/rnd/outpost/xenobiology/outpost_stairs, + /area/tether/surfacebase/entertainment/stage, // Connected to entertainment area + /area/tether/surfacebase/emergency_storage/atmos, /area/tether/surfacebase/emergency_storage/rnd, /area/tether/surfacebase/emergency_storage/atrium, /area/tether/surfacebase/lowernortheva, // it airlock /area/tether/surfacebase/lowernortheva/external, //it outside - /area/tether/surfacebase/security/gasstorage) //it maint + /area/tether/surfacebase/security/gasstorage, // Maint + /area/tcommsat/chamber, + /area/tether/outpost/solars_outside, // Outside + /area/vacant/vacant_bar_upper // Maint + ) + unit_test_z_levels = list( + Z_LEVEL_SURFACE_LOW, + Z_LEVEL_SURFACE_MID, + Z_LEVEL_SURFACE_HIGH, + Z_LEVEL_TRANSIT, + Z_LEVEL_SPACE_LOW + ) lateload_z_levels = list( list("Tether - Centcom","Tether - Misc","Tether - Underdark","Tether - Plains"), //Stock Tether lateload maps diff --git a/maps/tether/tether_jobs.dm b/maps/tether/tether_jobs.dm index 5d9be113cf..feffb107d3 100644 --- a/maps/tether/tether_jobs.dm +++ b/maps/tether/tether_jobs.dm @@ -25,7 +25,10 @@ selection_color = "#999999" economic_modifier = 7 minimal_player_age = 14 - pto_type = null + playtime_only = TRUE + pto_type = PTO_TALON + timeoff_factor = 1 + dept_time_required = 60 access = list(access_talon) minimal_access = list(access_talon) alt_titles = list("Talon Commander" = /datum/alt_title/talon_commander) @@ -49,7 +52,9 @@ selection_color = "#aaaaaa" economic_modifier = 5 minimal_player_age = 14 - pto_type = null + playtime_only = TRUE + pto_type = PTO_TALON + timeoff_factor = 1 access = list(access_talon) minimal_access = list(access_talon) alt_titles = list("Talon Medic" = /datum/alt_title/talon_medic) @@ -74,7 +79,9 @@ selection_color = "#aaaaaa" economic_modifier = 5 minimal_player_age = 14 - pto_type = null + playtime_only = TRUE + pto_type = PTO_TALON + timeoff_factor = 1 access = list(access_talon) minimal_access = list(access_talon) alt_titles = list("Talon Technician" = /datum/alt_title/talon_tech) @@ -99,7 +106,9 @@ selection_color = "#aaaaaa" economic_modifier = 5 minimal_player_age = 14 - pto_type = null + playtime_only = TRUE + pto_type = PTO_TALON + timeoff_factor = 1 access = list(access_talon) minimal_access = list(access_talon) alt_titles = list("Talon Helmsman" = /datum/alt_title/talon_helmsman) @@ -124,7 +133,9 @@ selection_color = "#aaaaaa" economic_modifier = 5 minimal_player_age = 14 - pto_type = null + playtime_only = TRUE + pto_type = PTO_TALON + timeoff_factor = 1 access = list(access_talon) minimal_access = list(access_talon) alt_titles = list("Talon Security" = /datum/alt_title/talon_security) @@ -148,7 +159,9 @@ selection_color = "#aaaaaa" economic_modifier = 5 minimal_player_age = 14 - pto_type = null + playtime_only = TRUE + pto_type = PTO_TALON + timeoff_factor = 1 access = list(access_talon) minimal_access = list(access_talon) alt_titles = list("Talon Excavator" = /datum/alt_title/talon_excavator) @@ -273,4 +286,4 @@ uniform = /obj/item/clothing/under/rank/talon/basic backpack = /obj/item/weapon/storage/backpack/talon satchel_one = /obj/item/weapon/storage/backpack/satchel/talon - messenger_bag = /obj/item/weapon/storage/backpack/messenger/talon \ No newline at end of file + messenger_bag = /obj/item/weapon/storage/backpack/messenger/talon diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index 1d628b8bda..ab3d00a8ee 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -212,7 +212,7 @@ var/mob/living/carbon/human/user = AM - var/choice = tgui_alert(user, "Do you want to depart via the tram? Your character will leave the round.","Departure",list("Yes","No")) + var/choice = tgui_alert(usr, "Do you want to depart via the tram? Your character will leave the round.","Departure",list("Yes","No")) if(user && Adjacent(user) && choice == "Yes") var/mob/observer/dead/newghost = user.ghostize() newghost.timeofdeath = world.time diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm index b219e15f44..bfaa882bc3 100644 --- a/maps/tether/tether_turfs.dm +++ b/maps/tether/tether_turfs.dm @@ -276,6 +276,9 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) for(var/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/F in src) qdel(F) +/turf/space/v3b_midpoint/CanZPass(atom, direction) + return 0 // We're not Space + // Tram transit floor /turf/simulated/floor/tiled/techfloor/grid/transit icon = 'icons/turf/transit_vr.dmi' diff --git a/maps/virgo_minitest/virgo_minitest_defines.dm b/maps/virgo_minitest/virgo_minitest_defines.dm index 716815b7b3..ec26a64351 100644 --- a/maps/virgo_minitest/virgo_minitest_defines.dm +++ b/maps/virgo_minitest/virgo_minitest_defines.dm @@ -7,7 +7,9 @@ path = "virgo_minitest" lobby_icon = 'icons/misc/title_vr.dmi' - lobby_screens = list("tether2_night") + lobby_screens = list("logo2") + + id_hud_icons = 'icons/mob/hud_jobs_vr.dmi' accessible_z_levels = list("1" = 100) base_turf_by_z = list("1" = /turf/space) diff --git a/maps/yw/cryogaia-02-mining.dmm b/maps/yw/cryogaia-02-mining.dmm index 8fc810b67e..456b645c57 100644 --- a/maps/yw/cryogaia-02-mining.dmm +++ b/maps/yw/cryogaia-02-mining.dmm @@ -4062,11 +4062,6 @@ req_access = list(47) }, /obj/machinery/door/firedoor/glass, -/obj/structure/cable/blue{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/cable/blue{ d1 = 4; d2 = 8; @@ -4596,7 +4591,7 @@ name = "Burn Chamber Air Control"; output_tag = "burn_out"; pressure_setting = 0; - sensors = list("burn_sensor" = "Burn Chamber Sensor") + sensors = list("burn_sensor"="Burn Chamber Sensor") }, /obj/structure/cable/green{ d1 = 4; @@ -5056,11 +5051,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/cable/blue{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/simulated/floor/plating, /area/maintenance/substation/outpost) "mr" = ( @@ -8285,11 +8275,6 @@ req_access = list(65) }, /obj/machinery/door/firedoor/glass, -/obj/structure/cable/blue{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/blue{ @@ -11161,11 +11146,6 @@ req_access = list(47) }, /obj/machinery/door/firedoor/glass, -/obj/structure/cable/blue{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, diff --git a/maps/yw/cryogaia-04-maintenance.dmm b/maps/yw/cryogaia-04-maintenance.dmm index b5c95039b3..39b9d2851c 100644 --- a/maps/yw/cryogaia-04-maintenance.dmm +++ b/maps/yw/cryogaia-04-maintenance.dmm @@ -449,11 +449,6 @@ /turf/simulated/floor, /area/maintenance/aft) "ats" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/door/airlock/maintenance/common, /obj/structure/cable{ icon_state = "1-2" @@ -5873,7 +5868,7 @@ frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; - sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop", "wloop_engine_meter" = "Engine Waste") + sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop","wloop_engine_meter"="Engine Waste") }, /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) @@ -6310,7 +6305,7 @@ /obj/machinery/computer/general_air_control{ frequency = 1441; name = "Tank Monitor"; - sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank") + sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") }, /obj/machinery/light{ dir = 8 @@ -7402,7 +7397,7 @@ /area/maintenance/blueserg) "ePN" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = list(/obj/item/weapon/reagent_containers/food/drinks/milk = 6, /obj/item/weapon/storage/fancy/egg_box = 4, /obj/item/weapon/reagent_containers/food/condiment/flour = 7, /obj/item/weapon/reagent_containers/food/condiment/sugar = 2) + starts_with = list(/obj/item/weapon/reagent_containers/food/drinks/milk=6,/obj/item/weapon/storage/fancy/egg_box=4,/obj/item/weapon/reagent_containers/food/condiment/carton/flour=7,/obj/item/weapon/reagent_containers/food/condiment/sugar=2) }, /turf/simulated/floor/tiled/white, /area/crew_quarters/coffee_shop) @@ -18626,7 +18621,7 @@ input_tag = "o2_in"; name = "Oxygen Supply Control"; output_tag = "o2_out"; - sensors = list("o2_sensor" = "Tank") + sensors = list("o2_sensor"="Tank") }, /obj/effect/floor_decal/corner/blue{ dir = 9 @@ -19925,7 +19920,7 @@ "mih" = ( /obj/structure/closet/athletic_mixed, /obj/item/clothing/shoes/boots/jackboots{ - armor = list("melee" = 69, "bullet" = 69, "laser" = 69, "energy" = 69, "bomb" = 69, "bio" = 69, "rad" = 69); + armor = list("melee"=69,"bullet"=69,"laser"=69,"energy"=69,"bomb"=69,"bio"=69,"rad"=69); desc = "This pair of Jackboots look worn and freshly used. They have several claw markings inside and you can read the initials D and M at the bottom"; name = "Dhaeleena's Jackboots" }, @@ -26469,7 +26464,7 @@ input_tag = "n2o_in"; name = "Nitrous Oxide Supply Control"; output_tag = "n2o_out"; - sensors = list("n2o_sensor" = "Tank") + sensors = list("n2o_sensor"="Tank") }, /obj/effect/floor_decal/corner/white{ dir = 8 @@ -26743,7 +26738,7 @@ name = "Mixed Air Supply Control"; output_tag = "air_out"; pressure_setting = 2000; - sensors = list("air_sensor" = "Tank") + sensors = list("air_sensor"="Tank") }, /obj/effect/floor_decal/corner/white{ dir = 1 @@ -28877,7 +28872,7 @@ input_tag = "waste_in"; name = "Gas Mix Tank Control"; output_tag = "waste_out"; - sensors = list("waste_sensor" = "Tank") + sensors = list("waste_sensor"="Tank") }, /obj/effect/floor_decal/corner/lime{ dir = 5 @@ -29562,7 +29557,7 @@ input_tag = "n2_in"; name = "Nitrogen Supply Control"; output_tag = "n2_out"; - sensors = list("n2_sensor" = "Tank") + sensors = list("n2_sensor"="Tank") }, /obj/effect/floor_decal/corner/red{ dir = 9 @@ -35271,7 +35266,7 @@ input_tag = "co2_in"; name = "Carbon Dioxide Supply Control"; output_tag = "co2_out"; - sensors = list("co2_sensor" = "Tank") + sensors = list("co2_sensor"="Tank") }, /obj/effect/floor_decal/corner/black{ dir = 10 @@ -35366,7 +35361,7 @@ input_tag = "tox_in"; name = "Phoron Supply Control"; output_tag = "tox_out"; - sensors = list("tox_sensor" = "Tank") + sensors = list("tox_sensor"="Tank") }, /obj/effect/floor_decal/corner/orange{ dir = 10 @@ -37496,7 +37491,7 @@ /obj/machinery/vending/cigarette{ name = "Cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/weapon/storage/fancy/cigarettes=10,/obj/item/weapon/storage/box/matches=10,/obj/item/weapon/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2) }, /obj/structure/cable{ d1 = 4; diff --git a/maps/yw/cryogaia-05-main.dmm b/maps/yw/cryogaia-05-main.dmm index ffda4ebfc4..916f0fa1c3 100644 --- a/maps/yw/cryogaia-05-main.dmm +++ b/maps/yw/cryogaia-05-main.dmm @@ -2292,10 +2292,6 @@ /area/medical/surgeryprep) "aTh" = ( /obj/effect/wingrille_spawn/reinforced, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, /obj/structure/cable/green{ d2 = 2; icon_state = "0-2" @@ -3094,7 +3090,7 @@ input_tag = "cooling_in"; name = "Engine Cooling Control"; output_tag = "cooling_out"; - sensors = list("engine_sensor" = "Engine Core") + sensors = list("engine_sensor"="Engine Core") }, /obj/effect/floor_decal/corner/yellow/diagonal, /turf/simulated/floor/tiled, @@ -3166,7 +3162,7 @@ "blu" = ( /obj/structure/closet, /obj/item/clothing/suit/storage/vest/hoscoat/jensen{ - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0); + armor = list("melee"=0,"bullet"=0,"laser"=0,"energy"=0,"bomb"=0,"bio"=0,"rad"=0); desc = "A trenchcoat augmented with a special alloy for some protection and style. Well, it was. It looks like most of the plating's been stripped out." }, /obj/item/clothing/glasses/fakesunglasses, @@ -8905,28 +8901,6 @@ }, /turf/simulated/floor/lino, /area/security/detectives_office) -"duP" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "duZ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -9467,22 +9441,23 @@ /turf/simulated/floor/plating, /area/hallway/secondary/exit) "dHO" = ( -/obj/item/weapon/book/manual/robotics_cyborgs{ - pixel_x = 2; - pixel_y = 5 - }, /obj/machinery/requests_console{ department = "Robotics"; departmentType = 2; name = "Robotics RC"; pixel_y = 30 }, +/obj/item/weapon/book/manual/robotics_cyborgs{ + pixel_x = 2; + pixel_y = 5 + }, /obj/machinery/light{ dir = 1 }, /obj/structure/table/standard{ name = "plastic table frame" }, +/obj/item/weapon/book/manual/robotics_manual, /turf/simulated/floor/tiled/white, /area/assembly/robotics) "dHS" = ( @@ -25604,11 +25579,6 @@ /turf/simulated/floor, /area/medical/psych) "kaJ" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -42196,11 +42166,6 @@ /turf/simulated/floor/tiled, /area/civilian/atrium/central) "qqp" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -54784,11 +54749,6 @@ /area/security/hangar) "vDS" = ( /obj/effect/wingrille_spawn/reinforced, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -55654,7 +55614,7 @@ frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; - sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop", "wloop_engine_meter" = "Engine Waste") + sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop","wloop_engine_meter"="Engine Waste") }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) @@ -60964,11 +60924,6 @@ name = "Mining Operations" }, /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -70198,7 +70153,7 @@ kUx xeL efa tVs -duP +uCs gAG nCY sDY diff --git a/maps/yw/cryogaia-06-upper.dmm b/maps/yw/cryogaia-06-upper.dmm index defda9b068..9c03ed7574 100644 --- a/maps/yw/cryogaia-06-upper.dmm +++ b/maps/yw/cryogaia-06-upper.dmm @@ -11412,11 +11412,6 @@ /turf/simulated/wall, /area/medical/medbayupper) "Oy" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ d1 = 4; diff --git a/maps/yw/residential/backup/residential.dmm b/maps/yw/residential/backup/residential.dmm index e2d302dc52..ca66f00e7a 100644 --- a/maps/yw/residential/backup/residential.dmm +++ b/maps/yw/residential/backup/residential.dmm @@ -40,7 +40,7 @@ "aN" = (/obj/structure/toilet{dir = 8},/turf/simulated/floor/tiled/white,/area/residential/ship_bay) "aO" = (/obj/structure/bed/chair/sofa/corner{dir = 4},/obj/machinery/light{dir = 8},/turf/simulated/floor/wood,/area/residential/ship_bay) "aP" = (/obj/structure/bed/chair/sofa/left,/turf/simulated/floor/wood,/area/residential/ship_bay) -"aQ" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/light{dir = 1},/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/wood,/area/residential/ship_bay) +"aQ" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/light{dir = 1},/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/wood,/area/residential/ship_bay) "aR" = (/obj/structure/sink{pixel_y = 30},/turf/simulated/floor/wood,/area/residential/ship_bay) "aS" = (/obj/structure/table/steel_reinforced,/obj/machinery/microwave,/turf/simulated/floor/wood,/area/residential/ship_bay) "aT" = (/turf/simulated/shuttle/wall/dark/no_join,/area/residential/ship_bay) @@ -78,7 +78,7 @@ "bz" = (/turf/simulated/floor/carpet/bcarpet,/area/residential/ship_bay) "bA" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,/obj/item/weapon/storage/box/beakers,/turf/simulated/floor/carpet/bcarpet,/area/residential/ship_bay) "bB" = (/obj/structure/bed/chair/shuttle,/turf/simulated/shuttle/floor/black,/area/residential/ship_bay) -"bC" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/light,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/shuttle/floor/black,/area/residential/ship_bay) +"bC" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/light,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/shuttle/floor/black,/area/residential/ship_bay) "bD" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/shuttle/floor/black,/area/residential/ship_bay) "bE" = (/obj/structure/closet,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/carpet,/area/residential/ship_bay) "bF" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/carpet,/area/residential/ship_bay) @@ -134,7 +134,7 @@ "cD" = (/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/turf/simulated/floor/tiled/steel_ridged,/area/residential/ship_bay) "cE" = (/obj/structure/table/steel_reinforced,/obj/machinery/microwave,/turf/simulated/floor/lino,/area/residential/ship_bay) "cF" = (/obj/machinery/light{dir = 1},/obj/structure/table/steel_reinforced,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/knife/plastic,/obj/item/weapon/material/knife/plastic,/turf/simulated/floor/lino,/area/residential/ship_bay) -"cG" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/lino,/area/residential/ship_bay) +"cG" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/lino,/area/residential/ship_bay) "cH" = (/obj/structure/closet/cabinet,/turf/simulated/floor/carpet/oracarpet,/area/residential/ship_bay) "cI" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/carpet/oracarpet,/area/residential/ship_bay) "cJ" = (/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/bluedouble,/turf/simulated/floor/carpet/oracarpet,/area/residential/ship_bay) @@ -176,7 +176,7 @@ "dt" = (/obj/structure/bed/chair/shuttle{dir = 8; icon_state = "shuttle_chair"},/obj/structure/closet/walllocker/emerglocker/north,/obj/machinery/light,/turf/simulated/floor/wood,/area/residential/ship_bay) "du" = (/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/browndouble,/turf/simulated/floor/carpet/blue,/area/residential/ship_bay) "dv" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/obj/item/weapon/pen/fountain,/turf/simulated/floor/carpet,/area/residential/mansion) -"dw" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/light,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/carpet,/area/residential/ship_bay) +"dw" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/light,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/carpet,/area/residential/ship_bay) "dx" = (/obj/structure/table/steel_reinforced,/obj/machinery/microwave,/turf/simulated/floor/carpet,/area/residential/ship_bay) "dy" = (/obj/structure/table/steel_reinforced,/turf/simulated/floor/carpet,/area/residential/ship_bay) "dz" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 9; icon_state = "intact"},/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/steel_ridged,/area/residential/ship_bay) @@ -643,7 +643,7 @@ "ms" = (/turf/simulated/floor/holofloor/wood,/area/residential/mansion) "mt" = (/obj/structure/bed/chair/comfy/black{dir = 4},/turf/simulated/floor/holofloor/wood,/area/residential/mansion) "mu" = (/obj/structure/table/woodentable,/turf/simulated/floor/holofloor/wood,/area/residential/mansion) -"mv" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/lino,/area/residential/room1) +"mv" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/lino,/area/residential/room1) "mw" = (/turf/simulated/floor/lino,/area/residential/room1) "mx" = (/obj/structure/bed/chair/wood,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/wood,/area/residential/room1) "my" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/wood,/area/residential/room1) @@ -670,7 +670,7 @@ "mT" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/door/airlock,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/turf/simulated/floor/wood,/area/residential/room5) "mU" = (/obj/structure/cable{icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/turf/simulated/floor/wood,/area/residential/room5) "mV" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/residential/room5) -"mW" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/tiled/white,/area/residential/room5) +"mW" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/tiled/white,/area/residential/room5) "mX" = (/obj/structure/sink/kitchen{pixel_y = 30},/turf/simulated/floor/tiled/white,/area/residential/room5) "mY" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/storage/box/glasses,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/residential/room5) "mZ" = (/obj/structure/table/steel_reinforced,/obj/machinery/chemical_dispenser/bar_coffee,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/residential/room5) @@ -837,11 +837,11 @@ "qe" = (/obj/structure/coatrack,/turf/simulated/floor/wood,/area/residential/room6) "qf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/residential/room6) "qg" = (/obj/structure/table/steel_reinforced,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/white,/area/residential/room6) -"qh" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/tiled/white,/area/residential/room6) +"qh" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/tiled/white,/area/residential/room6) "qi" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/wood,/area/residential/room2) "qj" = (/obj/machinery/microwave,/obj/structure/table/marble,/turf/simulated/floor/lino,/area/residential/room2) "qk" = (/obj/machinery/reagentgrinder,/obj/structure/table/marble,/turf/simulated/floor/lino,/area/residential/room2) -"ql" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/lino,/area/residential/room2) +"ql" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/condiment/carton/flour,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/lino,/area/residential/room2) "qm" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/wood,/area/residential/room4) "qn" = (/obj/structure/table/steel,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/turf/simulated/floor/lino,/area/residential/room4) "qo" = (/obj/structure/table/steel,/obj/machinery/chemical_dispenser/bar_soft,/turf/simulated/floor/lino,/area/residential/room4) diff --git a/maps/yw/residential/residential.dmm b/maps/yw/residential/residential.dmm index 6ee1a49dc6..31a2e82cc6 100644 --- a/maps/yw/residential/residential.dmm +++ b/maps/yw/residential/residential.dmm @@ -446,9 +446,9 @@ "ci" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, @@ -760,9 +760,9 @@ /obj/structure/closet/secure_closet/freezer/fridge, /obj/machinery/light, /obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/snacks/meat, /turf/simulated/shuttle/floor/black, /area/residential/ship_bay) @@ -1549,9 +1549,9 @@ dir = 1 }, /obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, @@ -3262,9 +3262,9 @@ "qs" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, @@ -3454,8 +3454,8 @@ /obj/item/weapon/reagent_containers/food/condiment/small/peppermill, /obj/item/weapon/storage/box/beakers, /obj/item/weapon/material/knife, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /turf/simulated/floor/tiled/old_cargo, /area/residential/room11) "rw" = ( @@ -4128,8 +4128,8 @@ /obj/structure/closet/secure_closet/freezer/fridge, /obj/machinery/light, /obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, @@ -6150,8 +6150,8 @@ /area/residential/powerroom) "Fm" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, @@ -9288,8 +9288,8 @@ /area/residential/room5) "UD" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, @@ -9989,9 +9989,9 @@ "YL" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, diff --git a/maps/yw/submaps/admin_ships/adminship.dmm b/maps/yw/submaps/admin_ships/adminship.dmm index 2d0b11545e..2c83641a2a 100644 --- a/maps/yw/submaps/admin_ships/adminship.dmm +++ b/maps/yw/submaps/admin_ships/adminship.dmm @@ -2416,10 +2416,10 @@ /area/ship/adminships/kitchen_dining) "OK" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/machinery/alarm/alarms_hidden{ pixel_y = 30 }, diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm index 10a69fe130..c5976b5a57 100644 --- a/maps/~map_system/maps.dm +++ b/maps/~map_system/maps.dm @@ -133,6 +133,7 @@ var/list/all_maps = list() var/list/unit_test_exempt_areas = list() var/list/unit_test_exempt_from_atmos = list() var/list/unit_test_exempt_from_apc = list() + var/list/unit_test_exempt_from_wires = list() var/list/unit_test_z_levels //To test more than Z1, set your z-levels to test here. var/list/planet_datums_to_make = list() // Types of `/datum/planet`s that will be instantiated by SSPlanets. @@ -353,4 +354,4 @@ var/list/all_maps = list() return ..() /datum/map/proc/get_map_info() - return "No map information available" \ No newline at end of file + return "No map information available" diff --git a/sound/effects/pai-restore.ogg b/sound/effects/pai-restore.ogg new file mode 100644 index 0000000000..858b519a10 Binary files /dev/null and b/sound/effects/pai-restore.ogg differ diff --git a/sound/effects/weather/indoorrain_end.ogg b/sound/effects/weather/indoorrain_end.ogg index c82039d95b..2b83d6b6a4 100644 Binary files a/sound/effects/weather/indoorrain_end.ogg and b/sound/effects/weather/indoorrain_end.ogg differ diff --git a/sound/effects/weather/indoorrain_mid.ogg b/sound/effects/weather/indoorrain_mid.ogg index 60ab5f1624..088aec86ef 100644 Binary files a/sound/effects/weather/indoorrain_mid.ogg and b/sound/effects/weather/indoorrain_mid.ogg differ diff --git a/sound/effects/weather/indoorrain_start.ogg b/sound/effects/weather/indoorrain_start.ogg index 23165836a1..ca43575d5f 100644 Binary files a/sound/effects/weather/indoorrain_start.ogg and b/sound/effects/weather/indoorrain_start.ogg differ diff --git a/tgui/.eslintrc.yml b/tgui/.eslintrc.yml index 334a03e9c2..7fd4b2914c 100644 --- a/tgui/.eslintrc.yml +++ b/tgui/.eslintrc.yml @@ -1,4 +1,5 @@ root: true +extends: prettier parser: '@typescript-eslint/parser' parserOptions: ecmaVersion: 2020 @@ -349,15 +350,15 @@ rules: ## Enforce the location of arrow function bodies # implicit-arrow-linebreak: error ## Enforce consistent indentation - indent: [error, 2, { SwitchCase: 1 }] + # indent: [warn, 2, { SwitchCase: 1 }] ## Enforce the consistent use of either double or single quotes in JSX ## attributes - jsx-quotes: [error, prefer-double] + # jsx-quotes: [warn, prefer-double] ## Enforce consistent spacing between keys and values in object literal ## properties - key-spacing: [error, { beforeColon: false, afterColon: true }] + # key-spacing: [warn, { beforeColon: false, afterColon: true }] ## Enforce consistent spacing before and after keywords - keyword-spacing: [error, { before: true, after: true }] + # keyword-spacing: [warn, { before: true, after: true }] ## Enforce position of line comments # line-comment-position: error ## Enforce consistent linebreak style @@ -369,15 +370,15 @@ rules: ## Enforce a maximum depth that blocks can be nested # max-depth: error ## Enforce a maximum line length - max-len: [error, { - code: 120, - ## Ignore imports - ignorePattern: '^(import\s.+\sfrom\s|.*require\()', - ignoreUrls: true, - ignoreRegExpLiterals: true, - ignoreStrings: true, - ignoreTemplateLiterals: true, - }] + # max-len: [warn, { + # code: 120, + # ## Ignore imports + # ignorePattern: '^(import\s.+\sfrom\s|.*require\()', + # ignoreUrls: true, + # ignoreRegExpLiterals: true, + # ignoreStrings: true, + # ignoreTemplateLiterals: true, + # }] ## Enforce a maximum number of lines per file # max-lines: error ## Enforce a maximum number of line of code in a function @@ -414,7 +415,7 @@ rules: ## Disallow mixed binary operators # no-mixed-operators: error ## Disallow mixed spaces and tabs for indentation - no-mixed-spaces-and-tabs: error + no-mixed-spaces-and-tabs: warn ## Disallow use of chained assignment expressions # no-multi-assign: error ## Disallow multiple empty lines @@ -440,7 +441,7 @@ rules: ## Disallow ternary operators when simpler alternatives exist # no-unneeded-ternary: error ## Disallow whitespace before properties - no-whitespace-before-property: error + # no-whitespace-before-property: warn ## Enforce the location of single-line statements # nonblock-statement-body-position: error ## Enforce consistent line breaks inside braces @@ -457,7 +458,7 @@ rules: ## Require or disallow assignment operator shorthand where possible # operator-assignment: error ## Enforce consistent linebreak style for operators - operator-linebreak: [error, before] + # operator-linebreak: [warn, before] ## Require or disallow padding within blocks # padded-blocks: error ## Require or disallow padding lines between statements @@ -482,11 +483,11 @@ rules: ## Enforce consistent spacing before blocks space-before-blocks: [error, always] ## Enforce consistent spacing before function definition opening parenthesis - space-before-function-paren: [error, { - anonymous: always, - named: never, - asyncArrow: always, - }] + # space-before-function-paren: [warn, { + # anonymous: always, + # named: never, + # asyncArrow: always, + # }] ## Enforce consistent spacing inside parentheses space-in-parens: [error, never] ## Require spacing around infix operators @@ -670,7 +671,7 @@ rules: # react/sort-prop-types: error ## Enforce the state initialization style to be either in a constructor or ## with a class property - react/state-in-constructor: error + # react/state-in-constructor: error ## Enforces where React component static properties should be positioned. # react/static-property-placement: error ## Enforce style prop value being an object @@ -695,7 +696,7 @@ rules: react/jsx-closing-tag-location: error ## Enforce or disallow newlines inside of curly braces in JSX attributes and ## expressions (fixable) - react/jsx-curly-newline: error + # react/jsx-curly-newline: warn ## Enforce or disallow spaces inside of curly braces in JSX attributes and ## expressions (fixable) react/jsx-curly-spacing: error @@ -708,13 +709,13 @@ rules: ## Enforce event handler naming conventions in JSX react/jsx-handler-names: error ## Validate JSX indentation (fixable) - react/jsx-indent: [error, 2, { - checkAttributes: true, - }] + # react/jsx-indent: [warn, 2, { + # checkAttributes: true, + # }] ## Validate props indentation in JSX (fixable) - react/jsx-indent-props: [error, 2] + # react/jsx-indent-props: [warn, 2] ## Validate JSX has key prop when in array or iterator - react/jsx-key: error + # react/jsx-key: warn ## Validate JSX maximum depth react/jsx-max-depth: [error, { max: 10 }] ## Generous ## Limit maximum of props on a single line in JSX (fixable) diff --git a/tgui/.gitattributes b/tgui/.gitattributes index 71550f35c1..ce30adb9e2 100644 --- a/tgui/.gitattributes +++ b/tgui/.gitattributes @@ -15,8 +15,8 @@ yarn.lock text eol=lf bin/tgui text eol=lf -## Treat bundles as binary and ignore them during conflicts -*.bundle.* binary merge=tgui-merge-bundle -*.chunk.* binary merge=tgui-merge-bundle +## Treat bundles as binary +*.bundle.* binary +*.chunk.* binary .yarn/releases/**/* binary .yarn/plugins/**/* binary diff --git a/tgui/.gitignore b/tgui/.gitignore index 56cb38b290..bcdbd1c91a 100644 --- a/tgui/.gitignore +++ b/tgui/.gitignore @@ -14,6 +14,7 @@ package-lock.json ## Build artifacts /public/.tmp/**/* +/public/*.map ## Previously ignored locations that are kept to avoid confusing git ## while transitioning to a new project structure. diff --git a/tgui/.prettierignore b/tgui/.prettierignore new file mode 100644 index 0000000000..2522dec056 --- /dev/null +++ b/tgui/.prettierignore @@ -0,0 +1,19 @@ +## NPM +/**/node_modules + +## Yarn +/.yarn +/yarn.lock +/.pnp.* + +/docs +/public +/packages/tgui-polyfill +/packages/tgfont/static +**/*.json +**/*.yml +**/*.md + +## Build artifacts +/public/.tmp/**/* +/public/*.map diff --git a/tgui/.prettierrc.yml b/tgui/.prettierrc.yml index b64bef0cd0..5dbf435cf1 100644 --- a/tgui/.prettierrc.yml +++ b/tgui/.prettierrc.yml @@ -1,8 +1,10 @@ arrowParens: always -bracketSpacing: true +breakLongMethodChains: true endOfLine: lf +importFormatting: oneline jsxBracketSameLine: true jsxSingleQuote: false +offsetTernaryExpressions: true printWidth: 120 proseWrap: preserve quoteProps: preserve @@ -10,3 +12,4 @@ semi: true singleQuote: true tabWidth: 2 trailingComma: es5 +useTabs: false diff --git a/tgui/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs b/tgui/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs index e64e6dda16..2a614bf0fb 100644 --- a/tgui/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs +++ b/tgui/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs @@ -1,4 +1,5 @@ /* eslint-disable */ +//prettier-ignore module.exports = { name: "@yarnpkg/plugin-interactive-tools", factory: function (require) { @@ -74,4 +75,4 @@ function(r){function i(e,t){return function(){e.apply(t,arguments)}}function o(e */var n,r,i,o,u;if(Object.defineProperty(t,"__esModule",{value:!0}),"undefined"==typeof window||"function"!=typeof MessageChannel){var a=null,l=null,s=function(){if(null!==a)try{var e=t.unstable_now();a(!0,e),a=null}catch(e){throw setTimeout(s,0),e}},c=Date.now();t.unstable_now=function(){return Date.now()-c},n=function(e){null!==a?setTimeout(n,0,e):(a=e,setTimeout(s,0))},r=function(e,t){l=setTimeout(e,t)},i=function(){clearTimeout(l)},o=function(){return!1},u=t.unstable_forceFrameRate=function(){}}else{var f=window.performance,d=window.Date,p=window.setTimeout,h=window.clearTimeout;if("undefined"!=typeof console){var v=window.cancelAnimationFrame;"function"!=typeof window.requestAnimationFrame&&console.error("This browser doesn't support requestAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills"),"function"!=typeof v&&console.error("This browser doesn't support cancelAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills")}if("object"==typeof f&&"function"==typeof f.now)t.unstable_now=function(){return f.now()};else{var m=d.now();t.unstable_now=function(){return d.now()-m}}var g=!1,y=null,_=-1,b=5,w=0;o=function(){return t.unstable_now()>=w},u=function(){},t.unstable_forceFrameRate=function(e){0>e||125
>>0&u>>>0
>>0):0)?((u|i)&3|0)==0:0){p=i>>>2;d=u>>>2;f=0;while(1){s=a>>>1;c=f+s|0;l=c<<1;u=l+p|0;i=OT(o[e+(u<<2)>>2]|0,h)|0;u=OT(o[e+(u+1<<2)>>2]|0,h)|0;if(!(u>>>0