| Name | " - dat += "Cost | " dat += "Restricted Jobs | " - dat += "Description |
| Description | " + dat += "|||
| [G.display_name]\n" - if(G.display_name in purchased_gear) - if(G.sort_category == "OOC") - dat += "Purchased. | " - else - dat += "Equip" - else - dat += "Purchase" - dat += "[G.cost] | " + dat += " | |
| [G.display_name] | "
if(G.allowed_roles)
dat += ""
var/list/allowedroles = list()
@@ -811,8 +792,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "PDA Color: Change " dat += "PDA Style: [pda_style] " dat += " " - dat += "Crew Objectives: [(crew_objectives) ? "Yes" : "No"] " - dat += " " dat += "Ghost Ears: [(chat_toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"] " dat += "Ghost Radio: [(chat_toggles & CHAT_GHOSTRADIO) ? "All Messages":"No Messages"] " dat += "Ghost Sight: [(chat_toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"] " @@ -1462,20 +1441,14 @@ GLOBAL_LIST_EMPTY(preferences_datums) return TRUE if(href_list["preference"] == "gear") - if(href_list["purchase_gear"]) - var/datum/gear/TG = GLOB.gear_datums[href_list["purchase_gear"]] - if(TG.cost < user.client.get_metabalance()) - purchased_gear += TG.display_name - TG.purchase(user.client) - user.client.inc_metabalance((TG.cost * -1), TRUE, "Purchased [TG.display_name].") - save_preferences() - else - to_chat(user, "You don't have enough [CONFIG_GET(string/metacurrency_name)]s to purchase \the [TG.display_name]!") if(href_list["toggle_gear"]) var/datum/gear/TG = GLOB.gear_datums[href_list["toggle_gear"]] if(TG.display_name in equipped_gear) equipped_gear -= TG.display_name else + if(length(equipped_gear) >= CONFIG_GET(number/max_loadout_items)) + alert(user, "You can't have more than [CONFIG_GET(number/max_loadout_items)] items in your loadout!") + return var/list/type_blacklist = list() var/list/slot_blacklist = list() for(var/gear_name in equipped_gear) @@ -1484,13 +1457,10 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(G.subtype_path in type_blacklist) continue type_blacklist += G.subtype_path - if((TG.display_name in purchased_gear)) - if(!(TG.subtype_path in type_blacklist) || !(TG.slot in slot_blacklist)) - equipped_gear += TG.display_name - else - to_chat(user, "Can't equip [TG.display_name]. It conflicts with an already-equipped item.") + if(!(TG.subtype_path in type_blacklist) || !(TG.slot in slot_blacklist)) + equipped_gear += TG.display_name else - log_href("[user] attempted a HREF exploit!") + alert(user, "Can't equip [TG.display_name]. It conflicts with an already-equipped item.") save_preferences() else if(href_list["select_category"]) @@ -2065,8 +2035,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) tgui_lock = !tgui_lock if("winflash") windowflashing = !windowflashing - if("crewobj") - crew_objectives = !crew_objectives //here lies the badmins if("hear_adminhelps") @@ -2278,11 +2246,11 @@ GLOBAL_LIST_EMPTY(preferences_datums) character.flavor_text = features["flavor_text"] //Let's update their flavor_text at least initially - if(loadout) //I have been told not to do this because it's too taxing on performance, but hey, I did it anyways! - for(var/gear in usr.client.prefs.equipped_gear) + if(loadout) //I have been told not to do this because it's too taxing on performance, but hey, I did it anyways! //I hate you old me + for(var/gear in equipped_gear) var/datum/gear/G = GLOB.gear_datums[gear] - if(G && G.slot) - if(!character.equip_to_slot_or_del(G.spawn_item(character, owner = character), G.slot)) + if(G?.slot) + if(!character.equip_to_slot_or_del(G.spawn_item(character, character), G.slot)) continue var/datum/species/chosen_species diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 8567ef46459c..1f66d251f44f 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -69,9 +69,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(key_bindings["ShiftQ"] == "quick_equip_suit_storage") key_bindings["ShiftQ"] = list("quick_equip_suit_storage") - if(current_version < 36.5) - READ_FILE(S["equipped_gear"], equipped_gear) - if(current_version < 37) if(clientfps == 0) clientfps = -1 @@ -203,8 +200,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car check_keybindings() //WS Begin - Custom Prefs - READ_FILE(S["purchased_gear"], purchased_gear) - READ_FILE(S["crew_objectives"], crew_objectives) READ_FILE(S["show_credits"], show_credits) //WS End @@ -248,11 +243,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car ghost_others = sanitize_inlist(ghost_others, GLOB.ghost_others_options, GHOST_OTHERS_DEFAULT_OPTION) menuoptions = SANITIZE_LIST(menuoptions) be_special = SANITIZE_LIST(be_special) - crew_objectives = sanitize_integer(crew_objectives, 0, 1, initial(crew_objectives)) show_credits = sanitize_integer(show_credits, 0, 1, initial(show_credits)) pda_style = sanitize_inlist(pda_style, GLOB.pda_styles, initial(pda_style)) pda_color = sanitize_hexcolor(pda_color, 6, 1, initial(pda_color)) key_bindings = sanitize_keybindings(key_bindings) + equipped_gear = SANITIZE_LIST(equipped_gear) if(needs_update >= 0) //save the updated version var/old_default_slot = default_slot @@ -272,9 +267,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car max_save_slots = old_max_save_slots save_preferences() - if(!purchased_gear) - purchased_gear = list() - return TRUE /datum/preferences/proc/save_preferences() @@ -305,7 +297,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["buttons_locked"], buttons_locked) WRITE_FILE(S["windowflash"], windowflashing) WRITE_FILE(S["be_special"], be_special) - WRITE_FILE(S["crew_objectives"], crew_objectives) WRITE_FILE(S["default_slot"], default_slot) WRITE_FILE(S["toggles"], toggles) WRITE_FILE(S["chat_toggles"], chat_toggles) @@ -329,7 +320,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["tip_delay"], tip_delay) WRITE_FILE(S["pda_style"], pda_style) WRITE_FILE(S["pda_color"], pda_color) - WRITE_FILE(S["purchased_gear"], purchased_gear) WRITE_FILE(S["show_credits"], show_credits) WRITE_FILE(S["key_bindings"], key_bindings) return TRUE @@ -394,8 +384,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car READ_FILE(S["feature_moth_wings"], features["moth_wings"]) READ_FILE(S["feature_moth_markings"], features["moth_markings"]) - //WS Begin - READ_FILE(S["equipped_gear"], equipped_gear) READ_FILE(S["jumpsuit_style"], jumpsuit_style) READ_FILE(S["exowear"], exowear) @@ -418,9 +406,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(!((alt_titles_preferences[job.title] in job.alt_titles) || (alt_titles_preferences[job.title] == job.senior_title))) alt_titles_preferences.Remove(job.title) - if(!equipped_gear) - equipped_gear = list() - //WS End if(!CONFIG_GET(flag/join_with_mutant_humans)) diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm index 81e5b9c2f54b..fdd52edc12b1 100644 --- a/code/modules/jobs/job_exp.dm +++ b/code/modules/jobs/job_exp.dm @@ -150,8 +150,6 @@ GLOBAL_PROTECT(exp_to_update) var/rolefound = FALSE play_records[EXP_TYPE_LIVING] += minutes - process_ten_minute_living() - if(announce_changes) to_chat(src,"You got: [minutes] Living EXP!") if(mob.mind.assigned_role) diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 7cb59b102c11..185b0d621718 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -83,73 +83,19 @@ for(var/i in roundstart_experience) experiencer.mind.adjust_experience(i, roundstart_experience[i], TRUE) - - if(!ishuman(H)) + if(!iscarbon(H)) return - var/mob/living/carbon/human/human = H - var/list/gear_leftovers - if(M.client && (M.client.prefs.equipped_gear && M.client.prefs.equipped_gear.len)) + var/mob/living/carbon/spawnee = H + if(M.client && (M.client.prefs.equipped_gear && length(M.client.prefs.equipped_gear))) + var/obj/item/storage/box/loadout_dumper = new() for(var/gear in M.client.prefs.equipped_gear) - var/datum/gear/G = GLOB.gear_datums[gear] - if(G) - var/permitted = FALSE - - if(G.allowed_roles && H.mind && (H.mind.assigned_role in G.allowed_roles)) - permitted = TRUE - else if(!G.allowed_roles) - permitted = TRUE - else - permitted = FALSE - - if(G.species_blacklist && (human.dna.species.id in G.species_blacklist)) - permitted = FALSE - - if(G.species_whitelist && !(human.dna.species.id in G.species_whitelist)) - permitted = FALSE - - if(!permitted) - to_chat(M, "Your current species or role does not permit you to spawn with [gear]!") - continue - //WS Edit - Fix Loadout Uniforms not spawning ID/PDA - if(G.slot == ITEM_SLOT_ICLOTHING) - continue // Handled in pre_equip - //EndWS Edit - Fix Loadout Uniforms not spawning ID/PDA - if(G.slot) - if(!H.equip_to_slot_or_del(G.spawn_item(H, owner = H), G.slot)) - LAZYADD(gear_leftovers, G) - else - LAZYADD(gear_leftovers, G) - else - M.client.prefs.equipped_gear -= gear - - if(gear_leftovers?.len) - for(var/datum/gear/G in gear_leftovers) - var/metadata = M.client.prefs.equipped_gear[G.display_name] - var/item = G.spawn_item(null, metadata, owner = H) - var/atom/placed_in = human.equip_or_collect(item) - - if(istype(placed_in)) - if(isturf(placed_in)) - to_chat(M, "Placing [G.display_name] on [placed_in]!") - else - to_chat(M, "Placing [G.display_name] in [placed_in.name]]") - continue - - if(H.equip_to_appropriate_slot(item)) - to_chat(M, "Placing [G.display_name] in your inventory!") - continue - if(H.put_in_hands(item)) - to_chat(M, "Placing [G.display_name] in your hands!") - continue - - var/obj/item/storage/B = (locate() in H) - if(B) - G.spawn_item(B, metadata, owner = H) - to_chat(M, "Placing [G.display_name] in [B.name]!") - continue - - to_chat(M, "Failed to locate a storage object on your mob, either you spawned with no hands free and no backpack or this is a bug.") - qdel(item) + var/datum/gear/new_gear = GLOB.gear_datums[gear] + new_gear.spawn_item(loadout_dumper, spawnee) + var/datum/component/storage/back_storage = spawnee.back.GetComponent(/datum/component/storage) + if(back_storage) + back_storage.handle_item_insertion(loadout_dumper, TRUE) + else if(!spawnee.put_in_hands(loadout_dumper, TRUE)) + to_chat("Unable to place loadout box.") /datum/job/proc/announce(mob/living/carbon/human/H) if(head_announce) @@ -365,21 +311,6 @@ holder = "[alt_uniform]" if(PREF_GREYSUIT) holder = "/obj/item/clothing/under/color/grey" - //WS Edit - Fix Loadout Uniforms not spawning ID/PDA - if(PREF_LOADOUT) - if (preference_source == null) - holder = "[uniform]" // Who are we getting the loadout pref from anyways? - else - var/datum/pref_loadout_uniform = null - for(var/gear in preference_source.prefs.equipped_gear) - var/datum/gear/G = GLOB.gear_datums[gear] - if (G.slot == ITEM_SLOT_ICLOTHING) - pref_loadout_uniform = G.path - if (pref_loadout_uniform == null) - holder = "[uniform]" - else - uniform = pref_loadout_uniform - // EndWS Edit - Fix Loadout Uniforms not spawning ID/PDA else holder = "[uniform]" diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index ab61e0a819ee..3af4f3209259 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -351,9 +351,6 @@ var/datum/map_template/shuttle/template = SSmapping.ship_purchase_list[tgui_input_list(src, "Please select ship to purchase!", "Welcome, [client.prefs.real_name].", SSmapping.ship_purchase_list)] if(!template) return LateChoices() - if(SSdbcore.IsConnected() && usr.client.get_metabalance() < template.cost) - alert(src, "You have insufficient metabalance to cover this purchase! (Price: [template.cost])") - return if(template.limit) var/count = 0 for(var/obj/structure/overmap/ship/simulated/X in SSovermap.simulated_ships) @@ -366,10 +363,9 @@ to_chat(usr, "Your [template.name] is being prepared. Please be patient!") var/obj/docking_port/mobile/target = SSshuttle.load_template(template) if(!istype(target)) - to_chat(usr, "There was an error loading the ship (You have not been charged). Please contact admins!") + to_chat(usr, "There was an error loading the ship. Please contact admins!") new_player_panel() return - usr.client.inc_metabalance(-template.cost, TRUE, "buying [template.name]") SSblackbox.record_feedback("tally", "ship_purchased", 1, template.name) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! if(!AttemptLateSpawn(target.current_ship.job_slots[1], target.current_ship)) //Try to spawn as the first listed job in the job slots (usually captain) to_chat(usr, "Ship spawned, but you were unable to be spawned. You can likely try to spawn in the ship through joining normally, but if not, please contact an admin.") diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 5c81cee45e0a..90947f1a3ed1 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -387,31 +387,6 @@ return 0 -// Convinience proc. Collects crap that fails to equip either onto the mob's back, or drops it. -// Used in job equipping so shit doesn't pile up at the start loc. -/mob/living/carbon/human/proc/equip_or_collect(var/obj/item/W, var/slot) - if(W.mob_can_equip(src, null, slot, TRUE, TRUE)) - //Mob can equip. Equip it. - equip_to_slot_or_del(W, slot) - else - //Mob can't equip it. Put it in a bag B. - // Do I have a backpack? - var/obj/item/storage/B - if(istype(back,/obj/item/storage)) - //Mob is wearing backpack - B = back - else - //not wearing backpack. Check if player holding box - if(!is_holding_item_of_type(/obj/item/storage/box)) //If not holding box, give box - B = new /obj/item/storage/box(null) // Null in case of failed equip. - if(!put_in_hands(B)) - return // box could not be placed in players hands. I don't know what to do here... - //Now, B represents a container we can insert W into. - var/datum/component/storage/STR = B.GetComponent(/datum/component/storage) - if(STR.can_be_inserted(W, stop_messages=TRUE)) - STR.handle_item_insertion(W,1) - return B - /** * Reset the attached clients perspective (viewpoint) * diff --git a/config/game_options.txt b/config/game_options.txt index 45f043f4de77..dc4253c22b19 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -482,6 +482,9 @@ ROUNDSTART_RACES jelly ## Uncomment to give players the choice of joining as a human with mutant bodyparts before they join the game #JOIN_WITH_MUTANT_HUMANS +## The amount of loadout items players are allowed to spawn with. Default 10 +MAX_LOADOUT_ITEMS 10 + ##Overflow job. Default is assistant OVERFLOW_JOB Assistant @@ -580,9 +583,6 @@ MAXFINE 2000 ## Enable the capitalist agenda on your server. ECONOMY -## Put the name of your custom currency here -METACURRENCY_NAME Metacoin - ## Overmap Settings ## ## Put max amount of different event clusters you want to spawn here diff --git a/shiptest.dme b/shiptest.dme index 3d071d9a429d..e99c603c6f8d 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -136,7 +136,6 @@ g// DM Environment file for shiptest.dme. #include "code\__DEFINES\~whitesands_defines\jobs.dm" #include "code\__DEFINES\~whitesands_defines\machines.dm" #include "code\__DEFINES\~whitesands_defines\maths.dm" -#include "code\__DEFINES\~whitesands_defines\metacoin.dm" #include "code\__DEFINES\~whitesands_defines\movespeed_modification.dm" #include "code\__DEFINES\~whitesands_defines\overmap.dm" #include "code\__DEFINES\~whitesands_defines\shuttles.dm" @@ -1746,13 +1745,12 @@ g// DM Environment file for shiptest.dme. #include "code\modules\client\preferences.dm" #include "code\modules\client\preferences_savefile.dm" #include "code\modules\client\preferences_toggles.dm" -#include "code\modules\client\loadout\loadout.dm" +#include "code\modules\client\loadout\_loadout.dm" #include "code\modules\client\loadout\loadout_accessories.dm" #include "code\modules\client\loadout\loadout_eyewear.dm" #include "code\modules\client\loadout\loadout_footwear.dm" #include "code\modules\client\loadout\loadout_general.dm" #include "code\modules\client\loadout\loadout_hat.dm" -#include "code\modules\client\loadout\loadout_ooc.dm" #include "code\modules\client\loadout\loadout_suit.dm" #include "code\modules\client\loadout\loadout_uniform.dm" #include "code\modules\client\verbs\etips.dm" @@ -3238,7 +3236,6 @@ g// DM Environment file for shiptest.dme. #include "whitesands\code\datums\ert.dm" #include "whitesands\code\datums\quixotejump.dm" #include "whitesands\code\datums\world_topic.dm" -#include "whitesands\code\datums\achievements\scores.dm" #include "whitesands\code\datums\brain_damage\brain_trauma.dm" #include "whitesands\code\datums\brain_damage\phobia.dm" #include "whitesands\code\datums\components\outline.dm" @@ -3342,10 +3339,8 @@ g// DM Environment file for shiptest.dme. #include "whitesands\code\game\turfs\open\floor\flooring_decals.dm" #include "whitesands\code\game\turfs\open\floor\hull.dm" #include "whitesands\code\game\turfs\open\floor\medians.dm" -#include "whitesands\code\modules\admin\topic.dm" #include "whitesands\code\modules\admin\verbs\mapping.dm" #include "whitesands\code\modules\admin\verbs\mentors_edit.dm" -#include "whitesands\code\modules\admin\verbs\modify_antag_tokens.dm" #include "whitesands\code\modules\admin\verbs\randomverbs.dm" #include "whitesands\code\modules\antagonists\_common\antag_spawner.dm" #include "whitesands\code\modules\antagonists\borer\borer.dm" @@ -3365,7 +3360,6 @@ g// DM Environment file for shiptest.dme. #include "whitesands\code\modules\cargo\blackmarket\blackmarket_items\weapons.dm" #include "whitesands\code\modules\cargo\bounties\engineering.dm" #include "whitesands\code\modules\cargo\exports\large_objects.dm" -#include "whitesands\code\modules\client\antag_tokens.dm" #include "whitesands\code\modules\clothing\glasses\_glasses.dm" #include "whitesands\code\modules\clothing\glasses\hud.dm" #include "whitesands\code\modules\clothing\gloves\tapegloves.dm" @@ -3429,7 +3423,6 @@ g// DM Environment file for shiptest.dme. #include "whitesands\code\modules\language\mouse.dm" #include "whitesands\code\modules\language\spider.dm" #include "whitesands\code\modules\library\lib_items.dm" -#include "whitesands\code\modules\metacoin\metacoin.dm" #include "whitesands\code\modules\mining\ores_coins.dm" #include "whitesands\code\modules\mining\deepcore\_deepcore.dm" #include "whitesands\code\modules\mining\deepcore\drill.dm" diff --git a/whitesands/code/controllers/configuration/entries/general.dm b/whitesands/code/controllers/configuration/entries/general.dm index 19886baa2498..bd12c89b626b 100644 --- a/whitesands/code/controllers/configuration/entries/general.dm +++ b/whitesands/code/controllers/configuration/entries/general.dm @@ -1,6 +1,3 @@ -/datum/config_entry/string/metacurrency_name - config_entry_value = "MetaCoin" - /datum/config_entry/number/whitesands_atmos_moles config_entry_value = 103 integer = FALSE diff --git a/whitesands/code/datums/achievements/scores.dm b/whitesands/code/datums/achievements/scores.dm deleted file mode 100644 index 498b7c40e358..000000000000 --- a/whitesands/code/datums/achievements/scores.dm +++ /dev/null @@ -1,21 +0,0 @@ -/datum/award/score/metacoins - name = "Currency" - desc = "Total accumulated \"wealth.\"" - -/datum/award/score/metacoins/New() - . = ..() - name = "[CONFIG_GET(string/metacurrency_name)]\s" - -/datum/award/score/metacoins/LoadHighScores() - var/datum/DBQuery/Q = SSdbcore.NewQuery( - "SELECT ckey,metacoins FROM [format_table_name("player")] ORDER BY metacoins DESC LIMIT 50" - ) - if(!Q.Execute(async = TRUE)) - qdel(Q) - return - else - while(Q.NextRow()) - var/key = Q.item[1] - var/score = text2num(Q.item[2]) - high_scores[key] = score - qdel(Q) diff --git a/whitesands/code/modules/admin/topic.dm b/whitesands/code/modules/admin/topic.dm deleted file mode 100644 index b28334a8b63d..000000000000 --- a/whitesands/code/modules/admin/topic.dm +++ /dev/null @@ -1,20 +0,0 @@ -/datum/admins/Topic(href, href_list) - ..() - - if(href_list["modantagtokens"]) - if(!check_rights(R_ADMIN)) - return - - var/mob/M = locate(href_list["mob"]) in GLOB.mob_list - var/client/C = M.client - usr.client.cmd_admin_mod_antag_tokens(C, href_list["modantagtokens"]) - show_player_panel(M) - - else if(href_list["modmetacoin"]) - if(!check_rights(R_ADMIN)) - return - - var/mob/M = locate(href_list["mob"]) in GLOB.mob_list - var/client/C = M.client - usr.client.cmd_admin_mod_metacoins(C, href_list["modmetacoin"]) - show_player_panel(M) diff --git a/whitesands/code/modules/admin/verbs/modify_antag_tokens.dm b/whitesands/code/modules/admin/verbs/modify_antag_tokens.dm deleted file mode 100644 index e63207d84671..000000000000 --- a/whitesands/code/modules/admin/verbs/modify_antag_tokens.dm +++ /dev/null @@ -1,44 +0,0 @@ -#define ANTAG_TOKENS_MAXIMUM 255 -#define ANTAG_TOKENS_MINIMUM 0 - -/client/proc/cmd_admin_mod_antag_tokens(client/C in GLOB.clients, var/operation) - set category = "Special Verbs" - set name = "Modify Antagonist Tokens" - - if(!check_rights(R_ADMIN)) - return - - var/msg = "" - var/log_text = "" - - if(operation == "zero") - log_text = "Set to 0" - C.set_antag_token_count(0) - else - var/prompt = "Please enter the amount of tokens to [operation]:" - - if(operation == "set") - prompt = "Please enter the new token amount:" - - msg = input("Message:", prompt) as num|null - - if (!msg) - return - - if(operation == "set") - log_text = "Set to [num2text(msg)]" - C.set_antag_token_count(max(ANTAG_TOKENS_MINIMUM, min(msg, ANTAG_TOKENS_MAXIMUM))) - else if(operation == "add") - log_text = "Added [num2text(msg)]" - C.inc_antag_token_count(msg) - else if(operation == "subtract") - log_text = "Subtracted [num2text(msg)]" - C.inc_antag_token_count(-msg) - else - to_chat(src, "Invalid operation for antag token modification: [operation] by user [key_name(usr)]") - return - - - log_admin("[key_name(usr)]: Modified [key_name(C)]'s antagonist tokens [log_text]") - message_admins("[key_name_admin(usr)]: Modified [key_name(C)]'s antagonist tokens ([log_text])") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Modify Antagonist Tokens") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/whitesands/code/modules/client/antag_tokens.dm b/whitesands/code/modules/client/antag_tokens.dm deleted file mode 100644 index 364b30397643..000000000000 --- a/whitesands/code/modules/client/antag_tokens.dm +++ /dev/null @@ -1,37 +0,0 @@ -/client/proc/get_antag_token_count() - if(!SSdbcore.IsConnected()) - return 0 //Zero, not false. - var/datum/DBQuery/query_get_antag_tokens = SSdbcore.NewQuery("SELECT antag_tokens FROM [format_table_name("player")] WHERE ckey = '[ckey]'") - var/token_count = 0 - if(!query_get_antag_tokens.warn_execute()) - qdel(query_get_antag_tokens) - return text2num(token_count) - if(!query_get_antag_tokens.NextRow()) - qdel(query_get_antag_tokens) - return text2num(token_count) - else - token_count = query_get_antag_tokens.item[1] - qdel(query_get_antag_tokens) - return text2num(token_count) - -/client/proc/set_antag_token_count(token_count) - if(!SSdbcore.IsConnected()) - return - var/datum/DBQuery/query_set_antag_tokens = SSdbcore.NewQuery( - "UPDATE [format_table_name("player")] SET antag_tokens = :token_count WHERE ckey = :ckey", - list("token_count" = token_count, "ckey" = ckey)) - if(!query_set_antag_tokens.warn_execute()) - qdel(query_set_antag_tokens) - return - qdel(query_set_antag_tokens) - -/client/proc/inc_antag_token_count(token_count) - if(!SSdbcore.IsConnected()) - return - var/datum/DBQuery/query_inc_antag_tokens = SSdbcore.NewQuery( - "UPDATE [format_table_name("player")] SET antag_tokens = antag_tokens + :token_count WHERE ckey = :ckey", - list("token_count" = token_count, "ckey" = ckey)) - if(!query_inc_antag_tokens.warn_execute()) - qdel(query_inc_antag_tokens) - return - qdel(query_inc_antag_tokens) diff --git a/whitesands/code/modules/metacoin/metacoin.dm b/whitesands/code/modules/metacoin/metacoin.dm deleted file mode 100644 index b5fd86066062..000000000000 --- a/whitesands/code/modules/metacoin/metacoin.dm +++ /dev/null @@ -1,96 +0,0 @@ -/client/proc/cmd_admin_mod_metacoins(client/C in GLOB.clients, var/operation) - set category = "Special Verbs" - set name = "Modify [CONFIG_GET(string/metacurrency_name)]" - - if(!check_rights(R_ADMIN)) - return - - var/msg = "" - var/log_text = "" - var/metacoin_name = CONFIG_GET(string/metacurrency_name) - - if(operation == "zero") - log_text = "Set to 0" - C.set_antag_token_count(0) - else - var/prompt = "Please enter the amount of [metacoin_name] to [operation]:" - - if(operation == "set") - prompt = "Please enter the new [metacoin_name] amount:" - - msg = input("Message:", prompt) as num|null - - if (!msg) - return - - if(operation == "set") - log_text = "Set to [num2text(msg)]" - C.set_metacoin_count(msg) - else if(operation == "add") - log_text = "Added [num2text(msg)]" - C.inc_metabalance(msg) - else if(operation == "subtract") - log_text = "Subtracted [num2text(msg)]" - C.inc_metabalance(-msg) - else - to_chat(src, "Invalid operation for [metacoin_name] modification: [operation] by user [key_name(usr)]") - return - - log_admin("[key_name(usr)]: Modified [key_name(C)]'s [metacoin_name] [log_text]") - message_admins("[key_name_admin(usr)]: Modified [key_name(C)]'s [metacoin_name] ([log_text])") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Modify Metabalance") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/client/proc/process_endround_metacoin(is_speed_round, round_duration) - if(!mob) return - var/mob/M = mob - if(M.mind && !isnewplayer(M)) - if(M.stat != DEAD && !isbrain(M)) - inc_metabalance(METACOIN_ESCAPE_REWARD(is_speed_round, round_duration), reason="Survived the shift.") - else - inc_metabalance(METACOIN_NOTSURVIVE_REWARD, reason="You tried.") - -/client/proc/process_greentext(is_speed_round, round_duration) - inc_metabalance(METACOIN_GREENTEXT_REWARD(is_speed_round, round_duration), reason="Greentext!") - -/client/proc/process_ten_minute_living() - inc_metabalance(METACOIN_TENMINUTELIVING_REWARD, FALSE) - -/client/proc/get_metabalance() - if(!SSdbcore.IsConnected()) - return - var/datum/DBQuery/query_get_metacoins = SSdbcore.NewQuery( - "SELECT metacoins FROM [format_table_name("player")] WHERE ckey = :ckey", - list("ckey" = ckey)) - var/mc_count = 0 - if(query_get_metacoins.warn_execute()) - if(query_get_metacoins.NextRow()) - mc_count = query_get_metacoins.item[1] - - qdel(query_get_metacoins) - return text2num(mc_count) - -/client/proc/set_metacoin_count(mc_count, ann=TRUE) - if(!SSdbcore.IsConnected()) - return - var/datum/DBQuery/query_set_metacoins = SSdbcore.NewQuery( - "UPDATE [format_table_name("player")] SET metacoins = :mc_count WHERE ckey = :ckey", - list("ckey" = ckey, "mc_count" = mc_count)) - query_set_metacoins.warn_execute() - qdel(query_set_metacoins) - if(ann) - to_chat(src, "Your new metacoin balance is [mc_count]!") - -/client/proc/inc_metabalance(mc_count, ann=TRUE, reason=null) - if(!SSdbcore.IsConnected()) - return - var/datum/DBQuery/query_inc_metacoins = SSdbcore.NewQuery( - "UPDATE [format_table_name("player")] SET metacoins = metacoins + :mc_count WHERE ckey = :ckey", - list("ckey" = ckey, "mc_count" = mc_count)) - query_inc_metacoins.warn_execute() - qdel(query_inc_metacoins) - if(ann) - if(reason) - to_chat(src, "[abs(mc_count)] [CONFIG_GET(string/metacurrency_name)]\s have been [mc_count >= 0 ? "deposited to" : "withdrawn from"] your account! Reason: [reason]") - else - to_chat(src, "[abs(mc_count)] [CONFIG_GET(string/metacurrency_name)]\s have been [mc_count >= 0 ? "deposited to" : "withdrawn from"] your account!") - | ||