This commit is contained in:
skull132
2017-07-16 01:33:12 +03:00
6 changed files with 26 additions and 15 deletions

View File

@@ -135,16 +135,6 @@
update_connection_data(C)
return
var/static/last_time
if (!last_time)
last_time = world.time
else
var/delta = world.time - last_time
last_time = world.time
if (delta < 1)
log_debug("CONN DATA: [key_name(C)] might be spamming!")
return
var/list/data_object = json_decode(data)
if (!data_object || !data_object.len)

View File

@@ -118,6 +118,9 @@
else if(href_list["gender"])
pref.gender = next_in_list(pref.gender, valid_player_genders)
var/datum/category_item/player_setup_item/general/equipment/equipment_item = category.items[4]
equipment_item.sanitize_character() // sanitize equipment
return TOPIC_REFRESH
else if(href_list["age"])

View File

@@ -35,12 +35,11 @@
var/undies = get_undies()
var/gender_socks = get_gender_socks()
if(!get_key_by_value(undies, pref.underwear))
pref.underwear = undies[undies[1]]
pref.underwear = null
if(!get_key_by_value(undershirt_t, pref.undershirt))
pref.undershirt = undershirt_t[undershirt_t[1]]
if(!get_key_by_value(gender_socks, pref.socks))
pref.socks = gender_socks[gender_socks[1]]
pref.socks = null
/datum/category_item/player_setup_item/general/equipment/content()
. += "<b>Equipment:</b><br>"
@@ -49,7 +48,6 @@
. += "Socks: <a href='?src=\ref[src];change_socks=1'><b>[get_key_by_value(get_gender_socks(),pref.socks)]</b></a><br>"
. += "Backpack Type: <a href='?src=\ref[src];change_backpack=1'><b>[backbaglist[pref.backbag]]</b></a><br>"
/datum/category_item/player_setup_item/general/equipment/proc/get_undies()
return pref.gender == MALE ? underwear_m : underwear_f

View File

@@ -22,6 +22,10 @@
if (stat)
return 0
// Message must not be empty
if (length(message) == 0)
return 0
var/list/listeners = hearers(5,src)
listeners |= src
@@ -30,9 +34,11 @@
D << "<b>[src]</b> transmits, \"[message]\""
for (var/mob/M in player_list)
if (isnull(M.client))
continue
if (istype(M, /mob/new_player))
continue
else if(M.stat == 2 && M.client.prefs.toggles & CHAT_GHOSTEARS)
if(M.client) M << "<b>[src]</b> transmits, \"[message]\""
M << "<b>[src]</b> transmits, \"[message]\""
return 1
return ..(message, 0)

View File

@@ -25,6 +25,7 @@
available = 1
/datum/modular_computer_app_presets/engineering/return_install_programs()
var/list/_prg_list = list(
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/power_monitor(),
new/datum/computer_file/program/alarm_monitor(),
new/datum/computer_file/program/atmos_control(),
@@ -42,6 +43,7 @@
available = 1
/datum/modular_computer_app_presets/medical/return_install_programs()
var/list/_prg_list = list(
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/suit_sensors()
)
@@ -54,6 +56,7 @@
available = 1
/datum/modular_computer_app_presets/research/return_install_programs()
var/list/_prg_list = list(
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/ntnetmonitor(),
new/datum/computer_file/program/aidiag(),
@@ -68,6 +71,7 @@
available = 1
/datum/modular_computer_app_presets/command/return_install_programs()
var/list/_prg_list = list(
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/card_mod(),
new/datum/computer_file/program/comm()
@@ -81,6 +85,7 @@
available = 1
/datum/modular_computer_app_presets/security/return_install_programs()
var/list/_prg_list = list(
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/camera_monitor(),
new/datum/computer_file/program/comm(),
@@ -95,6 +100,7 @@
available = 1
/datum/modular_computer_app_presets/civilian/return_install_programs()
var/list/_prg_list = list(
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/game/arcade(),
new/datum/computer_file/program/game/sudoku()
@@ -108,6 +114,7 @@
available = 0
/datum/modular_computer_app_presets/wall_generic/return_install_programs()
var/list/_prg_list = list(
new/datum/computer_file/program/filemanager(),
new/datum/computer_file/program/chatclient(),
new/datum/computer_file/program/camera_monitor(),
new/datum/computer_file/program/alarm_monitor()