cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolved Conflicts:

Browse Source 
_maps/map_files/tgstation.2.1.3.dmm
This commit is contained in:
ikarrus
2014-08-21 19:47:30 -06:00
parent 4271b6a859 74a4c95bc5
commit 0891744c8e
902 changed files with 17637 additions and 17138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/deadsay.dm
+2 -1
View File
@@ -19,8 +19,9 @@
if (!msg)
return
var/nicknames = file2list("config/admin_nicknames.txt")
var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.holder.fakekey ? pick("BADMIN", "Fun Police", "Conspiracy", "ERP BLOCKER", "Button Masher", "MissPhaeron", "Turdicide", "hornigranny", "TLC", "scaredofshowers", "SXSI", "HerpEs", "Nerdrak", "Dickarrus", "Wario90900", "Deurpyn", "Fatbeaver", "Arrowage", "Intigaycy", "Hosin Hitter", "Cheridumb", "Petethegoatse", "HotelHabboLover", "Giacunt", "Muskrats", "FickleInspector", "Tankbutt", "Ulisex", "Scrotemis", "Sillnazi", "Stillachair", "cbdsm", "Un_Professional", "Doopenis", "Calasrear", "Quackink ", "ANyan:3", "Slieve", "Pali-en269", "Teamcreep", "Agoatsie", "Zoomerdik", "LewdMechanic", "NemoPanFried", "LameMontgommery", "EndGameOver", "LocalDingus", "ThoughtlessNaps", "Sewage", "hbgay6969", "Cockdtbent", "Iranclanos", "Liarwhine", "Vagyina", "Nohrape", "Dumboner69", "Gaymarr", "Jesusfraud") : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>"
var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.holder.fakekey ? pick(nicknames) : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>"
for (var/mob/M in player_list)
if (istype(M, /mob/new_player))
code/modules/admin/verbs/debug.dm
+3 -2
View File
@@ -663,7 +663,8 @@ var/global/list/g_fancy_list_of_safe_types = null
if ("as job...")
if(jobdatum)
dresscode = "[jobdatum.title]"
dresscode = jobdatum.title
M.job = jobdatum.title
jobdatum.equip(M)
if ("standard space gear")
@@ -1136,4 +1137,4 @@ var/global/list/g_fancy_list_of_safe_types = null
W.assignment = "Death Commando"
W.registered_name = M.real_name
W.update_label(M.real_name)
M.equip_to_slot_or_del(W, slot_wear_id)
M.equip_to_slot_or_del(W, slot_wear_id)
code/modules/admin/verbs/mapping.dm
-1
View File
@@ -140,7 +140,6 @@ var/intercom_range_display_status = 0
src.verbs += /datum/admins/proc/show_traitor_panel
src.verbs += /client/proc/print_jobban_old
src.verbs += /client/proc/print_jobban_old_filter
src.verbs += /client/proc/forceEvent
src.verbs += /client/proc/kill_pipe_processing
src.verbs += /client/proc/kill_air_processing
src.verbs += /client/proc/disable_communication
code/modules/admin/verbs/randomverbs.dm
+4 -16
View File
@@ -423,23 +423,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/confirm = alert(src, "Do you want to announce the contents of the report to the crew?", "Announce", "Yes", "No")
if(confirm == "Yes")
priority_announce(input, null, 'sound/AI/commandreport.ogg');
for (var/obj/machinery/computer/communications/C in machines)
if(! (C.stat & (BROKEN|NOPOWER) ) )
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
P.name = "paper- '[command_name()] Update.'"
P.info = input
C.messagetitle.Add("[command_name()] Update")
C.messagetext.Add(P.info)
priority_announce(input, null, 'sound/AI/commandreport.ogg')
else
priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/AI/commandreport.ogg');
for (var/obj/machinery/computer/communications/C in machines)
if(! (C.stat & (BROKEN|NOPOWER) ) )
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
P.name = "paper- 'Classified [command_name()] Update.'"
P.info = input
C.messagetitle.Add("Classified [command_name()] Update")
C.messagetext.Add(P.info)
priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/AI/commandreport.ogg')
print_command_report(input,"[confirm=="Yes" ? "" : "Classified"] [command_name()] Update")
log_admin("[key_name(src)] has created a command report: [input]")
message_admins("[key_name_admin(src)] has created a command report", 1)