cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] [MDB IGNORE] BIDDLE TRAITORS - Adds progression traitors. Refactors uplink code in its entirety [MDB IGNORE] (#10620)

Browse Source 
* [MDB IGNORE] BIDDLE TRAITORS - Adds progression traitors. Refactors uplink code in its entirety

* updates and fixes

* ffff

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-01-12 03:25:38 +00:00
committed by GitHub
co-authored by Watermelon914 Gandalf
parent ed457e5eec
commit c33061765b
145 changed files with 17246 additions and 4143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+1
View File
@@ -206,6 +206,7 @@ GLOBAL_PROTECT(admin_verbs_debug)
/client/proc/adventure_manager,
/client/proc/load_circuit,
/client/proc/cmd_admin_toggle_fov,
/client/proc/cmd_admin_debug_traitor_objectives,
)
GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, /proc/release))
GLOBAL_PROTECT(admin_verbs_possess)
code/modules/admin/antag_panel.dm
+8 -2
View File
@@ -188,9 +188,15 @@ GLOBAL_VAR(antag_prototypes)
if(U)
uplink_info += "<a href='?src=[REF(src)];common=takeuplink'>take</a>"
if (check_rights(R_FUN, 0))
uplink_info += ", <a href='?src=[REF(src)];common=crystals'>[U.telecrystals]</a> TC"
uplink_info += ", <a href='?src=[REF(src)];common=crystals'>[U.uplink_handler.telecrystals]</a> TC"
if(U.uplink_handler.has_progression)
uplink_info += ", <a href='?src=[REF(src)];common=progression'>[U.uplink_handler.progression_points]</a> PR"
if(U.uplink_handler.has_objectives)
uplink_info += ", <a href='?src=[REF(src)];common=give_objective'>Force Give Objective</a>"
else
uplink_info += ", [U.telecrystals] TC"
uplink_info += ", [U.uplink_handler.telecrystals] TC"
if(U.uplink_handler.has_progression)
uplink_info += ", [U.uplink_handler.progression_points] PR"
else
uplink_info += "<a href='?src=[REF(src)];common=uplink'>give</a>"
uplink_info += "." //hiel grammar
code/modules/admin/verbs/anonymousnames.dm
+2 -2
View File
@@ -143,7 +143,7 @@ GLOBAL_DATUM(current_anonymous_theme, /datum/anonymous_theme)
* Spider Clan = "'Leaping Viper' MSO"
* Stations? = "System Port 10"
* Arguments:
* * is_ai - boolean to decide whether the name has "Core" (AI) or "Assistant" (Cyborg)
* * is_ai - boolean to decide whether the name has "Core" (AI) or JOB_ASSISTANT (Cyborg)
*/
/datum/anonymous_theme/proc/anonymous_ai_name(is_ai = FALSE)
return pick(GLOB.ai_names)
@@ -167,7 +167,7 @@ GLOBAL_DATUM(current_anonymous_theme, /datum/anonymous_theme)
/datum/anonymous_theme/employees/anonymous_ai_name(is_ai = FALSE)
var/verbs = capitalize(pick(GLOB.ing_verbs))
var/phonetic = pick(GLOB.phonetic_alphabet)
return "Employee [is_ai ? "Core" : "Assistant"] [verbs] [phonetic]"
return "Employee [is_ai ? "Core" : JOB_ASSISTANT] [verbs] [phonetic]"
/datum/anonymous_theme/wizards
name = "Wizard Academy"