cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 06:57:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds the service channel (:v)

Browse Source
This commit is contained in:
Markolie
2014-11-29 21:01:19 +01:00
parent 3e5915d92a
commit 0dc52900cc
20 changed files with 158 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+2 -2
View File
@@ -666,8 +666,8 @@
_color = "leatherjack"
/obj/item/clothing/suit/armor/vest/fluff/deus_blueshield //deusdactyl
name = "blue shield security armor"
desc = "An armored vest with the badge of a Blue Shield Security lieutenant."
name = "blueshield security armor"
desc = "An armored vest with the badge of a Blueshield Lieutenant."
icon = 'icons/obj/custom_items.dmi'
icon_state = "deus_blueshield"
item_state = "deus_blueshield"
code/modules/mob/living/say.dm
+2
View File
@@ -13,6 +13,7 @@ var/list/department_radio_keys = list(
":a" = "alientalk", "#a" = "alientalk", ".a" = "alientalk",
":t" = "Syndicate", "#t" = "Syndicate", ".t" = "Syndicate",
":u" = "Supply", "#u" = "Supply", ".u" = "Supply",
":v" = "Service", "#v" = "Service", ".v" = "Service",
":g" = "changeling", "#g" = "changeling", ".g" = "changeling",
@@ -30,6 +31,7 @@ var/list/department_radio_keys = list(
":A" = "alientalk", "#A" = "alientalk", ".A" = "alientalk",
":T" = "Syndicate", "#T" = "Syndicate", ".T" = "Syndicate",
":U" = "Supply", "#U" = "Supply", ".U" = "Supply",
":V" = "Service", "#V" = "Service", ".V" = "Service",
":G" = "changeling", "#G" = "changeling", ".G" = "changeling"
/* //kinda localization -- rastaf0
code/modules/mob/living/silicon/robot/robot.dm
+3
View File
@@ -203,12 +203,14 @@
switch(modtype)
if("Standard")
module = new /obj/item/weapon/robot_module/standard(src)
channels = list("Service" = 1)
module_sprites["Basic"] = "robot_old"
module_sprites["Android"] = "droid"
module_sprites["Default"] = "robot"
if("Service")
module = new /obj/item/weapon/robot_module/butler(src)
channels = list("Service" = 1)
module_sprites["Waitress"] = "Service"
module_sprites["Kent"] = "toiletbot"
module_sprites["Bro"] = "Brobot"
@@ -217,6 +219,7 @@
if("Clerical")
module = new /obj/item/weapon/robot_module/clerical(src)
channels = list("Service" = 1)
module_sprites["Waitress"] = "Service"
module_sprites["Kent"] = "toiletbot"
module_sprites["Bro"] = "Brobot"
code/modules/research/message_server.dm
+3
View File
@@ -185,6 +185,7 @@ var/obj/machinery/blackbox_recorder/blackbox
var/list/msg_syndicate = list()
var/list/msg_mining = list()
var/list/msg_cargo = list()
var/list/msg_service = list()
var/list/datum/feedback_variable/feedback = new()
@@ -210,6 +211,7 @@ var/obj/machinery/blackbox_recorder/blackbox
BR.msg_syndicate = msg_syndicate
BR.msg_mining = msg_mining
BR.msg_cargo = msg_cargo
BR.msg_service = msg_service
BR.feedback = feedback
BR.messages = messages
BR.messages_admin = messages_admin
@@ -251,6 +253,7 @@ var/obj/machinery/blackbox_recorder/blackbox
feedback_add_details("radio_usage","SYN-[msg_syndicate.len]")
feedback_add_details("radio_usage","MIN-[msg_mining.len]")
feedback_add_details("radio_usage","CAR-[msg_cargo.len]")
feedback_add_details("radio_usage","SRV-[msg_service.len]")
feedback_add_details("radio_usage","OTH-[messages.len]")
feedback_add_details("radio_usage","PDA-[pda_msg_amt]")
feedback_add_details("radio_usage","RC-[rc_msg_amt]")